From 8f1046a3b24517d9e8f96e2951366d76aaa3c88e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 1 Mar 2018 15:47:03 -0500 Subject: Initial vcpkg support for ECSUtil. --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 67 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 000000000..9737ad0a7 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 0.9.0.0 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 000000000..f23bf277f --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" + FILENAME "ecs-object-client-windows-cpp.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 52c25583647fac3ffcae2a24fa1f490321ca9eeb Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 7 Mar 2018 16:43:58 -0500 Subject: add x86/x64-windows-static-md configurations --- ports/ecsutil/portfile.cmake | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index f23bf277f..6c897ce8c 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,7 +12,8 @@ include(vcpkg_common_functions) -set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(ECSUTIL_VERSION "0.9.0.1") +set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -28,13 +29,18 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" - FILENAME "ecs-object-client-windows-cpp.zip" + URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -55,10 +61,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() endif() # Handle copyright -- cgit v1.2.3 From 68a72652b40697c7c4e92dc5a83352e027fb89c3 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:09:02 -0400 Subject: 0.9.0.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 9737ad0a7..abee106de 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.0 +Version: 0.9.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 6c897ce8c..45174f1cd 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.1") -set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) +set(ECSUTIL_VERSION "0.9.0.2") +set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 69a5fdbe9836b857c4e30f21c7b59c250890c749 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:41:15 -0400 Subject: 0.9.0.3 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index abee106de..f497f165e 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.2 +Version: 0.9.0.3 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 45174f1cd..173b8bf46 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.2") -set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) +set(ECSUTIL_VERSION "0.9.0.3") +set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From dff20e586563724bcf2dca9fc58009c8b8d537dc Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 27 Mar 2018 10:20:11 -0400 Subject: 0.9.0.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index f497f165e..8c786e2aa 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.3 +Version: 0.9.0.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 173b8bf46..86728eb18 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.3") -set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) +set(ECSUTIL_VERSION "0.9.0.4") +set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From ab3d68d2ce85a5c1d473dc6a3c62f1f3c259e1e4 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 24 Apr 2018 10:12:48 -0400 Subject: 0.9.0.5 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 8c786e2aa..3bf8a51c1 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.4 +Version: 0.9.0.5 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 86728eb18..56c8df347 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.4") -set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) +set(ECSUTIL_VERSION "0.9.0.5") +set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From c02405da491c22e1337e12e02c116d65c03d777a Mon Sep 17 00:00:00 2001 From: Francois Budin Date: Mon, 30 Apr 2018 10:01:39 -0400 Subject: Update proj4 portfile to compile on other platforms than MSVC --- ports/proj4/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index bc4e66fcd..66b3a099b 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -40,13 +40,13 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/proj4) # Rename library and adapt cmake configuration -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") +if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(READ ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-release.cmake _contents) string(REPLACE "proj_4_9.lib" "proj.lib" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-release.cmake "${_contents}") endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(READ ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-debug.cmake _contents) string(REPLACE "proj_4_9_d.lib" "projd.lib" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-debug.cmake "${_contents}") @@ -59,10 +59,10 @@ string(REPLACE "set(_IMPORT_PREFIX \"${CURRENT_PACKAGES_DIR}\")" ) file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets.cmake "${_contents}") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") +if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/proj_4_9.lib ${CURRENT_PACKAGES_DIR}/lib/proj.lib) endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/proj_4_9_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/projd.lib) endif() -- cgit v1.2.3 From aca3eb52621e08efd01f03c4ffd86d9e6b4928b6 Mon Sep 17 00:00:00 2001 From: Francois Budin Date: Mon, 30 Apr 2018 10:02:11 -0400 Subject: Update VTK portfile to select RUNTIME install directories with CMake options --- ports/vtk/portfile.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index be344f8bf..54246008a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -165,6 +165,7 @@ vcpkg_configure_cmake( -DVTK_INSTALL_DATA_DIR=share/vtk/data -DVTK_INSTALL_DOC_DIR=share/vtk/doc -DVTK_INSTALL_PACKAGE_DIR=share/vtk + -DVTK_INSTALL_RUNTIME_DIR=tools -DVTK_FORBID_DOWNLOADS=ON ${ADDITIONAL_OPTIONS} ) @@ -294,15 +295,14 @@ string(REGEX REPLACE "${CURRENT_INSTALLED_DIR}/lib/[^\\.]*\\.lib" "" VTK_TARGETS file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" "${VTK_TARGETS_CONTENT}") # ============================================================================= -# Move executable to tools directory and clean-up other directories -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/vtk) +# Clean-up other directories -function(_vtk_move_tool TOOL_NAME) - if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/${TOOL_NAME}.exe) - endif() - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) +function(_vtk_remove_tool TOOL_NAME) + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) + if(EXISTS ${filename}) + file(REMOVE ${filename}) + endif() endfunction() set(VTK_TOOLS @@ -326,7 +326,7 @@ string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}") foreach(TOOL_NAME IN LISTS VTK_TOOLS) - _vtk_move_tool("${TOOL_NAME}") + _vtk_remove_tool("${TOOL_NAME}") endforeach() # ============================================================================= -- cgit v1.2.3 From ed9357a5aafea7192932b5874264bd103fc61255 Mon Sep 17 00:00:00 2001 From: Francois Budin Date: Mon, 30 Apr 2018 14:25:11 -0400 Subject: Adding VTK as ITK feature and using vcpkg HDF5 --- ports/itk/CONTROL | 6 +++++- ports/itk/portfile.cmake | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL index f4b29af94..a2cc426e8 100644 --- a/ports/itk/CONTROL +++ b/ports/itk/CONTROL @@ -1,4 +1,8 @@ Source: itk Version: 4.13.0 Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis. -Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat +Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, hdf5[cpp] + +Feature: vtk +Description: Build ITKVtkGlue module. +Build-Depends: vtk diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index d37d5b150..86dce452c 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -8,9 +8,19 @@ vcpkg_from_github( HEAD_REF master ) +if ("vtk" IN_LIST FEATURES) + set(ITKVtkGlue ON ) +else() + set(ITKVtkGlue OFF ) +endif() + # directory path length needs to be shorter than 50 characters -file(RENAME ${SOURCE_PATH} ${CURRENT_BUILDTREES_DIR}/ITK) -set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/ITK") +set(ITK_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/ITK) +if(EXISTS ${ITK_BUILD_DIR}) + file(REMOVE_RECURSE ${ITK_BUILD_DIR}) +endif() +file(RENAME ${SOURCE_PATH} ${ITK_BUILD_DIR}) +set(SOURCE_PATH "${ITK_BUILD_DIR}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -40,9 +50,9 @@ vcpkg_configure_cmake( #-DITK_PYTHON_VERSION=3 # HDF5 must NOT be installed, otherwise it causes: ...\installed\x64-windows-static\include\H5Tpkg.h(25): fatal error C1189: #error: "Do not include this file outside the H5T package!" - -DITK_USE_SYSTEM_HDF5=OFF # if ON, causes: ...\buildtrees\itk\x64-windows-static-rel\Modules\ThirdParty\HDF5\src\itk_H5Cpp.h(25): fatal error C1083: Cannot open include file: 'H5Cpp.h': No such file or directory + -DITK_USE_SYSTEM_HDF5=ON # if ON, causes: ...\buildtrees\itk\x64-windows-static-rel\Modules\ThirdParty\HDF5\src\itk_H5Cpp.h(25): fatal error C1083: Cannot open include file: 'H5Cpp.h': No such file or directory - # -DModule_ITKVtkGlue=ON # this option requires VTK to be a dependency in CONTROL file. VTK depends on HDF5! + -DModule_ITKVtkGlue=${ITKVtkGlue} # this option requires VTK to be a dependency in CONTROL file. VTK depends on HDF5! -DModule_IOSTL=ON # example how to turn on a non-default module -DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module -DModule_RLEImage=ON # example how to turn on a remote module -- cgit v1.2.3 From 05d1ad47ae1890038c084bbc08094e2b7b0d9617 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 25 Jun 2018 14:29:51 -0400 Subject: ecsutil 0.9.0.6 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 3bf8a51c1..a147161b7 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.5 +Version: 0.9.0.6 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 56c8df347..c135c0758 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.5") -set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) +set(ECSUTIL_VERSION "0.9.0.6") +set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From fb4feebf73081fbda1130beade099c3c192765b1 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 2 Jul 2018 14:55:42 -0400 Subject: ECSUtil 0.9.0.7 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a147161b7..425293995 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.6 +Version: 0.9.0.7 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index c135c0758..cc72d01b8 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.6") -set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) +set(ECSUTIL_VERSION "0.9.0.7") +set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 4de205b2e05f696a57190f4456d78cffabdc06b5 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 3 Jul 2018 16:01:29 -0400 Subject: 0.9.0.8 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 425293995..7ae64ce96 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.7 +Version: 0.9.0.8 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc72d01b8..0f5887c22 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.7") -set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) +set(ECSUTIL_VERSION "0.9.0.8") +set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From bb4a90e74363daf77ac754c73105523779a0e55a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 10 Jul 2018 10:06:13 -0400 Subject: ECSUtil 0.9.0.9 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7ae64ce96..a0567a54a 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.8 +Version: 0.9.0.9 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0f5887c22..140ff8e24 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.8") -set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) +set(ECSUTIL_VERSION "0.9.0.9") +set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From ce11d147adc1757e149b3f7da498043042958cd6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 1 Aug 2018 13:53:46 -0400 Subject: Update to ECSUtil v1.0.0.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a0567a54a..d00da86f0 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.9 +Version: 1.0.0.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 140ff8e24..2c470a248 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.9") -set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) +set(ECSUTIL_VERSION "1.0.0.1") +set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -39,7 +39,7 @@ else() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) -- cgit v1.2.3 From 1ecad1b0db22af82a5c7887dd216538127b90da6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 7 Aug 2018 13:57:28 -0400 Subject: ECSUtil 1.0.0.2 release --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index d00da86f0..976aa9833 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.1 +Version: 1.0.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2c470a248..2f3d7849b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.1") -set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) +set(ECSUTIL_VERSION "1.0.0.2") +set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 55b7ec23f96511af8e7fe572486f4e22ad590164 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 1 Mar 2018 15:47:03 -0500 Subject: Initial vcpkg support for ECSUtil. --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 67 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 000000000..9737ad0a7 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 0.9.0.0 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 000000000..f23bf277f --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" + FILENAME "ecs-object-client-windows-cpp.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 93759be2fa2a7dd26345fd6cd2759a181d689223 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 7 Mar 2018 16:43:58 -0500 Subject: add x86/x64-windows-static-md configurations --- ports/ecsutil/portfile.cmake | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index f23bf277f..6c897ce8c 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,7 +12,8 @@ include(vcpkg_common_functions) -set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(ECSUTIL_VERSION "0.9.0.1") +set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -28,13 +29,18 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" - FILENAME "ecs-object-client-windows-cpp.zip" + URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -55,10 +61,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() endif() # Handle copyright -- cgit v1.2.3 From a908b2506ff2790c8c27fd02277a7006ad52ee13 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:09:02 -0400 Subject: 0.9.0.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 9737ad0a7..abee106de 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.0 +Version: 0.9.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 6c897ce8c..45174f1cd 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.1") -set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) +set(ECSUTIL_VERSION "0.9.0.2") +set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 74cf390368eedab8e51acd2f3111eed275777204 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:41:15 -0400 Subject: 0.9.0.3 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index abee106de..f497f165e 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.2 +Version: 0.9.0.3 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 45174f1cd..173b8bf46 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.2") -set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) +set(ECSUTIL_VERSION "0.9.0.3") +set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From f3590c096a49e182030053d1cb97609339abcc7a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 27 Mar 2018 10:20:11 -0400 Subject: 0.9.0.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index f497f165e..8c786e2aa 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.3 +Version: 0.9.0.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 173b8bf46..86728eb18 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.3") -set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) +set(ECSUTIL_VERSION "0.9.0.4") +set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 341eabc0d1f5cac4e837eefe2662484185fe4375 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 24 Apr 2018 10:12:48 -0400 Subject: 0.9.0.5 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 8c786e2aa..3bf8a51c1 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.4 +Version: 0.9.0.5 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 86728eb18..56c8df347 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.4") -set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) +set(ECSUTIL_VERSION "0.9.0.5") +set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From bc0e12251729e20e8418ae635bdbfded58ffd73e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 25 Jun 2018 14:29:51 -0400 Subject: ecsutil 0.9.0.6 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 3bf8a51c1..a147161b7 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.5 +Version: 0.9.0.6 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 56c8df347..c135c0758 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.5") -set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) +set(ECSUTIL_VERSION "0.9.0.6") +set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From ac49561986caf6561f872f8cd5b8ef12dbde9300 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 2 Jul 2018 14:55:42 -0400 Subject: ECSUtil 0.9.0.7 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a147161b7..425293995 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.6 +Version: 0.9.0.7 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index c135c0758..cc72d01b8 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.6") -set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) +set(ECSUTIL_VERSION "0.9.0.7") +set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 1cf6af248ff93a3aca6f9fa0b72b18e7f017a332 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 3 Jul 2018 16:01:29 -0400 Subject: 0.9.0.8 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 425293995..7ae64ce96 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.7 +Version: 0.9.0.8 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc72d01b8..0f5887c22 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.7") -set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) +set(ECSUTIL_VERSION "0.9.0.8") +set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From d0077a0183d46cf683282e7b2d62b5cde91d1219 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 10 Jul 2018 10:06:13 -0400 Subject: ECSUtil 0.9.0.9 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7ae64ce96..a0567a54a 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.8 +Version: 0.9.0.9 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0f5887c22..140ff8e24 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.8") -set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) +set(ECSUTIL_VERSION "0.9.0.9") +set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 4fe0eebb97005b600be9f35949906038730c6f14 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 1 Aug 2018 13:53:46 -0400 Subject: Update to ECSUtil v1.0.0.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a0567a54a..d00da86f0 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.9 +Version: 1.0.0.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 140ff8e24..2c470a248 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.9") -set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) +set(ECSUTIL_VERSION "1.0.0.1") +set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -39,7 +39,7 @@ else() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) -- cgit v1.2.3 From cdffc66b408763278f20aae2417f857f336787e6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 7 Aug 2018 13:57:28 -0400 Subject: ECSUtil 1.0.0.2 release --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index d00da86f0..976aa9833 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.1 +Version: 1.0.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2c470a248..2f3d7849b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.1") -set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) +set(ECSUTIL_VERSION "1.0.0.2") +set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 8c6e0761305326b08224250292e7ed50538e281c Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 1 Mar 2018 15:47:03 -0500 Subject: Initial vcpkg support for ECSUtil. --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 67 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 000000000..9737ad0a7 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 0.9.0.0 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 000000000..f23bf277f --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" + FILENAME "ecs-object-client-windows-cpp.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From f3c9c1537e506cfe90cdd5721d3a9841fa397380 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 7 Mar 2018 16:43:58 -0500 Subject: add x86/x64-windows-static-md configurations --- ports/ecsutil/portfile.cmake | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index f23bf277f..6c897ce8c 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,7 +12,8 @@ include(vcpkg_common_functions) -set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(ECSUTIL_VERSION "0.9.0.1") +set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -28,13 +29,18 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" - FILENAME "ecs-object-client-windows-cpp.zip" + URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -55,10 +61,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() endif() # Handle copyright -- cgit v1.2.3 From 8fc4fb5f50b610fc2f4b04423a184e4c4d47c041 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:09:02 -0400 Subject: 0.9.0.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 9737ad0a7..abee106de 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.0 +Version: 0.9.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 6c897ce8c..45174f1cd 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.1") -set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) +set(ECSUTIL_VERSION "0.9.0.2") +set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 0b13d211024945818d1cc622454449de139bec3c Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:41:15 -0400 Subject: 0.9.0.3 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index abee106de..f497f165e 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.2 +Version: 0.9.0.3 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 45174f1cd..173b8bf46 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.2") -set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) +set(ECSUTIL_VERSION "0.9.0.3") +set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From e28ea26d80a543f284075bc87c043290a8ef1a94 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 27 Mar 2018 10:20:11 -0400 Subject: 0.9.0.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index f497f165e..8c786e2aa 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.3 +Version: 0.9.0.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 173b8bf46..86728eb18 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.3") -set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) +set(ECSUTIL_VERSION "0.9.0.4") +set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 6368e540428ea3ded157184d427d890cbca045fc Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 24 Apr 2018 10:12:48 -0400 Subject: 0.9.0.5 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 8c786e2aa..3bf8a51c1 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.4 +Version: 0.9.0.5 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 86728eb18..56c8df347 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.4") -set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) +set(ECSUTIL_VERSION "0.9.0.5") +set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 20a64eb659a33ef37d4a630e9207b233555763f6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 25 Jun 2018 14:29:51 -0400 Subject: ecsutil 0.9.0.6 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 3bf8a51c1..a147161b7 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.5 +Version: 0.9.0.6 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 56c8df347..c135c0758 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.5") -set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) +set(ECSUTIL_VERSION "0.9.0.6") +set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 6b37532d47f7cbd94e0bf5da127a808300178669 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 2 Jul 2018 14:55:42 -0400 Subject: ECSUtil 0.9.0.7 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a147161b7..425293995 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.6 +Version: 0.9.0.7 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index c135c0758..cc72d01b8 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.6") -set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) +set(ECSUTIL_VERSION "0.9.0.7") +set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 483b5463f0b0525ad08787a34e6a4d00b2d14dba Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 3 Jul 2018 16:01:29 -0400 Subject: 0.9.0.8 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 425293995..7ae64ce96 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.7 +Version: 0.9.0.8 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc72d01b8..0f5887c22 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.7") -set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) +set(ECSUTIL_VERSION "0.9.0.8") +set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 839fe005e5adafe06ff248fc47ffd7417f0aa53e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 10 Jul 2018 10:06:13 -0400 Subject: ECSUtil 0.9.0.9 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7ae64ce96..a0567a54a 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.8 +Version: 0.9.0.9 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0f5887c22..140ff8e24 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.8") -set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) +set(ECSUTIL_VERSION "0.9.0.9") +set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 99e3bba0e3535f82a84c6e7a21ad654f66c2ee5a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 1 Aug 2018 13:53:46 -0400 Subject: Update to ECSUtil v1.0.0.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a0567a54a..d00da86f0 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.9 +Version: 1.0.0.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 140ff8e24..2c470a248 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.9") -set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) +set(ECSUTIL_VERSION "1.0.0.1") +set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -39,7 +39,7 @@ else() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) -- cgit v1.2.3 From e3f354200754023e4f1e683e13330c009178e1b5 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 7 Aug 2018 13:57:28 -0400 Subject: ECSUtil 1.0.0.2 release --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index d00da86f0..976aa9833 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.1 +Version: 1.0.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2c470a248..2f3d7849b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.1") -set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) +set(ECSUTIL_VERSION "1.0.0.2") +set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From d01501d1f50ce26a14275d81e2958cfe9b5021f6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 25 Sep 2018 15:35:39 -0400 Subject: ECSUtil v1.0.1.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 976aa9833..7d0129b03 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.2 +Version: 1.0.1.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2f3d7849b..cf4e79dda 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.2") -set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) +set(ECSUTIL_VERSION "v1.0.1.1") +set(ECSUtil_HASH e396f672b2a6ec16a5f74f490f8383c67a869db950100d5139fee35302d183f1f45c96ffce783c1e573631a8a036e9f55ab2fac1d1a312f308b9f474fbde10ed) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 9 Oct 2018 14:54:40 -0400 Subject: ECSUtil 1.0.1.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7d0129b03..1a4eff9c2 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.1.1 +Version: 1.0.1.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cf4e79dda..874759afc 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "v1.0.1.1") -set(ECSUtil_HASH e396f672b2a6ec16a5f74f490f8383c67a869db950100d5139fee35302d183f1f45c96ffce783c1e573631a8a036e9f55ab2fac1d1a312f308b9f474fbde10ed) +set(ECSUTIL_VERSION "v1.0.1.2") +set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection -- cgit v1.2.3 From 1d59b34d6f97fadb015e4ca6baa76db9e1e8ab33 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 19 Oct 2018 02:34:26 -0700 Subject: [ecsutil] Initial commit of 1.0.1.2 --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 80 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 000000000..1a4eff9c2 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 1.0.1.2 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 000000000..874759afc --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,80 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUTIL_VERSION "v1.0.1.2") +set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 13ec697c39ff6441393003f38635898b04d6d931 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 19 Oct 2018 02:55:52 -0700 Subject: [ecsutil] Simplify and use vcpkg_install_msbuild --- ports/ecsutil/CONTROL | 1 + ports/ecsutil/portfile.cmake | 89 +++++++++++++++----------------------------- 2 files changed, 30 insertions(+), 60 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 1a4eff9c2..baec5a3cb 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,4 @@ Source: ecsutil Version: 1.0.1.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. +Build-Depends: atlmfc diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 874759afc..dd29d0b93 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,80 +1,49 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) -set(ECSUTIL_VERSION "v1.0.1.2") -set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) - -#architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(ECSUtil_ARCH Win32) + set(PLATFORM x86) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ECSUtil_ARCH x64) + set(PLATFORM x64) else() - message(FATAL_ERROR "unsupported architecture") + message(FATAL_ERROR "Unsupported architecture") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME) + message(FATAL_ERROR "Unsupported platform. ECSUTIL currently only supports windows desktop.") endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") - else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") - endif() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" - FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" - SHA512 ${ECSUtil_HASH} +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EMCECS/ecs-object-client-windows-cpp + REF v1.0.1.2 + SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f + HEAD_REF master + PATCHES disable-setversion.patch ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln - TARGET ECSUtil +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ECSUtil.sln + PLATFORM ${PLATFORM} + LICENSE_SUBPATH license.txt + TARGET ECSUtil RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} ) file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - else() - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - endif() -endif() - -# Handle copyright -file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) - -vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) -- cgit v1.2.3 From 9b21ff9612916e24f89c6839599d3d50446597d8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 19 Oct 2018 03:00:39 -0700 Subject: [ecsutil] Commit missing patch --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/disable-setversion.patch | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ports/ecsutil/disable-setversion.patch diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index baec5a3cb..fada181ac 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil -Version: 1.0.1.2 +Version: 1.0.1.2-1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. Build-Depends: atlmfc diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch new file mode 100644 index 000000000..2899a0108 --- /dev/null +++ b/ports/ecsutil/disable-setversion.patch @@ -0,0 +1,36 @@ +diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj +index 05c5726..f8ac64e 100644 +--- a/ECSUtil/ECSUtil.vcxproj ++++ b/ECSUtil/ECSUtil.vcxproj +@@ -274,7 +274,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -361,7 +360,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -445,7 +443,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -541,7 +538,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file -- cgit v1.2.3 From ffa114aaa43e8bcdf880d6e2c47ee0ed46125070 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 24 Oct 2018 12:41:19 -0700 Subject: [ecsutil] Remove empty bin directories --- ports/ecsutil/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index dd29d0b93..4a8e48b2b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -47,3 +47,6 @@ vcpkg_install_msbuild( file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() -- cgit v1.2.3 From 949c038143ed8962ef0ca6d81221bb70ce96dd9c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 25 Oct 2018 10:21:25 -0700 Subject: [cpprestsdk] Improve websockets feature --- ports/azure-storage-cpp/CONTROL | 2 +- ports/cpprestsdk/CONTROL | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL index 9d4797282..d6e0080db 100644 --- a/ports/azure-storage-cpp/CONTROL +++ b/ports/azure-storage-cpp/CONTROL @@ -1,5 +1,5 @@ Source: azure-storage-cpp Version: 5.2.0 -Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp) +Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp) Description: Microsoft Azure Storage Client SDK for C++ A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/ diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 7a95faeb9..800d54d42 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,10 +1,10 @@ Source: cpprestsdk -Version: 2.10.6-2 -Build-Depends: zlib, openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows) +Version: 2.10.6-3 +Build-Depends: zlib, 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) 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: websockets Feature: websockets -Build-Depends: websocketpp (!uwp) +Build-Depends: websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp) Description: Websockets support -- cgit v1.2.3 From 9c62c6a37ac940abbb4f19237d9a891881421a1a Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 11 Oct 2018 22:03:05 -0700 Subject: Upgrades 2018.10.11 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 +-- ports/args/CONTROL | 2 +- ports/args/portfile.cmake | 4 +-- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 +-- ports/catch2/CONTROL | 2 +- ports/catch2/portfile.cmake | 4 +-- ports/chakracore/CONTROL | 2 +- ports/chakracore/portfile.cmake | 4 +-- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 4 +-- ports/exiv2/CONTROL | 2 +- ports/exiv2/portfile.cmake | 4 +-- ports/exprtk/CONTROL | 2 +- ports/fizz/CONTROL | 4 +++ ports/fizz/portfile.cmake | 41 +++++++++++++++++++++++ ports/fmt/CONTROL | 2 +- ports/fmt/portfile.cmake | 4 +-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 +-- ports/forest/CONTROL | 2 +- ports/forest/portfile.cmake | 4 +-- ports/jsonnet/CONTROL | 2 +- ports/jsonnet/portfile.cmake | 4 +-- ports/liblinear/CONTROL | 2 +- ports/liblinear/portfile.cmake | 4 +-- ports/libuv/CONTROL | 2 +- ports/libuv/portfile.cmake | 4 +-- ports/openimageio/CONTROL | 2 +- ports/openimageio/portfile.cmake | 4 +-- ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 +-- ports/rs-core-lib/CONTROL | 2 +- ports/rs-core-lib/portfile.cmake | 4 +-- ports/spdlog/CONTROL | 2 +- ports/spdlog/portfile.cmake | 4 +-- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 4 +-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 +-- ports/unicorn-lib/CONTROL | 2 +- ports/unicorn-lib/portfile.cmake | 4 +-- ports/unicorn/CONTROL | 2 +- ports/unicorn/portfile.cmake | 4 +-- ports/wangle/CONTROL | 6 ++-- ports/wangle/build.patch | 47 +++++---------------------- ports/wangle/portfile.cmake | 10 +++--- ports/yoga/CONTROL | 2 +- ports/yoga/portfile.cmake | 4 +-- ports/zeromq/CONTROL | 2 +- ports/zeromq/portfile.cmake | 4 +-- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 8 ++--- toolsrc/src/vcpkg/build.cpp | 8 ++--- 54 files changed, 141 insertions(+), 123 deletions(-) create mode 100644 ports/fizz/CONTROL create mode 100644 ports/fizz/portfile.cmake diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 61eb0e906..5ecd6e13c 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-09-18-3 +Version: 2018-10-11 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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 7894b5654..475a222c3 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 8ff1374008259719b54a8cb128ef951c02da164c - SHA512 c8eaef8d3a829152bbe1a9adf60fad74858d10e78d2fd1ad8409a027add2f9e24df9994e4981960550b04845838ec6f5ac83b09d6a8850d129fb078d15c4b94f + REF f340f773edab951656b19b6f1a77c964a78ec4c2 + SHA512 48f7de32255313292f0a86113149180d299902a1ced9cdf9dc5e6beefbd75eb0522ff4ab61e216474e64dd38aebc7c544a6cf7a3fea5836c82f28f19a582965a HEAD_REF master ) diff --git a/ports/args/CONTROL b/ports/args/CONTROL index 39b10c0b3..2fc33be71 100644 --- a/ports/args/CONTROL +++ b/ports/args/CONTROL @@ -1,3 +1,3 @@ Source: args -Version: 2018-06-28 +Version: 2018-10-11 Description: A simple header-only C++ argument parser library. diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake index 6d404b334..37ec56a1b 100644 --- a/ports/args/portfile.cmake +++ b/ports/args/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args - REF 3de44ec671db452cc0c4ef86399b108939768abb - SHA512 ba0f6d3f35ffd49a1c96bdd7f614dd1aea5644c1350d17986021fee92a6075e12fdb5711d098087475231cec90ccd7c2dcabf42ab8880b6645dac27d391275fc + REF 24868affc8f7f88ce8781bc6a21c5c7d5067c508 + SHA512 123e72a0f1d275de565443f818f37d3cf38ca43056802395aecf89d3cd913f628675c742cd136bf5cd25347ce783a34d938e2d97b6acf52e7479737dd0b8da33 HEAD_REF master ) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 7402c2e35..19a0ae5fb 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.6.12-1 +Version: 1.6.29 Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 854e24fcb..a2892e5ac 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 1.6.12 - SHA512 37cd573ea354394c170a081572f63dfe604bf631d0129a53f066f121680b92c8f64b343a4d841de9a178679a322755a858a1148fbfc99c3f525a1f025fdfbd84 + REF 1.6.29 + SHA512 54fd4ed4ddcc1c88e7efc951de2f13bc4b95cd08adf3b5dc74cdea68908accdc6dbf2f00bdc6f5aef1b8bf4c74023f6c22410a18766cb283e9cee03c3fd27d5b HEAD_REF master ) diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index 10c288d42..a120bc416 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.4.0 +Version: 2.4.1 Description: A modern, header-only test framework for unit testing. Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 81a0f6d0d..202ac8701 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.4.0 - SHA512 7bd148271520dfce24f64bab084226387a6adc9f0a5439b6cb2fa6b4e44b495475ecd9bc5936c6fa4f17e45132e826d8d47410b33d6c218d7a3202f5bb0ccbf4 + REF v2.4.1 + SHA512 054751959b675a4c871538f2e65b50e0efbaee8d0fafb26f0013a2b0da6fab406dbe9493dc4888c5651bce3da32ab7d7a56694dd68427377c6b0b25804657356 HEAD_REF master ) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index cc29aa2d5..005059909 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.11.1-1 +Version: 1.11.2 Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 3d7b2630d..43bb1606c 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore - REF v1.11.1 - SHA512 cabec836af505504ffff99050de79320fe32e7311842bc5c715dae18ae7e006b63bb56f4d071016708ddec05a2a07143677371a76a57def68fb7f428012452d3 + REF v1.11.2 + SHA512 6261a7028bf398703a610d9ad42b6bde7c6309d2997c7cfaa785c1fbcf582adbbbe60756bbe411af1d6e1d26ac9acca5cbe734608885d8b5f2881819477292b7 HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index ecb4df9f9..6170fb678 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.3.6 +Version: 2.4.0 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 edf4839d3..8dd1626f6 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.3.6 + REF v.2.4.0 HEAD_REF master - SHA512 b2214e6f72eee0dd4fd20739030c4082bfe67923a7f2efe74709b42e07d58552a6b7d1306f0fddf9478294e822313fe3bae0bff5c141e7dbb4453d08b3d9b05d) + SHA512 5aae75afcccc965e11eae6f322a15d245d2f75b7ad4914c61add3638c1bfaf5d9cf8cc52b52743cd21b149e0397ce180ab5e5f29dc09d37b443c3f3550c8a5a5) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index a89b87f8e..461d3036c 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,4 +1,4 @@ Source: exiv2 -Version: 2018-09-18 +Version: 2018-10-11 Build-Depends: zlib, expat, libiconv Description: Image metadata library and tools http://www.exiv2.org diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 4af8fb986..30d5805f1 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 37b8725565f42c260f9773fe4cfb8fa39f566746 - SHA512 8be6079546099ac7267978ed3aa1c8e42215baa06b5da30c78918dac8193a725b3c38f6fb47fb50e7724580a964360163e2167b08c7e5929485fd3bd037338b0 + REF 4c093fece194e55d029e0f6474e00bb38c1d3b46 + SHA512 33132eeb51dfe4bd22a0b2bd8a66d017c27ecc9c966d72ce0691f5d01d46d1d7881d9a96c35f0e3fd6165cbcc55a6ddb98d45685be9863f41a41e0af053a89a0 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch" ) diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL index c2e69703e..d00c2aaae 100644 --- a/ports/exprtk/CONTROL +++ b/ports/exprtk/CONTROL @@ -1,3 +1,3 @@ Source: exprtk -Version: 2018.09.30-9836f21 +Version: 2018-10-11 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL new file mode 100644 index 000000000..1267b81b9 --- /dev/null +++ b/ports/fizz/CONTROL @@ -0,0 +1,4 @@ +Source: fizz +Version: 2018.10.15.00 +Build-Depends: folly, openssl, libsodium +Description: a TLS 1.3 implementation by Facebook diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake new file mode 100644 index 000000000..f1c140afa --- /dev/null +++ b/ports/fizz/portfile.cmake @@ -0,0 +1,41 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookincubator/fizz + REF v2018.10.15.00 + SHA512 bf16050eebb8fa131927064a2467ee8cc20ba9a214cf232f38067afa9cb71414fa19ab1c65d7f2fb3e6dff651065aadeed02724fb4660fedb0c44da9073222c0 + HEAD_REF master +) + +# Prefer installed config files +file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake + ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}/fizz" + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF + -DINCLUDE_INSTALL_DIR:STRING=include +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/fizz") +vcpkg_copy_pdbs() + +file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents) +string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake "${_contents}") + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fizz RENAME copyright) diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index 88f41b36e..14306b730 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,3 +1,3 @@ Source: fmt -Version: 5.2.0 +Version: 5.2.1 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 9389d2fbf..a12f66c39 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 5.2.0 - SHA512 75d53e6d8087288607f75fb891bb8812c7b9fe65e5ab7a20cdffeb5e56bd1f48e0de24c8cf1c2dd603fe3ed76f9fa067804ec5d3560f177db8f0a747c36f9d1c + REF 5.2.1 + SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8 HEAD_REF master ) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 51a31ef8b..b63075ef9 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.09.17.00 +Version: 2018.10.08.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index e1ce597bf..acf535aa8 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.09.17.00 - SHA512 fe1f5ff2b55262717cb0e923ee3d8b5a82c85432823911afc924c209fc7e97ab776a3820c4b17e003a7a55150c8e0061918eaee33bdf7ca12ec1090ed7537592 + REF v2018.10.08.00 + SHA512 934e46104a34c1cf550532c7f47476b339b210059b21813adbe840eab5aa2e8053303607e33ace73ddf18dd750588bc30699f39758d11f6f80a2e0233515f1db HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL index e33353ee7..ceae2bbda 100644 --- a/ports/forest/CONTROL +++ b/ports/forest/CONTROL @@ -1,3 +1,3 @@ Source: forest -Version: 9.0.5 +Version: 9.0.6 Description: Template library of tree data structures diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index 3b3d5c889..c1f0db881 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest - REF 9.0.5 - SHA512 1dd3ae568ea2ce66cab285f392b167a08eef29387fffef3e9283c3ddaf1d461e5f6408cbce17bbaa928ba773a7890ec31f2612e5a2280cc4fe4a02824fbcd4a3 + REF 9.0.6 + SHA512 7cb6f25226bbd543332599d5ad2b8e13df6f06342ea12b58ed123ffd81d1362e10c2e01ff95132f7b25431a3ae984bee5cfb86852aa222e1fad1f4e6928f76bc HEAD_REF master ) diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index c89a34afc..e6866ac2c 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,3 +1,3 @@ Source: jsonnet -Version: 2018-09-18 +Version: 2018-10-11 Description: Jsonnet - The data templating language diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 918a4de8d..7603877a5 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF 48df4a1007a88202495a30bf2fa65528335b35e6 - SHA512 46734d797499d51a79c1c63d653bc8e6496d385a57c7a83a45c3ab82fa4f106abdb67a57b9641d5c9e1cf286f4f0a66cfdbc5e1987bda234d614c91d7be79c94 + REF 8b15e8d5c1202dde1be2cd8631025ff7719b688b + SHA512 5eb00c7473503ae4bab3aca1fe822bf3df8ae186db4bd46feb26114395690119e1934cbe601f033075d9e2672c80b1441741607e63b0d6b1fab559be6cde84d8 HEAD_REF master ) diff --git a/ports/liblinear/CONTROL b/ports/liblinear/CONTROL index 8a9cbcb9a..e4e855c52 100644 --- a/ports/liblinear/CONTROL +++ b/ports/liblinear/CONTROL @@ -1,3 +1,3 @@ Source: liblinear -Version: 2.20-1 +Version: 221 Description: A Library for Large Linear Classification diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake index 550b5745a..a73fa044b 100644 --- a/ports/liblinear/portfile.cmake +++ b/ports/liblinear/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/liblinear - REF v220 - SHA512 8e6e0bc87982bf9bb1c8ec206f82042942044fc7f5c28634356c7b926ced4907d46d4e791eaa8bf6b994921c45c7973c1ecb9c4174c18df49ea215c6b17e7c79 + REF v221 + SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753 HEAD_REF master ) diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index 5d9f3607f..a2bee52b5 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.23.0 +Version: 1.23.2 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 29741433c..c8c7daf88 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.23.0 - SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851 + REF v1.23.2 + SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5 HEAD_REF v1.x ) diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 12bc943d7..8771fe077 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,5 +1,5 @@ Source: openimageio -Version: Release-1.8.13 +Version: 1.8.15 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, 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 diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index c5786db64..80dc8faec 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF Release-1.8.13 - SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e + REF Release-1.8.15 + SHA512 e022e5c7e300d3dd952bcf3476e1b676a8931f67ba6b3959b26c75b9709907ac1c1b99de651f5876045f9a333e325a161b0d5159cb5bf385eb4f9f90a04707c7 HEAD_REF master PATCHES # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES' diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index e35601ab5..ebfeb05d0 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-09-18 +Version: 2018-10-11 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 48aa9e48d..5a038bc5d 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF 4c916c947ab7f2ba2d280bb8c87540c365d30695 - SHA512 7f34073415b2afd36469a0ffedb5d6d38b0230a82d633f2b45538e66d00ff0e411ffff1e34f74747c68518b1fdf07f7a601c23d39b001a75bcf9dadfc1350f04 + REF 6272edcb53d3c8705f57df3b46b1f92e646e30bc + SHA512 4a4f1eb44e3d2acce8697405bb27c31953b8d154245a1864376376bcf92e867166a203adb53c3d1f76c0de77ad090992992e54242b18477d9d60fe61ffb7406c HEAD_REF master ) diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 33f0a1f63..022b8ee9e 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2018-09-18 +Version: 2018-10-11 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index 927f34ea6..a001a06b0 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 9ffa126a7ca1a717ffd2c055c5049a15e1507d54 - SHA512 cdb02c546ff4514b63b3467b3296b0e5353ddcce8b774fa8accfbfd6559ab4a258af4822c219a5ce005719216c0c8c8707d377d2ce3ddb7d7a45fd9501787b60 + REF 4e142e1458f20086b3b4269d0537604117769e25 + SHA512 789fdeee5da0e9c64236f9bc0be32121c38a6fc3bec6976751a94ea78bd464a7c9389a5fd112d56eb6c10c7c2dc342276305b8e9831fe880c39f4f5017d26ddc HEAD_REF master ) diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 690e8bf4b..e74bed587 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 1.0.0 +Version: 1.2.0 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 90152bc08..66c727073 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.0.0 - SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1 + REF v1.2.0 + SHA512 f45d682e736106fdf9b96560c06eb8e8cc86d342003f0ef344954bf76aabc68dcdff53a767e4244fc9c48a900ba9fb122bb645962c1666139f860d68a354bfa9 HEAD_REF v1.x ) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index e87106dc3..8aa6dee78 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2018_U5-4 +Version: 2018_U6 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index ac47360f8..a4e912742 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/tbb - REF 2018_U5 - SHA512 3e8d20276ccb1b50099f96b6cf968e3d0ada53caea1fa836ecb8652f1dca236fbbbf2c783e64ea2f761f7f21725064d19b72d176e35e4dc29706b8a30965153b + REF 2018_U6 + SHA512 efcd020a24fa41e07ff9232098cecce42ceec5882849bc30edc29ead1694fcc8820a0defb307e0a065c1db1d649a731e13d8cb6fd6f927b4bd3bdc46de0d1709 HEAD_REF tbb_2018 ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index b654f4816..876e74991 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-09-18 +Version: 2018-10-11 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 88c74d6e1..13a2f85bd 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 12f8b14fff9888dbfe6f5d6c64dc462254922a31 - SHA512 e067b1e5533f323c7f3f20365388ab4dfd796bca427ec5e087e5bac2ae74412536eec1dea4f694c58e1b9e91763d16a8a07c25daa03676ec33bf8b1107913e47 + REF 2a2b72f6c8aef200ecee4984f011e06052288ff2 + SHA512 459b980af10d7f6eaa10b571d18f0efa668a8fc87d47307534e9043721ed28648deab261575e61727c50bf98788fe1f109265de4f5b87eaf57a444bcc7f5bfdd HEAD_REF master ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index f6a3bc9c0..808ab41a7 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2018-09-18 +Version: 2018-10-11 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index 3b97d3c01..b2bc2f89b 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 6456df41b6dfeecd35ec1d50eb86657512c76c40 - SHA512 04756035039b93905713e7c7f2fac66d545f3792d39b9c2c95946c4423a9e1bdef7fe736488764800f494570a3e9a83adc84b60a750bf62b2af4508671f76afe + REF d1c0918397ce2e5b1631686ff85a475eface027a + SHA512 1a2d2cf9bf34210068de4dfb70c0511dd661f2dd1ee574ed5d7b9f8f94bb6f0bf455b1a78633ad776357e1d7ef179231089d6936fd00ad11a3b073a5ba1bed2b HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index 80d33202c..f6c176b14 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2018-09-18 +Version: 2018-10-11 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 2a52c6be6..7d49ec05b 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 46999575fb9e82ccd925e835d0d7db47200e010d - SHA512 9a93157266f2f6b7f5b6fabefda77b4d617648f0112ff6b575be8c92eea16ea6c96b0575f040fd5a893240907492335c53c03c840fee58ca8808b39762fefc34 + REF 400a0ab30978ed06525a0ca24437fdadb2b10642 + SHA512 2bf0d127672e83d5cee08918b43a0edc1b229213b1de5ef2fbe99e79c17f4cb9f02bb34c9c123012ba8fcf5e08990d773ba08053356512749f95146961b7d19a HEAD_REF master ) diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index 9397b3d61..4bb5a2269 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle -Version: v2018.07.30.00-1 -Build-Depends: folly, openssl, gtest, glog, libevent, double-conversion -Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way. \ No newline at end of file +Version: 2018.07.30.00-2 +Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion +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 index fce998fed..d695f5b18 100644 --- a/ports/wangle/build.patch +++ b/ports/wangle/build.patch @@ -1,9 +1,9 @@ diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index 0302249..3bf1e6c 100644 +index 15dc8b6..ed8c79b 100644 --- a/wangle/CMakeLists.txt +++ b/wangle/CMakeLists.txt -@@ -38,9 +38,9 @@ endif() - +@@ -39,9 +39,9 @@ endif() + find_package(fizz CONFIG REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context) find_package(OpenSSL REQUIRED) -find_package(Glog REQUIRED) @@ -15,40 +15,11 @@ index 0302249..3bf1e6c 100644 find_package(DoubleConversion REQUIRED) find_package(Threads REQUIRED) if (UNIX AND NOT APPLE) -@@ -116,11 +116,9 @@ if (BUILD_SHARED_LIBS) - PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1) - endif() - --target_include_directories( -- wangle -- PUBLIC -- $ -- $ -+include_directories( -+ "${CMAKE_SOURCE_DIR}/.." -+ ${INCLUDE_INSTALL_DIR} +@@ -123,6 +123,7 @@ target_include_directories( + PUBLIC + $ + $ ++ PRIVATE + ${FIZZ_INCLUDE_DIR} ${FOLLY_INCLUDE_DIR} ${Boost_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} -@@ -143,15 +141,19 @@ target_link_libraries(wangle PUBLIC - install( - TARGETS wangle - EXPORT wangle-exports -- DESTINATION ${LIB_INSTALL_DIR} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib - ) - # We unfortunately cannot install wangle's headers with the install() - # statement above. install(TARGETS) appears to only support installing - # PUBLIC_HEADER in a flat include directory, and not a deeper tree. -+if(NOT DISABLE_INSTALL_HEADERS) - foreach(dir ${WANGLE_HEADER_DIRS}) -- install(DIRECTORY ${dir} DESTINATION "${INCLUDE_INSTALL_DIR}/wangle" -+ install(DIRECTORY ${dir} DESTINATION "include/wangle" - FILES_MATCHING PATTERN "*.h") - endforeach() -+endif() - - # Install CMake package configuration files for wangle - include(CMakePackageConfigHelpers) diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 8bd8e8c63..4c39b486a 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -1,10 +1,12 @@ include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2018.07.30.00 - SHA512 f83378a8751b47fac2c862e07ffeb2750fd681735e66d778657d7624fe3e839b2e2bfcb049ecd3a3516c206d93f9c168144599ded823720967e44037b536ba5d + REF v2018.10.15.00 + SHA512 aa7db7ef8c6332f951342228b6022fc2798e5cc2769ec7377c4f369a0e585832953e4454cef0b7c37ca368dc72f09278f92d5457bf7dffc31663ce7d28ee557d HEAD_REF master PATCHES build.patch @@ -16,8 +18,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DINCLUDE_INSTALL_DIR:STRING=include ) vcpkg_install_cmake() @@ -25,6 +26,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/wangle") vcpkg_copy_pdbs() file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/wangle/util/test ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs ${CURRENT_PACKAGES_DIR}/include/wangle/service/test diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL index e454a6406..a9fcd9419 100644 --- a/ports/yoga/CONTROL +++ b/ports/yoga/CONTROL @@ -1,3 +1,3 @@ Source: yoga -Version: 1.9.0 +Version: 1.10.0 Description: Yoga is a cross-platform layout engine which implements Flexbox diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index 026eac0f4..a8d532474 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -21,8 +21,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga - REF 1.9.0 - SHA512 34b8e0f8ee1b5d4bd0113f6d5cb8e218399d65d0b0bf8c50770746275a3076b7bc1af9c3d15aba0a2e858a5696f85bca206c89509625789598defb8e37802243 + REF 1.10.0 + SHA512 629d9fbc4e4ad3c495a92896803bf7a0fca8dd986068d9862ba2c9aa0a70f8542a35c0e9ce9974ccdc004827e5e072f45b6eabff1d00462ec437b48de9dfacf4 HEAD_REF master ) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index ba419fb39..a4a6dd37d 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2018-09-18 +Version: 2018-10-11 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 188eb0918..b19d2821a 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF ea517a28ff23cff24a3b2ead42e1f6a44e6fad0e - SHA512 11425b151192b39e770ece1df3139b99315a4647ec242e951b736cc232da79a0b80f635b071d87adaa7d3f6d4266ab67d31b8f95f31fe3ab278e53febc5ae796 + REF cfc9d5f5198e611d8d3ad4482d57cf6bb5b6bf59 + SHA512 1917bb9838798d6d977171cc03477ac909cbcf999527a0019efac9a31176f5becba5eef269569777121288dbd2d601c0c579e83cfe1cb1aa6eb093f74adcc955 HEAD_REF master ) diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 47c91f83c..ea9923df3 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -117,7 +117,7 @@ function(vcpkg_fixup_cmake_targets) file(READ ${DEBUG_TARGET} _contents) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" _contents "${_contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+\\.exe)" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" _contents "${_contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+\\.exe)" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" _contents "${_contents}") string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" _contents "${_contents}") string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" _contents "${_contents}") file(WRITE ${RELEASE_SHARE}/${DEBUG_TARGET_REL} "${_contents}") @@ -134,9 +134,9 @@ function(vcpkg_fixup_cmake_targets) "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}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "_INVALID_ROOT_" _contents "${_contents}") - string(REGEX REPLACE ";_INVALID_ROOT_/[^\";]*" "" _contents "${_contents}") - string(REGEX REPLACE "_INVALID_ROOT_/[^\";]*;" "" _contents "${_contents}") - string(REGEX REPLACE "\"_INVALID_ROOT_/[^\";]*\"" "\"\"" _contents "${_contents}") + string(REGEX REPLACE "_INVALID_ROOT_/[^\";>]*" "" _contents "${_contents}") + string(REGEX REPLACE ";;+" ";" _contents "${_contents}") + string(REGEX REPLACE "\";\"" "\"\"" _contents "${_contents}") file(WRITE ${MAIN_TARGET} "${_contents}") endforeach() diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 7569f340f..9b97701ef 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -468,18 +468,18 @@ namespace vcpkg::Build const Triplet& triplet = config.triplet; const std::string& name = config.scf.core_paragraph->name; - std::vector abi_tag_entries; + std::vector abi_tag_entries(dependency_abis.begin(), dependency_abis.end()); abi_tag_entries.emplace_back(AbiEntry {"cmake", paths.get_tool_version(Tools::CMAKE)}); - abi_tag_entries.insert(abi_tag_entries.end(), dependency_abis.begin(), dependency_abis.end()); - abi_tag_entries.emplace_back( AbiEntry {"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")}); abi_tag_entries.emplace_back( AbiEntry {"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")}); - abi_tag_entries.emplace_back(AbiEntry {"triplet", pre_build_info.triplet_abi_tag}); + abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"}); + + abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag}); const std::string features = Strings::join(";", config.feature_list); abi_tag_entries.emplace_back(AbiEntry {"features", features}); -- cgit v1.2.3 From e80548e13df8353ff4b856fc1b1689901774846c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 20 Oct 2018 12:37:47 -0700 Subject: [openimageio] Improve robustness --- ports/openimageio/CONTROL | 2 +- ports/openimageio/portfile.cmake | 9 ++++++++- ports/openimageio/use-webp.patch | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ports/openimageio/use-webp.patch diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 8771fe077..6f3687ca6 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,5 +1,5 @@ Source: openimageio -Version: 1.8.15 +Version: 1.8.15-1 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, 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 diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 80dc8faec..7997a6105 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_github( PATCHES # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES' # since libraw port installs 'raw_r' library as 'raw' - ${CMAKE_CURRENT_LIST_DIR}/fix_libraw.patch + fix_libraw.patch + use-webp.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -36,6 +37,7 @@ vcpkg_configure_cmake( -DOIIO_BUILD_TOOLS=OFF -DOIIO_BUILD_TESTS=OFF -DHIDE_SYMBOLS=ON + -DUSE_DICOM=OFF -DUSE_FFMPEG=OFF -DUSE_FIELD3D=OFF -DUSE_FREETYPE=OFF @@ -45,14 +47,19 @@ vcpkg_configure_cmake( -DUSE_OCIO=OFF -DUSE_OPENCV=OFF -DUSE_OPENJPEG=OFF + -DUSE_OPENSSL=OFF -DUSE_PTEX=OFF -DUSE_PYTHON=OFF -DUSE_QT=OFF + -DUSE_WEBP=OFF -DBUILDSTATIC=${BUILDSTATIC} -DLINKSTATIC=${LINKSTATIC} -DBUILD_MISSING_PYBIND11=OFF -DBUILD_MISSING_DEPS=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DVERBOSE=ON + OPTIONS_DEBUG + -DOPENEXR_CUSTOM_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib ) vcpkg_install_cmake() diff --git a/ports/openimageio/use-webp.patch b/ports/openimageio/use-webp.patch new file mode 100644 index 000000000..1b03636e9 --- /dev/null +++ b/ports/openimageio/use-webp.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index abd4e23..12a7f54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,6 +87,7 @@ option (USE_FREETYPE "Use Freetype if found" ON) + option (USE_GIF "Use GIF if found" ON) + option (USE_PTEX "Use PTex if found" ON) + option (USE_LIBRAW "Use LibRaw if found" ON) ++option (USE_WEBP "Use WebP if found" ON) + set (LIBRAW_PATH "" CACHE STRING "Custom LibRaw path") + option (OIIO_THREAD_ALLOW_DCLP "OIIO threads may use DCLP for speed" ON) + option (USE_NUKE "Build Nuke plugins, if Nuke is found" ON) +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 7dde986..66da94d 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -366,6 +366,7 @@ endif() + if (NOT WEBP_FIND_QUIETLY) + message (STATUS "WEBP_HOME=${WEBP_HOME}") + endif () ++if(USE_WEBP) + find_path (WEBP_INCLUDE_DIR webp/encode.h + "${PROJECT_SOURCE_DIR}/src/include" + "${WEBP_HOME}") +@@ -382,6 +383,9 @@ else() + set (WEBP_FOUND FALSE) + message (STATUS "WebP library not found") + endif() ++else() ++ set (WEBP_FOUND FALSE) ++endif() + # end Webp setup + ########################################################################### + -- cgit v1.2.3 From 9b7d93425fd17e1dff982ee13631b4fc18c31bbf Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 20 Oct 2018 14:11:58 -0700 Subject: [entityx] Fix parallel configure --- ports/entityx/fix-cmake.patch | 40 ++++++++++++++++++++++++++++++++++++++++ ports/entityx/portfile.cmake | 43 +++++++++++-------------------------------- 2 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 ports/entityx/fix-cmake.patch diff --git a/ports/entityx/fix-cmake.patch b/ports/entityx/fix-cmake.patch new file mode 100644 index 000000000..143cc52b1 --- /dev/null +++ b/ports/entityx/fix-cmake.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 87309bf..23f5063 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) + include(CheckCXXSourceCompiles) + + # Default compiler args ++if(0) + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=sign-compare -std=c++11") + set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") +@@ -41,6 +42,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS_RELEASE "/Ox -DNDEBUG") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /Zi /FS /DEBUG") + endif() ++endif() + + # if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-shadow -Wno-padded -Wno-missing-noreturn -Wno-global-constructors") +@@ -156,9 +158,9 @@ endif (ENTITYX_BUILD_TESTING) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h.in +- ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h + ) +- ++include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + if (NOT WINDOWS OR CYGWIN) + set(entityx_libs -lentityx) +@@ -179,6 +181,7 @@ install( + DESTINATION "include" + FILES_MATCHING PATTERN "*.h" + ) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h DESTINATION include/entityx) + + install( + TARGETS ${install_libs} diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index d35fb9da3..2c7978849 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -1,42 +1,21 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +include(vcpkg_common_functions) -if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "Entityx only supports dynamic CRT linkage") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/entityx-1.2.0) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/alecthomas/entityx/archive/1.2.0.zip" - FILENAME "entityx-1.2.0.zip" - SHA512 4d7009f0412fbccd7bee72713d53424c3b4fa39da62b87729dd84a710a059db27e65ca27b927285c82af09997caea125d85571824133d9b71b4e3c4eebd9917c +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alecthomas/entityx + REF 1.2.0 + SHA512 682aa302cb4495666aab2c0b39a286f88cb28046bc8b2deb603402105e15e4b9692e32807077abc3f465e42a4e0f34a7e69169bc74fc5579a5c3d0e17b02fdb8 + HEAD_REF master + PATCHES fix-cmake.patch ) -vcpkg_extract_source_archive(${ARCHIVE}) - -if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - SET(SHARED_FLAG ON) -else() - SET(SHARED_FLAG OFF) -endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 - -DENTITYX_BUILD_SHARED=${SHARED_FLAG} - -DENTITYX_BUILD_TESTING=false + -DENTITYX_BUILD_TESTING=false ) vcpkg_install_cmake() -- cgit v1.2.3 From 854a1e474e9be180f39f19d98f1770c2a9599493 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 20 Oct 2018 14:17:14 -0700 Subject: [fastcdr] Fix installed cmake files --- ports/fastcdr/CONTROL | 2 +- ports/fastcdr/portfile.cmake | 10 +++++----- ports/fastrtps/portfile.cmake | 6 +----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL index dfd04bf06..9076962c7 100644 --- a/ports/fastcdr/CONTROL +++ b/ports/fastcdr/CONTROL @@ -1,3 +1,3 @@ Source: fastcdr -Version: 1.0.6-1 +Version: 1.0.6-2 Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard. diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index 91362f3b2..c3b6967d9 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -6,11 +6,7 @@ vcpkg_from_github( REF v1.0.6 SHA512 80861ff6a0283e1398306e081fe70d7d185f980e5714ae51864cae012b8f79719efa24e7f41025b2bfb2052cb2a3098436c75a38407f8f5a331593cb91868fb2 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake.patch + PATCHES install-cmake.patch ) vcpkg_configure_cmake( @@ -25,6 +21,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastcdr/cmake) +file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" _contents) +string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdrTargets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdrTargets.cmake)" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" "${_contents}") + vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr) diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 0dce8ed73..8111de74d 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -6,11 +6,7 @@ vcpkg_from_github( REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release SHA512 9ec4a1e41296df1c0bc00926d925e0947602fabb68e9b28311e92739b0e1909a2993b15fc05eb31aeb9842ed50127f8d56571d09e57dd64ac6f37d0fed6cea73 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-install.patch + PATCHES fix-install.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 9cb0f3c8aee0431981e1d0d59c1ecfbe698ddf5d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 22 Oct 2018 03:43:11 -0700 Subject: [rapidjson] Fix #error on arm64 --- ports/rapidjson/CONTROL | 2 +- ports/rapidjson/arm64-endian.patch | 13 +++++++++++++ ports/rapidjson/portfile.cmake | 1 + ports/rapidjson/usage | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ports/rapidjson/arm64-endian.patch diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL index 7646755a5..5e7d4e5cf 100644 --- a/ports/rapidjson/CONTROL +++ b/ports/rapidjson/CONTROL @@ -1,3 +1,3 @@ Source: rapidjson -Version: 1.1.0-1 +Version: 1.1.0-2 Description: A fast JSON parser/generator for C++ with both SAX/DOM style API diff --git a/ports/rapidjson/arm64-endian.patch b/ports/rapidjson/arm64-endian.patch new file mode 100644 index 000000000..81fd92132 --- /dev/null +++ b/ports/rapidjson/arm64-endian.patch @@ -0,0 +1,13 @@ +diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h +index 053b2ce..1e0b8f3 100644 +--- a/include/rapidjson/rapidjson.h ++++ b/include/rapidjson/rapidjson.h +@@ -236,7 +236,7 @@ + # define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN + # elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) + # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN +-# elif defined(_MSC_VER) && defined(_M_ARM) ++# elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64)) + # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN + # elif defined(RAPIDJSON_DOXYGEN_RUNNING) + # define RAPIDJSON_ENDIAN diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 4f87ed6f4..45686aab0 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( REF v1.1.0 SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff HEAD_REF master + PATCHES arm64-endian.patch ) # Use RapidJSON's own build process, skipping examples and tests diff --git a/ports/rapidjson/usage b/ports/rapidjson/usage index 81e541e17..b72b8e3d6 100644 --- a/ports/rapidjson/usage +++ b/ports/rapidjson/usage @@ -1,4 +1,4 @@ The package rapidjson provides CMake integration: - find_package(RapidJSON REQUIRED) + find_package(RapidJSON CONFIG REQUIRED) target_include_directories(main PRIVATE ${RAPIDJSON_INCLUDE_DIRS}) -- cgit v1.2.3 From 7b0ca5d022785294448e86eb75af36387acdc49b Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 22 Oct 2018 03:51:28 -0700 Subject: [flann] Fix parallel configure --- ports/flann/CONTROL | 2 +- ports/flann/no-write-src-dir.patch | 19 +++++++++++++++++++ ports/flann/portfile.cmake | 11 ++++------- 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 ports/flann/no-write-src-dir.patch diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index 850c76850..4ec6072ab 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,3 @@ Source: flann -Version: 1.9.1-7 +Version: 1.9.1-8 Description: Fast Library for Approximate Nearest Neighbors diff --git a/ports/flann/no-write-src-dir.patch b/ports/flann/no-write-src-dir.patch new file mode 100644 index 000000000..c44c869cc --- /dev/null +++ b/ports/flann/no-write-src-dir.patch @@ -0,0 +1,19 @@ +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index eb84c8a..e6c8ae0 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -2,7 +2,13 @@ + + add_definitions(-D_FLANN_VERSION=${FLANN_VERSION}) + +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h) ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h) ++include_directories(${CMAKE_CURRENT_BINARY_DIR}/flann) ++ ++install ( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h ++ DESTINATION include/flann ++) + + file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c) + file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index e40e45b68..2d6c40486 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -6,14 +6,11 @@ vcpkg_from_github( REF 1.9.1 SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-install-flann.patch - ${CMAKE_CURRENT_LIST_DIR}/Revert-fix-install-flann.patch - ${CMAKE_CURRENT_LIST_DIR}/export-all-symbols-of-flann-cpp.patch + fix-install-flann.patch + Revert-fix-install-flann.patch + export-all-symbols-of-flann-cpp.patch + no-write-src-dir.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 2b555061cebc08b75b7229073b030ebf6dcf83fb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 22 Oct 2018 04:00:49 -0700 Subject: [hunspell] Avoid building tools when targetting UWP --- ports/hunspell/CMakeLists.txt | 112 ++++++++++++++++++++++-------------------- ports/hunspell/CONTROL | 2 +- ports/hunspell/portfile.cmake | 32 +++--------- 3 files changed, 66 insertions(+), 80 deletions(-) diff --git a/ports/hunspell/CMakeLists.txt b/ports/hunspell/CMakeLists.txt index c04e0e37c..7794d36cf 100644 --- a/ports/hunspell/CMakeLists.txt +++ b/ports/hunspell/CMakeLists.txt @@ -61,6 +61,11 @@ set(LIBHUNSPELL_HDRS #hunspell/libhunspell add_library(libhunspell ${LIBHUNSPELL_HDRS} ${LIBHUNSPELL_SRCS}) target_compile_definitions(libhunspell PRIVATE -DBUILDING_LIBHUNSPELL) +install(TARGETS libhunspell + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) #parsers/libparsers set(LIBPARSERS_SRCS @@ -93,59 +98,58 @@ set(TESTPARSER_SRCS src/parsers/odfparser.cxx ) -add_executable(testparser ${TESTPARSER_SRCS}) -target_link_libraries(testparser libhunspell) - -#tools/analyze -add_executable(analyze "src/tools/analyze.cxx") -target_link_libraries(analyze libhunspell) - -#tools/chmorph -add_executable(chmorph "src/tools/chmorph.cxx" $) -target_link_libraries(chmorph libhunspell) - -#tools/hunspell -include(CheckIncludeFile) -check_include_file("curses.h" HAVE_CURSES_H) -check_include_file("langinfo.h" HAVE_LANGINFO_CODESET) -check_include_file("libintl.h" HAVE_LIBINTL_H) -check_include_file("locale.h" HAVE_LOCALE_H) -check_include_file("ncursesw/curses.h" HAVE_NCURSESW_H) -check_include_file("unistd.h" HAVE_UNISTD_H) -configure_file("config.h.in" "config.h") - -add_executable(hunspell "src/tools/hunspell.cxx" $) -target_include_directories(hunspell PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") -target_link_libraries(hunspell libhunspell) - -#tools/munch -add_executable(munch "src/tools/munch.cxx") - -#tools/unmunch -add_executable(unmunch "src/tools/unmunch.cxx") - -#tools/hzip -#add_executable(hzip "src/tools/hzip.cxx") -#target_link_libraries(hzip libhunspell) - -#tools/hunzip -add_executable(hunzip "src/tools/hunzip.cxx") -target_link_libraries(hunzip libhunspell) - -install( -TARGETS - libhunspell - hunspell - testparser - analyze - chmorph - munch - unmunch -# hzip - hunzip -ARCHIVE DESTINATION lib -LIBRARY DESTINATION lib -RUNTIME DESTINATION bin -) +if(NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND CMAKE_BUILD_TYPE STREQUAL "Release") + add_executable(testparser ${TESTPARSER_SRCS}) + target_link_libraries(testparser libhunspell) + + #tools/analyze + add_executable(analyze "src/tools/analyze.cxx") + target_link_libraries(analyze libhunspell) + + #tools/chmorph + add_executable(chmorph "src/tools/chmorph.cxx" $) + target_link_libraries(chmorph libhunspell) + + #tools/hunspell + include(CheckIncludeFile) + check_include_file("curses.h" HAVE_CURSES_H) + check_include_file("langinfo.h" HAVE_LANGINFO_CODESET) + check_include_file("libintl.h" HAVE_LIBINTL_H) + check_include_file("locale.h" HAVE_LOCALE_H) + check_include_file("ncursesw/curses.h" HAVE_NCURSESW_H) + check_include_file("unistd.h" HAVE_UNISTD_H) + configure_file("config.h.in" "config.h") + + add_executable(hunspell "src/tools/hunspell.cxx" $) + target_include_directories(hunspell PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") + target_link_libraries(hunspell libhunspell) + + #tools/munch + add_executable(munch "src/tools/munch.cxx") + + #tools/unmunch + add_executable(unmunch "src/tools/unmunch.cxx") + + #tools/hzip + #add_executable(hzip "src/tools/hzip.cxx") + #target_link_libraries(hzip libhunspell) + + #tools/hunzip + add_executable(hunzip "src/tools/hunzip.cxx") + target_link_libraries(hunzip libhunspell) + + install( + TARGETS + hunspell + testparser + analyze + chmorph + munch + unmunch + # hzip + hunzip + DESTINATION tools/hunspell + ) +endif() install(FILES ${LIBHUNSPELL_HDRS} DESTINATION "include/hunspell/") diff --git a/ports/hunspell/CONTROL b/ports/hunspell/CONTROL index da62f205b..e13bef73d 100644 --- a/ports/hunspell/CONTROL +++ b/ports/hunspell/CONTROL @@ -1,3 +1,3 @@ Source: hunspell -Version: 1.6.1-2 +Version: 1.6.1-3 Description: The most popular spellchecking library. diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index 7d632563c..d49f4a8dc 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -1,18 +1,12 @@ include(vcpkg_common_functions) -set(HUNSPELL_VERSION 1.6.1) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hunspell-${HUNSPELL_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/hunspell/hunspell/archive/v${HUNSPELL_VERSION}.zip" - FILENAME "hunspell-${HUNSPELL_VERSION}.zip" - SHA512 164eb1ae9ff9f4d8efe8998fa3ad847bf5a0c1a87113acc52dcdb3aaddb4e9179274585623bd7152f9a82b803bd42ce24fe856ac8d49121214bef59ac1c7753c -) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_fix_unistd.patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hunspell/hunspell + REF v1.6.1 + SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458 + HEAD_REF master + PATCHES 0001_fix_unistd.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -23,24 +17,13 @@ vcpkg_configure_cmake( PREFER_NINJA ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB_RECURSE TOOLS_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB_RECURSE TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - -file(COPY ${TOOLS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG}) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/hunspell) file(RENAME ${CURRENT_PACKAGES_DIR}/share/hunspell/COPYING ${CURRENT_PACKAGES_DIR}/share/hunspell/copyright) @@ -49,4 +32,3 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/hunspell/COPYING.LESSER ${CURRENT_PACK file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/hunspell) file(RENAME ${CURRENT_PACKAGES_DIR}/share/hunspell/COPYING.MPL ${CURRENT_PACKAGES_DIR}/share/hunspell/copyright-mpl) - -- cgit v1.2.3 From bdb1ae990747aee663a00a9cec53bf2b65bac961 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 22 Oct 2018 04:16:02 -0700 Subject: [tiff] Use lzma on linux --- ports/libgeotiff/portfile.cmake | 23 ++++++++++++----------- ports/tiff/CONTROL | 4 ++-- ports/tiff/vcpkg-cmake-wrapper.cmake | 11 +++-------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index 3f0e1aac0..2c83b451a 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -2,22 +2,23 @@ include(vcpkg_common_functions) set(LIBGEOTIFF_VERSION 1.4.2) set(LIBGEOTIFF_HASH 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/1/libgeotiff-${LIBGEOTIFF_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" FILENAME "libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" - SHA512 ${LIBGEOTIFF_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/1) + SHA512 ${LIBGEOTIFF_HASH} +) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch" - "${CMAKE_CURRENT_LIST_DIR}/0002-Fix-directory-output.patch" - "${CMAKE_CURRENT_LIST_DIR}/0004-Fix-libxtiff-installation.patch" - "${CMAKE_CURRENT_LIST_DIR}/0005-Control-shared-library-build-with-option.patch" - "${CMAKE_CURRENT_LIST_DIR}/0006-Fix-utility-link-error.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBGEOTIFF_VERSION} + PATCHES + 0001-Updates-to-CMake-configuration-to-align-with-other-C.patch + 0002-Fix-directory-output.patch + 0004-Fix-libxtiff-installation.patch + 0005-Control-shared-library-build-with-option.patch + 0006-Fix-utility-link-error.patch ) vcpkg_configure_cmake( diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 710b7a1c2..d858ff83a 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.9-4 -Build-Depends: zlib, libjpeg-turbo, liblzma (windows) +Version: 4.0.9-5 +Build-Depends: zlib, libjpeg-turbo, liblzma Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake index 8edcb5e43..5ccb0e7ff 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake @@ -1,23 +1,18 @@ _find_package(${ARGS}) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - set(TIFF_EXTRA_LIBRARIES) - if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - find_package(LibLZMA) - list(APPEND TIFF_EXTRA_LIBRARIES ${LIBLZMA_LIBRARIES}) - endif() - + find_package(LibLZMA) find_package(JPEG) find_package(ZLIB) if(TARGET TIFF::TIFF) - set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${TIFF_EXTRA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB) + set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB) if(UNIX) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m) endif() endif() if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${TIFF_EXTRA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) + list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) if(UNIX) list(APPEND TIFF_LIBRARIES m) endif() -- cgit v1.2.3 From ece1e7a67a71e90b3432872044ecb7fdd0667f24 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 23 Oct 2018 10:23:41 -0700 Subject: [assimp] Requires rapidjson --- ports/assimp/CONTROL | 4 ++-- ports/assimp/portfile.cmake | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index 8bb6f8105..fc52411f9 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,4 +1,4 @@ Source: assimp -Version: 4.1.0-2 +Version: 4.1.0-3 Description: The Open Asset import library -Build-Depends: zlib +Build-Depends: zlib, rapidjson diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 66999122d..ecca87277 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -6,23 +6,20 @@ vcpkg_from_github( REF v4.1.0 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch" - "${CMAKE_CURRENT_LIST_DIR}/uninitialized-variable.patch" + dont-overwrite-prefix-path.patch + uninitialized-variable.patch ) file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${SOURCE_PATH}/contrib/rapidjson) set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_VIEW=OFF -DASSIMP_BUILD_ZLIB=OFF -- cgit v1.2.3 From 66107362b1fb67c9b46d2a225d698c2f7ed417c8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 23 Oct 2018 10:38:27 -0700 Subject: [libwebm] Avoid building executables --- ports/libwebm/CONTROL | 2 +- ports/libwebm/no-samples.patch | 20 ++++++++++++++++++++ ports/libwebm/portfile.cmake | 28 ++++++++++++---------------- 3 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 ports/libwebm/no-samples.patch diff --git a/ports/libwebm/CONTROL b/ports/libwebm/CONTROL index eb19cf16a..7a9bccfc7 100644 --- a/ports/libwebm/CONTROL +++ b/ports/libwebm/CONTROL @@ -1,3 +1,3 @@ Source: libwebm -Version: 1.0.0.27-2 +Version: 1.0.0.27-3 Description: WebM File Parser diff --git a/ports/libwebm/no-samples.patch b/ports/libwebm/no-samples.patch new file mode 100644 index 000000000..c160726b9 --- /dev/null +++ b/ports/libwebm/no-samples.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b48868f..f2fe35b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,7 @@ endif(WIN32) + + include_directories("${LIBWEBM_SRC_DIR}") + ++if(BUILD_SAMPLES) + # Sample section. + add_executable(sample + "${LIBWEBM_SRC_DIR}/sample.cpp") +@@ -69,6 +70,7 @@ add_executable(webm2pes + "${LIBWEBM_SRC_DIR}/webm2pes.cc" + "${LIBWEBM_SRC_DIR}/webm2pes.h") + target_link_libraries(webm2pes LINK_PUBLIC webm) ++endif() + + install( + TARGETS webm diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 6ccd7e3c5..7a233ecb6 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -1,21 +1,17 @@ include(vcpkg_common_functions) -set(LIBWEBM_VERSION 1.0.0.27) -set(LIBWEBM_HASH 15650b8b121b226654a5abed45a3586ddaf785dee8dac7c72df3f3f9aef76af4e561b75a2ef05328af8dfcfde21948b2edb59cd884dad08b8919cab4ee5a8596) - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebm-libwebm-${LIBWEBM_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/webmproject/libwebm/archive/libwebm-${LIBWEBM_VERSION}.tar.gz" - FILENAME "libwebm-${LIBWEBM_VERSION}.tar.gz" - SHA512 ${LIBWEBM_HASH} +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebm + REF libwebm-1.0.0.27 + SHA512 15650b8b121b226654a5abed45a3586ddaf785dee8dac7c72df3f3f9aef76af4e561b75a2ef05328af8dfcfde21948b2edb59cd884dad08b8919cab4ee5a8596 + HEAD_REF master + PATCHES + 0001-fix-cmake.patch + no-samples.patch ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-cmake.patch") -if(VCPKG_CRT_LINKAGE STREQUAL dynamic) +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(LIBWEBM_CRT_LINKAGE -DMSVC_RUNTIME=dll) else() set(LIBWEBM_CRT_LINKAGE -DMSVC_RUNTIME=static) @@ -24,9 +20,9 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS ${LIBWEBM_CRT_LINKAGE}) + OPTIONS ${LIBWEBM_CRT_LINKAGE} +) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() -- cgit v1.2.3 From 4cf611c2e6155257ae469f5646c15537e58597d2 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 23 Oct 2018 10:43:54 -0700 Subject: [rttr] Don't build benchmarks --- ports/rttr/CONTROL | 2 +- ports/rttr/portfile.cmake | 29 +++++------------------------ 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/ports/rttr/CONTROL b/ports/rttr/CONTROL index 80cff00bd..50aa21724 100644 --- a/ports/rttr/CONTROL +++ b/ports/rttr/CONTROL @@ -1,3 +1,3 @@ Source: rttr -Version: 0.9.5-2 +Version: 0.9.5-3 Description: an easy and intuitive way to use reflection in C++ diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 63a5678d9..8ce171cc6 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -13,40 +13,23 @@ vcpkg_from_github( REF v0.9.5 SHA512 b451f24fd4bdc4b7d9ecabdb6fd261744852e68357ec36573109354a25f2bf494908b9d4174602b59dd5005c42ba8edc3b35ec1d1386384db421805ac9994608 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/fix-directory-output.patch" - "${CMAKE_CURRENT_LIST_DIR}/disable-unit-tests.patch" - "${CMAKE_CURRENT_LIST_DIR}/remove-owner-read-perms.patch" + fix-directory-output.patch + disable-unit-tests.patch + remove-owner-read-perms.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBUILD_BENCHMARKS=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(GLOB REL_EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB DBG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(REL_EXES) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/rttr) - file(COPY ${REL_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/rttr) -endif() - -if(REL_EXES) - file(REMOVE ${REL_EXES}) -endif(REL_EXES) - -if(DBG_EXES) - file(REMOVE ${DBG_EXES}) -endif(DBG_EXES) - #Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rttr) file(RENAME ${CURRENT_PACKAGES_DIR}/share/rttr/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/rttr/copyright) @@ -58,5 +41,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/README.md ) - - -- cgit v1.2.3 From 59c6669b41d9c1b139bda0f5355f021ef2104823 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 23 Oct 2018 16:00:17 -0700 Subject: [winpcap] Clean build slightly --- ports/winpcap/CONTROL | 2 +- ports/winpcap/portfile.cmake | 55 +++--- ports/winpcap/wpcap.patch | 414 ------------------------------------------- 3 files changed, 26 insertions(+), 445 deletions(-) delete mode 100644 ports/winpcap/wpcap.patch diff --git a/ports/winpcap/CONTROL b/ports/winpcap/CONTROL index 3a09db558..1454948d2 100644 --- a/ports/winpcap/CONTROL +++ b/ports/winpcap/CONTROL @@ -1,3 +1,3 @@ Source: winpcap -Version: 4.1.3-1 +Version: 4.1.3-2 Description: WinPcap is the industry-standard tool for link-layer network access in Windows environments. diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 701c9892e..613a5733e 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -1,28 +1,22 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/winpcap) + +set(WINPCAP_VERSION 4_1_3) + vcpkg_download_distfile(ARCHIVE - URLS "https://www.winpcap.org/install/bin/WpcapSrc_4_1_3.zip" - FILENAME "WpcapSrc_4_1_3.zip" + URLS "https://www.winpcap.org/install/bin/WpcapSrc_${WINPCAP_VERSION}.zip" + FILENAME "WpcapSrc_${WINPCAP_VERSION}.zip" SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33 ) +vcpkg_download_distfile(COPYRIGHT + URLS "https://www.winpcap.org/misc/copyright.htm" + FILENAME "Wpcap_license.htm" + SHA512 661e848f229612a4354e8243cdb0cb7ef387abc8933412b8c09ccfcaa3335143a958ea9ec9da558f89afe71afea29f0548872e3544ea51144c297a1aa1276718 +) + # MSBuild performs in-source builds, so to ensure reliability we must clear them each time file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) -vcpkg_extract_source_archive(${ARCHIVE}) - if(VCPKG_CRT_LINKAGE STREQUAL "static") set(CRT_LINKAGE "MT") elseif(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -30,19 +24,22 @@ elseif(VCPKG_CRT_LINKAGE STREQUAL "dynamic") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") -set(LIBRARY_LINKAGE "4") + set(LIBRARY_LINKAGE "4") elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") -set(LIBRARY_LINKAGE "2") + set(LIBRARY_LINKAGE "2") endif() -configure_file("${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch.in" "${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch" @ONLY) -configure_file("${CMAKE_CURRENT_LIST_DIR}/wpcap.patch.in" "${CMAKE_CURRENT_LIST_DIR}/wpcap.patch" @ONLY) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch" - "${CMAKE_CURRENT_LIST_DIR}/wpcap.patch" - "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch" +configure_file("${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch.in" "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/wpcap.patch.in" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" @ONLY) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${WINPCAP_VERSION} + PATCHES + "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" + "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" + "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch" ) file( @@ -185,6 +182,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") ) endif() -# Handle copyright -file(DOWNLOAD "https://www.winpcap.org/misc/copyright.htm" ${SOURCE_PATH}/copyright.htm) -file(INSTALL ${SOURCE_PATH}/copyright.htm DESTINATION ${CURRENT_PACKAGES_DIR}/share/winpcap RENAME copyright) +configure_file(${COPYRIGHT} ${CURRENT_PACKAGES_DIR}/share/winpcap/copyright COPYONLY) diff --git a/ports/winpcap/wpcap.patch b/ports/winpcap/wpcap.patch deleted file mode 100644 index 6296bbd39..000000000 --- a/ports/winpcap/wpcap.patch +++ /dev/null @@ -1,414 +0,0 @@ -diff --git a/wpcap/PRJ/wpcap.dsp b/wpcap/PRJ/wpcap.dsp -index e53a865..0e4ed19 100644 ---- a/wpcap/PRJ/wpcap.dsp -+++ b/wpcap/PRJ/wpcap.dsp -@@ -48,8 +48,8 @@ RSC=rc.exe - # PROP Intermediate_Dir "Release" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBPCAP_EXPORTS" /YX /FD /c --# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c -+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBPCAP_EXPORTS" /YX /FD /c -+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "NDEBUG" -@@ -75,8 +75,8 @@ LINK32=link.exe - # PROP Intermediate_Dir "Debug" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBPCAP_EXPORTS" /YX /FD /GZ /c --# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c -+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBPCAP_EXPORTS" /YX /FD /GZ /c -+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "_DEBUG" -@@ -103,8 +103,8 @@ LINK32=link.exe - # PROP Intermediate_Dir "Debug_REMOTE" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D "HAVE_ADDRINFO" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "_DEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c --# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c -+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D "HAVE_ADDRINFO" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "_DEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c -+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "_DEBUG" -@@ -138,8 +138,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy - # PROP Intermediate_Dir "Debug_REMOTE_DAG" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D "HAVE_ADDRINFO" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "_DEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c --# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c -+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D "HAVE_ADDRINFO" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "_DEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c -+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "_DEBUG" -@@ -173,8 +173,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy - # PROP Intermediate_Dir "Release_REMOTE" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c --# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c -+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c -+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "NDEBUG" -@@ -208,8 +208,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy - # PROP Intermediate_Dir "Release_REMOTE_DAG" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c --# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c -+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c -+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "NDEBUG" -@@ -243,8 +243,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy - # PROP Intermediate_Dir "Release_REMOTE_NO_AIRPCAP" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c --# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c -+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c -+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "NDEBUG" -@@ -278,8 +278,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy - # PROP Intermediate_Dir "Debug_REMOTE_NO_AIRPCAP" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c --# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c -+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c -+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 - # ADD BASE RSC /l 0x410 /d "_DEBUG" -diff --git a/wpcap/PRJ/wpcap.vcproj b/wpcap/PRJ/wpcap.vcproj -index c1d56b4..40a8ce1 100644 ---- a/wpcap/PRJ/wpcap.vcproj -+++ b/wpcap/PRJ/wpcap.vcproj -@@ -22,7 +22,7 @@ - Name="Debug|Win32" - OutputDirectory="$(ProjectDir)\$(ConfigurationName)\x86" - IntermediateDirectory="$(ProjectDir)\$(ConfigurationName)\x86" -- ConfigurationType="2" -+ ConfigurationType="2" - CharacterSet="2" - > - - -@@ -205,7 +205,7 @@ - -@@ -285,7 +285,7 @@ - - - -@@ -525,7 +525,7 @@ - -@@ -605,7 +605,7 @@ - - - #if !defined(HAVE_SNPRINTF) --#define snprintf pcap_snprintf --extern int snprintf (char *, size_t, const char *, ...); -+#define snprintf _snprintf -+//#define snprintf pcap_snprintf -+//extern int snprintf (char *, size_t, const char *, ...); - #endif - - #if !defined(HAVE_VSNPRINTF) -diff --git a/wpcap/libpcap/rpcapd/rpcapd.dsp b/wpcap/libpcap/rpcapd/rpcapd.dsp -index f7c00af..1cd823e 100644 ---- a/wpcap/libpcap/rpcapd/rpcapd.dsp -+++ b/wpcap/libpcap/rpcapd/rpcapd.dsp -@@ -44,8 +44,8 @@ RSC=rc.exe - # PROP Intermediate_Dir "Debug_REMOTE" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c --# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c -+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c -+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c - # ADD BASE RSC /l 0x409 /d "_DEBUG" - # ADD RSC /l 0x409 /d "_DEBUG" - BSC32=bscmake.exe -@@ -69,8 +69,8 @@ LINK32=link.exe - # PROP Intermediate_Dir "Debug_REMOTE_DAG" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c --# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /FR /YX /FD /GZ /c -+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c -+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /FR /YX /FD /GZ /c - # ADD BASE RSC /l 0x409 /d "_DEBUG" - # ADD RSC /l 0x409 /d "_DEBUG" - BSC32=bscmake.exe -@@ -94,8 +94,8 @@ LINK32=link.exe - # PROP Intermediate_Dir "Release_REMOTE" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c --# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c -+# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c -+# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c - # ADD BASE RSC /l 0x409 /d "NDEBUG" - # ADD RSC /l 0x409 /d "NDEBUG" - BSC32=bscmake.exe -@@ -120,8 +120,8 @@ LINK32=link.exe - # PROP Intermediate_Dir "Release_REMOTE_DAG" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" --# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c --# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /YX /FD /c -+# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c -+# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /YX /FD /c - # ADD BASE RSC /l 0x409 /d "NDEBUG" - # ADD RSC /l 0x409 /d "NDEBUG" - BSC32=bscmake.exe -diff --git a/wpcap/libpcap/rpcapd/rpcapd.vcproj b/wpcap/libpcap/rpcapd/rpcapd.vcproj -index 882fbac..b89f1f9 100644 ---- a/wpcap/libpcap/rpcapd/rpcapd.vcproj -+++ b/wpcap/libpcap/rpcapd/rpcapd.vcproj -@@ -41,7 +41,7 @@ - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\;..\Win32\include;..\..\..\Common;.\Win32-pthreads;..\..\Win32-Extensions" -- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;HAVE_VSNPRINTF;HAVE_REMOTE;WPCAP;_CRT_SECURE_NO_DEPRECATE;HAVE_TC_API" -+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_VSNPRINTF;HAVE_REMOTE;WPCAP;_CRT_SECURE_NO_DEPRECATE;HAVE_TC_API" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" -@@ -119,7 +119,7 @@ - Date: Tue, 23 Oct 2018 16:00:37 -0700 Subject: [gdal] Fix build failure in finding license file --- ports/gdal/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 1f3ca96e3..3d46cbccc 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -267,6 +267,4 @@ endif() vcpkg_copy_pdbs() # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/gdal/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/gdal/copyright) - -message(STATUS "Packaging ${TARGET_TRIPLET} done") +configure_file(${SOURCE_PATH_RELEASE}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/gdal/copyright COPYONLY) -- cgit v1.2.3 From 7f6b4fed7e02615567ca98c601f9820bbb2ab055 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 25 Oct 2018 09:37:31 -0700 Subject: [libssh] Use more stable link to patch --- ports/libssh/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index c864f5d84..89d2af1fd 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -12,8 +12,8 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_download_distfile(WINPATCH - URLS "https://bugs.libssh.org/file/data/qswxtcazmvjrycu5gcx4/PHID-FILE-azin7nwumsm64mw5pequ/file" - FILENAME "libssh-0a53c5b1.patch" + URLS "https://bugs.libssh.org/rLIBSSHf81ca6161223e3566ce78a427571235fb6848fe9?diff=1" + FILENAME "libssh-f81ca616.patch" SHA512 f3f6088f8f1bf8fe6226c1aa7b355d877be7f2aa9482c5e3de74b6a35fc5b28d8f89221d3afa5a5d3a5900519a86e5906516667ed22ad98f058616a8120999cd ) -- cgit v1.2.3 From f21d4f17e401376f2962543d07d4d81e056f02d8 Mon Sep 17 00:00:00 2001 From: Robert Isaacs Date: Thu, 25 Oct 2018 14:06:54 -0400 Subject: Include libpq-events header file (#4559) * Include libpq-events header file Missing the libpq events header file. This file is needed to use the asynchronous libpq interfaces. * [libpq] Bump control version --- ports/libpq/CMakeLists.txt | 3 ++- ports/libpq/CONTROL | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/libpq/CMakeLists.txt b/ports/libpq/CMakeLists.txt index 57b86e255..68da9356c 100644 --- a/ports/libpq/CMakeLists.txt +++ b/ports/libpq/CMakeLists.txt @@ -120,6 +120,7 @@ set(pg_libpq_interface ${CMAKE_CURRENT_BINARY_DIR}/include/pg_config_ext.h ${CMAKE_CURRENT_BINARY_DIR}/include/pg_config.h src/interfaces/libpq/libpq-fe.h + src/interfaces/libpq/libpq-events.h ) set(pg_libpq_catalog_interface src/include/catalog/pg_type.h @@ -147,4 +148,4 @@ if(INSTALL_INCLUDES) install(FILES ${pg_libpq_interface} DESTINATION include) install(DIRECTORY src/include/libpq DESTINATION include) install(FILES ${pg_libpq_catalog_interface} DESTINATION include/catalog) -endif() \ No newline at end of file +endif() diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index 225d886de..2755a2831 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,4 +1,4 @@ Source: libpq -Version: 9.6.1-4 +Version: 9.6.1-5 Description: The official database access API of postgresql Build-Depends: openssl, zlib (linux) -- cgit v1.2.3 From 97e9d96715c6d1ad3501b47c02f76f92c1221a99 Mon Sep 17 00:00:00 2001 From: Violet Giraffe Date: Thu, 25 Oct 2018 21:07:35 +0300 Subject: libbson installation issue on Linux fixed (#4561) * libbson installation issue on Linux fixed * [libbson] Modernize --- ports/libbson/portfile.cmake | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 3bc9cd18a..45bc06170 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,16 +1,16 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.9.2) +set(LIBBSON_VERSION 1.9.2) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/libbson/archive/1.9.2.tar.gz" - FILENAME "libbson-1.9.2.tar.gz" + URLS "https://github.com/mongodb/libbson/archive/${LIBBSON_VERSION}.tar.gz" + FILENAME "libbson-${LIBBSON_VERSION}.tar.gz" SHA512 a05f1e8fbabb34e847692397e2e41fc5923ddd18dba861e5ab8a31acdf6738e13ab719eae8f9f8563f08fc43aab5c8d1f53cb6a47c38c96e132fa4a62a48d2bf ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBBSON_VERSION} + PATCHES fix-uwp.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -45,18 +45,26 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib) + if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libbson-static-1.0.a + ${CURRENT_PACKAGES_DIR}/lib/libbson-1.0.a) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libbson-static-1.0.a + ${CURRENT_PACKAGES_DIR}/debug/lib/libbson-1.0.a) + else() + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib) + endif() # drop the __declspec(dllimport) when building static vcpkg_apply_patches( SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/static.patch + PATCHES static.patch ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -- cgit v1.2.3 From 3d2b540173ff5ce8debf8c9802aca4cfadd3efe1 Mon Sep 17 00:00:00 2001 From: Jiri Appl Date: Thu, 25 Oct 2018 11:47:58 -0700 Subject: Enable Windows ARM32 build of OpenSSL LTS (#4525) * Enable Windows ARM32 build of OpenSSL * [openssl-windows] Bump control version * [vtk] Fix hardcoded install paths * [osgearth] Backport VS2017u8 fix --- ports/openssl-windows/EnableWinARM32.patch | 21 +++++++++++++++ ports/openssl-windows/portfile.cmake | 8 ++++++ ports/osgearth/CONTROL | 2 +- ports/osgearth/portfile.cmake | 8 ++++++ ports/vtk/CONTROL | 2 +- ports/vtk/portfile.cmake | 42 ++++++++++++++++-------------- 6 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 ports/openssl-windows/EnableWinARM32.patch diff --git a/ports/openssl-windows/EnableWinARM32.patch b/ports/openssl-windows/EnableWinARM32.patch new file mode 100644 index 000000000..f1eedcb71 --- /dev/null +++ b/ports/openssl-windows/EnableWinARM32.patch @@ -0,0 +1,21 @@ +diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl +index dba96cba5e..7fd99959f1 100644 +--- a/util/pl/VC-32.pl ++++ b/util/pl/VC-32.pl +@@ -261,6 +261,8 @@ if ($shlib && $FLAVOR !~ /CE/) + { + $mlflags.=" $lflags /dll"; + $lib_cflag.=" -D_WINDLL"; ++ if ($base_cflags !~ /-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE/) ++ { + # + # Engage Applink... + # +@@ -286,6 +288,7 @@ ___ + CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ) + ___ + } ++ } + elsif ($shlib && $FLAVOR =~ /CE/) + { + $mlflags.=" $lflags /dll"; diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index d58d51431..f9a8bcbbf 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_apply_patches( SOURCE_PATH ${MASTER_COPY_SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch + ${CMAKE_CURRENT_LIST_DIR}/EnableWinARM32.patch ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch ) @@ -44,6 +45,13 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(OPENSSL_ARCH VC-WIN64A) set(OPENSSL_DO "ms\\do_win64a.bat") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(OPENSSL_ARCH VC-WIN32) + set(OPENSSL_DO "ms\\do_ms.bat") + set(CONFIGURE_COMMAND ${CONFIGURE_COMMAND} + no-asm + -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE + ) else() message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index c409a35a9..5a8255a2a 100644 --- a/ports/osgearth/CONTROL +++ b/ports/osgearth/CONTROL @@ -1,4 +1,4 @@ Source: osgearth -Version: 2.9-1 +Version: 2.9-2 Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping. Build-Depends: osg diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 3c6a55a26..77320a2e1 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -16,12 +16,20 @@ if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1) endif() string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OSG_PLUGINS_SUBDIR}") +vcpkg_download_distfile( + VS2017PATCH + URLS "https://github.com/remoe/osgearth/commit/f7081cc4f9991c955c6a0ef7b7b50e48360d14fd.diff" + FILENAME "osgearth-f7081cc4f9991c955c6a0ef7b7b50e48360d14fd.patch" + SHA512 eadb47a5713c00c05add8627e5cad22844db041da34081d59104151a1a1e2d5ac9552909d67171bfc0449a3e4d2930dd3a7914d3ec7ef7ff1015574e9c9a6105 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth REF d1884d819d4a43de32b7ca1ded655c73964bed17 SHA512 525ad4ce8bcbd7d73a2ed66e7fbcd9d302582276f26dda1ef2baa3828da5c1e302ba81aac95d0a0632c7395cbcd072d2b19d084ba641c1ba92872d42bb6f769c HEAD_REF master + PATCHES ${VS2017PATCH} ) vcpkg_configure_cmake( diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 8b9ae8f6b..e75795e74 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-1 +Version: 8.1.0-2 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index be344f8bf..c547929ce 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -2,15 +2,6 @@ include(vcpkg_common_functions) set(VTK_SHORT_VERSION "8.1") set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Kitware/VTK" - REF "v${VTK_LONG_VERSION}" - SHA512 09e110cba4ad9a6684e9b2af0cbb5b9053e3596ccb62aab96cd9e71aa4a96c809d96e13153ff44c28ad83015a61ba5195f7d34056707b62654c1bc057f9b9edf - HEAD_REF "master" -) - # ============================================================================= # Options: @@ -46,13 +37,18 @@ endif() set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file + # ============================================================================= -# Apply patches to the source code -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +# Clone & patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "Kitware/VTK" + REF "v${VTK_LONG_VERSION}" + SHA512 09e110cba4ad9a6684e9b2af0cbb5b9053e3596ccb62aab96cd9e71aa4a96c809d96e13153ff44c28ad83015a61ba5195f7d34056707b62654c1bc057f9b9edf + HEAD_REF "master" PATCHES # Disable ssize_t because this can conflict with ssize_t that is defined on windows. - ${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch + dont-define-ssize_t.patch # We force CMake to use it's own version of the FindHDF5 module since newer versions # shipped with CMake behave differently. E.g. the one shipped with CMake 3.9 always @@ -61,16 +57,16 @@ vcpkg_apply_patches( # Maybe in the future we can disable the patch and use the new version shipped with CMake # together with the hdf5-config.cmake that is written by HDF5 itself, but currently VTK # disables taking the config into account explicitly. - ${CMAKE_CURRENT_LIST_DIR}/use-fixed-find-hdf5.patch + use-fixed-find-hdf5.patch # We disable a workaround in the VTK CMake scripts that can lead to the fact that a dependency # will link to both, the debug and the release library. - ${CMAKE_CURRENT_LIST_DIR}/disable-workaround-findhdf5.patch + disable-workaround-findhdf5.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-find-libproj4.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-find-libharu.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-find-mysql.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-find-odbc.patch + fix-find-libproj4.patch + fix-find-libharu.patch + fix-find-mysql.patch + fix-find-odbc.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, @@ -293,6 +289,14 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" VTK_TARGETS_CONTE string(REGEX REPLACE "${CURRENT_INSTALLED_DIR}/lib/[^\\.]*\\.lib" "" VTK_TARGETS_CONTENT "${VTK_TARGETS_CONTENT}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" "${VTK_TARGETS_CONTENT}") +# Remove any remaining stray absolute references to the installed directory. +file(GLOB_RECURSE CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/vtk/*.cmake) +foreach(FILE IN LISTS CMAKE_FILES) + file(READ "${FILE}" _contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${VTK_INSTALL_PREFIX}" _contents "${_contents}") + file(WRITE "${FILE}" "${_contents}") +endforeach() + # ============================================================================= # Move executable to tools directory and clean-up other directories file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/vtk) -- cgit v1.2.3 From ac85ec3ac700f2ca01d25c98dfcfc3125ecf9866 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 23 Oct 2018 19:59:24 -0700 Subject: [scintilla] Update to 4.1.2 --- ports/scintilla/CONTROL | 2 +- ports/scintilla/portfile.cmake | 67 +++++++++++------------------------------- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL index 7cf89dfd2..8f1b2f38c 100644 --- a/ports/scintilla/CONTROL +++ b/ports/scintilla/CONTROL @@ -1,3 +1,3 @@ Source: scintilla -Version: 4.0.3 +Version: 4.1.2 Description: A free source code editing component for Win32, GTK+, and OS X diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index ecf554abd..aad39a8dc 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -1,55 +1,22 @@ -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "scintilla only supports dynamic linkage") -endif() -if(VCPKG_CRT_LINKAGE STREQUAL "static") - message(FATAL_ERROR "scintilla only supports dynamic crt") -endif() - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/scintilla) -vcpkg_download_distfile(ARCHIVE - URLS "http://www.scintilla.org/scintilla403.zip" - FILENAME "scintilla403.zip" - SHA512 51704651e99a6b51afff9957676afcf71fa1cc289c1713402c6e50c44a12ec956d5216751ebbbe6f251a23fa8c974510e7c9f37cb66f25f69c30e500e426baad -) -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -if(TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(BUILD_ARCH "Win32") -else() - set(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) -endif() +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/Win32/SciLexer.vcxproj - PLATFORM ${MSBUILD_PLATFORM} +vcpkg_download_distfile(ARCHIVE + URLS "http://www.scintilla.org/scintilla412.zip" + FILENAME "scintilla412.zip" + SHA512 10e24a2def5b3104b0f2eec473c53edb0a0cc19fbbef261e460a77415ec68ff83f9ee20c76cda7987627708c1d4ead5f964d4d5a98929d8256280bfa9bd0cddc +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF 4.1.2 ) -# Handle headers -file(INSTALL ${SOURCE_PATH}/include/ILexer.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/include/Sci_Position.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/include/SciLexer.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/include/Scintilla.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -# Handle libraries -if(BUILD_ARCH STREQUAL "Win32") - set(BUILD_DIR_DEBUG "/Debug") - set(BUILD_DIR_RELEASE "/Release") -else() - set(BUILD_DIR_DEBUG "${BUILD_ARCH}/Debug") - set(BUILD_DIR_RELEASE "${BUILD_ARCH}/Release") -endif() - -file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -# Handle PDBs - -file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/scintilla RENAME copyright) +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH Win32/SciLexer.vcxproj + INCLUDES_SUBPATH include + LICENSE_SUBPATH License.txt + ALLOW_ROOT_INCLUDES +) -- cgit v1.2.3 From 4bc01b00e0eb9bfe486535148858337e1ff2dbbd Mon Sep 17 00:00:00 2001 From: Neil McNeight Date: Thu, 25 Oct 2018 13:57:39 -0500 Subject: [sdl1][sdl1-net] Add new port for SDL v1.2.15 & SDL_net v1.2.8 (#4492) * [sdl1][sdl1-net] Add new port for SDL v1.2.15 & SDL_net v1.2.8 * Version 1.2 is still required for building DOSbox * [sdl1][sdl1-net] Revise to install to expected paths * Headers go in include\ instead of include\SDL1 * Use updated .sln and .vcxproj files * [sdl1] Modernize --- ports/sdl1-net/CMakeLists.txt | 28 ++ ports/sdl1-net/CONTROL | 4 + ports/sdl1-net/portfile.cmake | 23 ++ ports/sdl1/CONTROL | 3 + ports/sdl1/SDL.vcxproj | 354 +++++++++++++++++++++ ports/sdl1/SDL1_2017.sln | 50 +++ ports/sdl1/SDLmain.vcxproj | 215 +++++++++++++ .../sdl1/export-symbols-only-in-shared-build.patch | 15 + ports/sdl1/portfile.cmake | 40 +++ 9 files changed, 732 insertions(+) create mode 100644 ports/sdl1-net/CMakeLists.txt create mode 100644 ports/sdl1-net/CONTROL create mode 100644 ports/sdl1-net/portfile.cmake create mode 100644 ports/sdl1/CONTROL create mode 100644 ports/sdl1/SDL.vcxproj create mode 100644 ports/sdl1/SDL1_2017.sln create mode 100644 ports/sdl1/SDLmain.vcxproj create mode 100644 ports/sdl1/export-symbols-only-in-shared-build.patch create mode 100644 ports/sdl1/portfile.cmake diff --git a/ports/sdl1-net/CMakeLists.txt b/ports/sdl1-net/CMakeLists.txt new file mode 100644 index 000000000..05bdac9f8 --- /dev/null +++ b/ports/sdl1-net/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) +project(SDL1_NET C) + +if (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996") +endif() + +find_path(SDL_INCLUDE_DIR SDL.h) +find_library(SDL_LIBRARY NAMES SDLd SDL) + +add_library(SDL_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) + +set_target_properties(SDL_net PROPERTIES DEFINE_SYMBOL SDL1_EXPORTS) +target_compile_definitions(SDL_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) +target_include_directories(SDL_net PRIVATE ${SDL_INCLUDE_DIR}) +target_link_libraries(SDL_net ${SDL_LIBRARY} ws2_32 iphlpapi) + +install(TARGETS SDL_net + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +if(NOT DEFINED SDL_NET_SKIP_HEADERS) + install(FILES SDL_net.h DESTINATION include) +endif() + +message(STATUS "Link-time dependencies:") +message(STATUS " " ${SDL_LIBRARY}) diff --git a/ports/sdl1-net/CONTROL b/ports/sdl1-net/CONTROL new file mode 100644 index 000000000..ae968e581 --- /dev/null +++ b/ports/sdl1-net/CONTROL @@ -0,0 +1,4 @@ +Source: sdl1-net +Version: 1.2.8-2 +Description: Networking library for SDL +Build-Depends: sdl1 diff --git a/ports/sdl1-net/portfile.cmake b/ports/sdl1-net/portfile.cmake new file mode 100644 index 000000000..8bdf4bd3c --- /dev/null +++ b/ports/sdl1-net/portfile.cmake @@ -0,0 +1,23 @@ +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL_net-1.2.8) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" + FILENAME "SDL_net-1.2.8.tar.gz" + SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b +) + +vcpkg_extract_source_archive(${ARCHIVE}) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DSDL_NET_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl1-net) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl1-net/COPYING ${CURRENT_PACKAGES_DIR}/share/sdl1-net/copyright) diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL new file mode 100644 index 000000000..483813f51 --- /dev/null +++ b/ports/sdl1/CONTROL @@ -0,0 +1,3 @@ +Source: sdl1 +Version: 1.2.15-3 +Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/ports/sdl1/SDL.vcxproj b/ports/sdl1/SDL.vcxproj new file mode 100644 index 000000000..1db10bb76 --- /dev/null +++ b/ports/sdl1/SDL.vcxproj @@ -0,0 +1,354 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + SDL + + + + DynamicLibrary + v141 + false + + + DynamicLibrary + v141 + false + + + DynamicLibrary + v141 + false + + + DynamicLibrary + 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;%(PreprocessorDefinitions) + MultiThreadedDLL + 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;%(PreprocessorDefinitions) + MultiThreadedDLL + 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;%(PreprocessorDefinitions) + true + MultiThreadedDLL + 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;%(PreprocessorDefinitions) + true + MultiThreadedDLL + 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/SDL1_2017.sln b/ports/sdl1/SDL1_2017.sln new file mode 100644 index 000000000..a255cb6aa --- /dev/null +++ b/ports/sdl1/SDL1_2017.sln @@ -0,0 +1,50 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2003 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32 + Release_NoSTDIO|x64 = Release_NoSTDIO|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D0FB7C52-B8AE-4A23-A002-2F7DEF5F6BD6} + EndGlobalSection +EndGlobal diff --git a/ports/sdl1/SDLmain.vcxproj b/ports/sdl1/SDLmain.vcxproj new file mode 100644 index 000000000..228045d41 --- /dev/null +++ b/ports/sdl1/SDLmain.vcxproj @@ -0,0 +1,215 @@ + + + + + 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 + MultiThreadedDLL + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + MultiThreadedDLL + 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 + MultiThreadedDLL + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + X64 + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1/export-symbols-only-in-shared-build.patch b/ports/sdl1/export-symbols-only-in-shared-build.patch new file mode 100644 index 000000000..c1ea96dc3 --- /dev/null +++ b/ports/sdl1/export-symbols-only-in-shared-build.patch @@ -0,0 +1,15 @@ +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 +@@ -54,8 +54,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 __WATCOMC__ diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake new file mode 100644 index 000000000..de2d855e6 --- /dev/null +++ b/ports/sdl1/portfile.cmake @@ -0,0 +1,40 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SDL-Mirror/SDL + REF release-1.2.15 + SHA512 38b94a650ec205377ae1503d0ec8a5254ef6d50ed0acac8d985b57b64bc16ea042cfa41e19e5ef8317980c4afb83186829f5bc3da9433d0a649dfd10554801b5 + HEAD_REF master + PATCHES export-symbols-only-in-shared-build.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDL ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDLmain.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDLmain ) + +configure_file(${SOURCE_PATH}/include/SDL_config.h.default ${SOURCE_PATH}/include/SDL_config.h COPYONLY) + +# This text file gets copied as a library, and included as one in the package +file(REMOVE_RECURSE ${SOURCE_PATH}/src/hermes/COPYING.LIB) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH VisualC/SDL1_2017.sln + INCLUDES_SUBPATH include + LICENSE_SUBPATH COPYING + ALLOW_ROOT_INCLUDES +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/doxyfile) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/SDLmain.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDLmaind.lib) +endif() -- cgit v1.2.3 From a4403276a26ff231f5cb84ffd867df69aaf610ec Mon Sep 17 00:00:00 2001 From: bobk2824 <13680319+bobk2824@users.noreply.github.com> Date: Thu, 25 Oct 2018 15:00:40 -0400 Subject: New package: Native Windows C++ library for EMC ECS S3 REST support (#4035) * [ecsutil] Initial commit of 1.0.1.2 * [ecsutil] Simplify and use vcpkg_install_msbuild * [ecsutil] Commit missing patch * [ecsutil] Remove empty bin directories --- ports/ecsutil/CONTROL | 4 +++ ports/ecsutil/disable-setversion.patch | 36 +++++++++++++++++++++++ ports/ecsutil/portfile.cmake | 52 ++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/disable-setversion.patch create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 000000000..fada181ac --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,4 @@ +Source: ecsutil +Version: 1.0.1.2-1 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. +Build-Depends: atlmfc diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch new file mode 100644 index 000000000..2899a0108 --- /dev/null +++ b/ports/ecsutil/disable-setversion.patch @@ -0,0 +1,36 @@ +diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj +index 05c5726..f8ac64e 100644 +--- a/ECSUtil/ECSUtil.vcxproj ++++ b/ECSUtil/ECSUtil.vcxproj +@@ -274,7 +274,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -361,7 +360,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -445,7 +443,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -541,7 +538,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 000000000..4a8e48b2b --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,52 @@ +include(vcpkg_common_functions) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM x86) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM x64) +else() + message(FATAL_ERROR "Unsupported architecture") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME) + message(FATAL_ERROR "Unsupported platform. ECSUTIL currently only supports windows desktop.") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EMCECS/ecs-object-client-windows-cpp + REF v1.0.1.2 + SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f + HEAD_REF master + PATCHES disable-setversion.patch +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ECSUtil.sln + PLATFORM ${PLATFORM} + LICENSE_SUBPATH license.txt + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() -- cgit v1.2.3 From 03f4ab3808f90ebc1d3f99b86341d71748eb7364 Mon Sep 17 00:00:00 2001 From: Robert Colton Date: Thu, 25 Oct 2018 15:01:44 -0400 Subject: Qscintilla Namespace Fix (#4332) * fix da qt5 * fix qt config duplication * [qt5-base] Use vcpkg_extract_source_archive_ex [sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA * define SCI_NAMESPACE for qscintilla port * [qscintilla] Bump control version * [qscintilla] Fix spacing. Slightly modernize. --- ports/qscintilla/CONTROL | 2 +- ports/qscintilla/portfile.cmake | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL index ec8fcbbf4..59b75c8c1 100644 --- a/ports/qscintilla/CONTROL +++ b/ports/qscintilla/CONTROL @@ -1,4 +1,4 @@ Source: qscintilla -Version: 2.10-5 +Version: 2.10-7 Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin) Build-Depends: qt5-base diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake index 18ff18a97..71778e402 100644 --- a/ports/qscintilla/portfile.cmake +++ b/ports/qscintilla/portfile.cmake @@ -11,15 +11,9 @@ vcpkg_find_acquire_program(PYTHON3) # Add python3 to path get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) -SET(ENV{PATH} "${PYTHON_PATH};$ENV{PATH}") - -set(BUILD_OPTIONS - "${SOURCE_PATH}/Qt4Qt5/qscintilla.pro" - CONFIG+=build_all - CONFIG-=hide_symbols -) - -SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path(PREPEND ${PYTHON_PATH}) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) #Store build paths set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -30,6 +24,7 @@ vcpkg_configure_qmake( OPTIONS CONFIG+=build_all CONFIG-=hide_symbols + DEFINES+=SCI_NAMESPACE ) vcpkg_build_qmake( @@ -38,27 +33,27 @@ vcpkg_build_qmake( ) file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) +file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) -file(INSTALL +configure_file( ${RELEASE_DIR}/release/qscintilla2_qt5.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - RENAME qscintilla2.lib + ${CURRENT_PACKAGES_DIR}/lib/qscintilla2.lib + COPYONLY ) -file(INSTALL +configure_file( ${DEBUG_DIR}/debug/qscintilla2_qt5.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - RENAME qscintilla2.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/qscintilla2.lib + COPYONLY ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL + file(COPY ${RELEASE_DIR}/release/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) - file(INSTALL + file(COPY ${DEBUG_DIR}/debug/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) -- cgit v1.2.3 From 6d5eba6a6d4f99a03f104e0a639cbbba5325d41b Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 25 Oct 2018 20:34:45 +0100 Subject: xalan-c: Install headers correctly (#4565) * Add SKIP_CLEAN option to vcpkg_install_msbuild Also add vcpkg_clean_msbuild function to factor out clean logic and allow re-use in portfiles. * xalan-c: Correct header globbing * vcpkg_install_msbuild: SKIP_CLEAN documentation correction * [xalan-c] Add explicit check for localmsgindex header. [docs] Regenerate --- docs/maintainers/portfile-functions.md | 3 +++ docs/maintainers/vcpkg_add_to_path.md | 20 +++++++++++++++ docs/maintainers/vcpkg_clean_msbuild.md | 15 +++++++++++ docs/maintainers/vcpkg_from_bitbucket.md | 6 +++++ docs/maintainers/vcpkg_from_gitlab.md | 6 +++++ docs/maintainers/vcpkg_install_msbuild.md | 9 +++++-- docs/maintainers/vcpkg_test_cmake.md | 20 +++++++++++++++ ports/xalan-c/CONTROL | 2 +- ports/xalan-c/portfile.cmake | 11 +++++--- scripts/cmake/vcpkg_add_to_path.cmake | 41 ++++++++++++++++++++++++++++++ scripts/cmake/vcpkg_append_to_path.cmake | 41 ------------------------------ scripts/cmake/vcpkg_clean_msbuild.cmake | 19 ++++++++++++++ scripts/cmake/vcpkg_common_functions.cmake | 3 ++- scripts/cmake/vcpkg_install_msbuild.cmake | 20 ++++++++++----- 14 files changed, 161 insertions(+), 55 deletions(-) create mode 100644 docs/maintainers/vcpkg_add_to_path.md create mode 100644 docs/maintainers/vcpkg_clean_msbuild.md create mode 100644 docs/maintainers/vcpkg_test_cmake.md create mode 100644 scripts/cmake/vcpkg_add_to_path.cmake delete mode 100644 scripts/cmake/vcpkg_append_to_path.cmake create mode 100644 scripts/cmake/vcpkg_clean_msbuild.cmake diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index f9476d3a7..3180609ad 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -2,10 +2,12 @@ # Portfile helper functions - [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\_msbuild](vcpkg_build_msbuild.md) - [vcpkg\_check\_linkage](vcpkg_check_linkage.md) +- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md) - [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md) - [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md) @@ -18,3 +20,4 @@ - [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md) - [vcpkg\_install\_cmake](vcpkg_install_cmake.md) - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) +- [vcpkg\_test\_cmake](vcpkg_test_cmake.md) diff --git a/docs/maintainers/vcpkg_add_to_path.md b/docs/maintainers/vcpkg_add_to_path.md new file mode 100644 index 000000000..3657a5ea7 --- /dev/null +++ b/docs/maintainers/vcpkg_add_to_path.md @@ -0,0 +1,20 @@ +# 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. + +## 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_clean_msbuild.md b/docs/maintainers/vcpkg_clean_msbuild.md new file mode 100644 index 000000000..39d07077b --- /dev/null +++ b/docs/maintainers/vcpkg_clean_msbuild.md @@ -0,0 +1,15 @@ +# 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) + +## Source +[scripts/cmake/vcpkg_clean_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_clean_msbuild.cmake) diff --git a/docs/maintainers/vcpkg_from_bitbucket.md b/docs/maintainers/vcpkg_from_bitbucket.md index c8850b725..7e699f8ea 100644 --- a/docs/maintainers/vcpkg_from_bitbucket.md +++ b/docs/maintainers/vcpkg_from_bitbucket.md @@ -11,6 +11,7 @@ vcpkg_from_bitbucket( [REF ] [SHA512 <45d0d7f8cc350...>] [HEAD_REF ] + [PATCHES ...] ) ``` @@ -40,6 +41,11 @@ 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. diff --git a/docs/maintainers/vcpkg_from_gitlab.md b/docs/maintainers/vcpkg_from_gitlab.md index 69deea933..bc312f37a 100644 --- a/docs/maintainers/vcpkg_from_gitlab.md +++ b/docs/maintainers/vcpkg_from_gitlab.md @@ -11,6 +11,7 @@ vcpkg_from_gitlab( [REF ] [SHA512 <45d0d7f8cc350...>] [HEAD_REF ] + [PATCHES ...] ) ``` @@ -45,6 +46,11 @@ 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. diff --git a/docs/maintainers/vcpkg_install_msbuild.md b/docs/maintainers/vcpkg_install_msbuild.md index 76578c2ef..1de68ce70 100644 --- a/docs/maintainers/vcpkg_install_msbuild.md +++ b/docs/maintainers/vcpkg_install_msbuild.md @@ -52,12 +52,16 @@ 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. +The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds. ### TARGET_PLATFORM_VERSION The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) @@ -82,6 +86,7 @@ Additional options passed to msbuild for Debug builds. These are in addition to ## 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) ## Source diff --git a/docs/maintainers/vcpkg_test_cmake.md b/docs/maintainers/vcpkg_test_cmake.md new file mode 100644 index 000000000..15b3ad797 --- /dev/null +++ b/docs/maintainers/vcpkg_test_cmake.md @@ -0,0 +1,20 @@ +# vcpkg_test_cmake + +Tests a built package for CMake `find_package()` integration. + +## Usage: +```cmake +vcpkg_test_cmake(PACKAGE_NAME [MODULE]) +``` + +## Parameters: + +### PACKAGE_NAME +The expected name to find with `find_package()`. + +### MODULE +Indicates that the library expects to be found via built-in CMake targets. + + +## Source +[scripts/cmake/vcpkg_test_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_test_cmake.cmake) diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL index 41c407477..aa2345462 100644 --- a/ports/xalan-c/CONTROL +++ b/ports/xalan-c/CONTROL @@ -1,4 +1,4 @@ Source: xalan-c -Version: 1.11-3 +Version: 1.11-4 Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Build-Depends: xerces-c diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index 181786e1b..4c035260a 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -39,14 +39,19 @@ vcpkg_install_msbuild( OPTIONS_RELEASE /p:XERCESCROOT=${CURRENT_INSTALLED_DIR} OPTIONS_DEBUG /p:XERCESCROOT=${CURRENT_INSTALLED_DIR}/debug LICENSE_SUBPATH c/LICENSE + SKIP_CLEAN ) file(COPY ${SOURCE_PATH}/c/src/xalanc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.hpp) -# LocalMsgIndex.hpp is here -file(GLOB LOCALMSGINDEX ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_TRIPLET}-rel/*/c/Build/*/VC10/Release/Nls/Include/LocalMsgIndex.hpp) +# LocalMsgIndex.hpp and LocalMsgData.hpp are here +file(GLOB NLS_INCLUDES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/c/Build/*/VC10/Release/Nls/Include/*.hpp") +if(NOT NLS_INCLUDES) + message(FATAL_ERROR "Could not locate LocalMsgIndex.hpp") +endif() +file(COPY ${NLS_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xalanc/PlatformSupport) -file(COPY ${LOCALMSGINDEX} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xalanc/PlatformSupport) +vcpkg_clean_msbuild() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/NLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/util/MsgLoaders/ICU/resources) diff --git a/scripts/cmake/vcpkg_add_to_path.cmake b/scripts/cmake/vcpkg_add_to_path.cmake new file mode 100644 index 000000000..6890dfe31 --- /dev/null +++ b/scripts/cmake/vcpkg_add_to_path.cmake @@ -0,0 +1,41 @@ +## # 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. +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.") + endif() + if("${ARGV0}" STREQUAL "PREPEND") + if(NOT "${ARGC}" STREQUAL "2") + message(FATAL_ERROR "Expected second argument.") + endif() + if(CMAKE_HOST_WIN32) + set(ENV{PATH} "${ARGV1};$ENV{PATH}") + else() + set(ENV{PATH} "${ARGV1}:$ENV{PATH}") + endif() + else() + if(NOT "${ARGC}" STREQUAL "1") + message(FATAL_ERROR "Unexpected second argument: ${ARGV1}") + endif() + if(CMAKE_HOST_WIN32) + set(ENV{PATH} "$ENV{PATH};${ARGV0}") + else() + set(ENV{PATH} "$ENV{PATH}:${ARGV0}") + endif() + endif() +endfunction() \ No newline at end of file diff --git a/scripts/cmake/vcpkg_append_to_path.cmake b/scripts/cmake/vcpkg_append_to_path.cmake deleted file mode 100644 index 6890dfe31..000000000 --- a/scripts/cmake/vcpkg_append_to_path.cmake +++ /dev/null @@ -1,41 +0,0 @@ -## # 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. -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.") - endif() - if("${ARGV0}" STREQUAL "PREPEND") - if(NOT "${ARGC}" STREQUAL "2") - message(FATAL_ERROR "Expected second argument.") - endif() - if(CMAKE_HOST_WIN32) - set(ENV{PATH} "${ARGV1};$ENV{PATH}") - else() - set(ENV{PATH} "${ARGV1}:$ENV{PATH}") - endif() - else() - if(NOT "${ARGC}" STREQUAL "1") - message(FATAL_ERROR "Unexpected second argument: ${ARGV1}") - endif() - if(CMAKE_HOST_WIN32) - set(ENV{PATH} "$ENV{PATH};${ARGV0}") - else() - set(ENV{PATH} "$ENV{PATH}:${ARGV0}") - endif() - endif() -endfunction() \ No newline at end of file diff --git a/scripts/cmake/vcpkg_clean_msbuild.cmake b/scripts/cmake/vcpkg_clean_msbuild.cmake new file mode 100644 index 000000000..b0d77dfd2 --- /dev/null +++ b/scripts/cmake/vcpkg_clean_msbuild.cmake @@ -0,0 +1,19 @@ +## # 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 + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + ) +endfunction() diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index 90a3e2814..595ebb00e 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -1,6 +1,7 @@ include(vcpkg_acquire_msys) -include(vcpkg_append_to_path) +include(vcpkg_add_to_path) include(vcpkg_check_linkage) +include(vcpkg_clean_msbuild) include(vcpkg_download_distfile) include(vcpkg_extract_source_archive) include(vcpkg_execute_required_process) diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake index ad700dd35..11bcdf189 100644 --- a/scripts/cmake/vcpkg_install_msbuild.cmake +++ b/scripts/cmake/vcpkg_install_msbuild.cmake @@ -52,12 +52,16 @@ ## ### 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. +## The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds. ## ## ### TARGET_PLATFORM_VERSION ## The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) @@ -82,12 +86,15 @@ ## ## ## 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) + function(vcpkg_install_msbuild) cmake_parse_arguments( _csc - "USE_VCPKG_INTEGRATION;ALLOW_ROOT_INCLUDES;REMOVE_ROOT_INCLUDES" + "USE_VCPKG_INTEGRATION;ALLOW_ROOT_INCLUDES;REMOVE_ROOT_INCLUDES;SKIP_CLEAN" "SOURCE_PATH;PROJECT_SUBPATH;INCLUDES_SUBPATH;LICENSE_SUBPATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;PLATFORM_TOOLSET;TARGET_PLATFORM_VERSION;TARGET" "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG" ${ARGN} @@ -196,10 +203,9 @@ function(vcpkg_install_msbuild) vcpkg_copy_pdbs() - file(REMOVE_RECURSE - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - ) + if(NOT _csc_SKIP_CLEAN) + vcpkg_clean_msbuild() + endif() if(DEFINED _csc_INCLUDES_SUBPATH) file(COPY ${_csc_SOURCE_PATH}/${_csc_INCLUDES_SUBPATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/) -- cgit v1.2.3 From 526b53b4931f2e7f6574eb7a1e10bffcc8712ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Rodr=C3=ADguez?= Date: Thu, 25 Oct 2018 19:24:32 -0300 Subject: [socket-io-client] new port (#4557) --- ports/socket-io-client/CONTROL | 4 ++++ ports/socket-io-client/portfile.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/socket-io-client/CONTROL create mode 100644 ports/socket-io-client/portfile.cmake diff --git a/ports/socket-io-client/CONTROL b/ports/socket-io-client/CONTROL new file mode 100644 index 000000000..92a5f20c8 --- /dev/null +++ b/ports/socket-io-client/CONTROL @@ -0,0 +1,4 @@ +Source: socket-io-client +Version: 1.6.1 +Description: C++11 implementation of Socket.IO client +Build-Depends: boost, rapidjson, websocketpp diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake new file mode 100644 index 000000000..eed7a4d65 --- /dev/null +++ b/ports/socket-io-client/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO socketio/socket.io-client-cpp + REF 1.6.1 + SHA512 01c9c172e58a16b25af07c6bde593507792726aca28a9b202ed9531d51cd7e77c7e7d536102e50265d66de96e9708616075902dfdcfc72983758755381bad707 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/build/include + DESTINATION ${CURRENT_PACKAGES_DIR}/include + FILES_MATCHING PATTERN "*.h") + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/socket-io-client/copyright COPYONLY) -- cgit v1.2.3 From aba5a4abecd56b90f8f3568edb62db8c3344cb8e Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Fri, 26 Oct 2018 00:26:05 +0200 Subject: [corrade/magnum/-extras/-integration/-plugins] Update to 2018.10 (#4556) Signed-off-by: Squareys --- ports/corrade/CONTROL | 2 +- ports/corrade/portfile.cmake | 4 ++-- ports/magnum-extras/CONTROL | 2 +- ports/magnum-extras/portfile.cmake | 4 ++-- ports/magnum-integration/CONTROL | 2 +- ports/magnum-integration/portfile.cmake | 4 ++-- ports/magnum-plugins/CONTROL | 6 +++++- ports/magnum-plugins/portfile.cmake | 4 ++-- ports/magnum/CONTROL | 2 +- ports/magnum/portfile.cmake | 4 ++-- ports/poco/portfile.cmake | 6 +++--- 11 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index e719d90e4..116a9f7e7 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,5 +1,5 @@ Source: corrade -Version: 2018.04-1 +Version: 2018.10-1 Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index dd676b592..0a6f1babb 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/corrade - REF v2018.04 - SHA512 be14f0cb76c904a37f962af16b331407ec6a1f7a31245c7221f41fcbce2749a1ad67057d451736814e357eaa59e015f16996bdba819f69a1dd0f3d5a3cad34a4 + REF v2018.10 + SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201 HEAD_REF master ) diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL index 752f7333b..2f782f048 100644 --- a/ports/magnum-extras/CONTROL +++ b/ports/magnum-extras/CONTROL @@ -1,5 +1,5 @@ Source: magnum-extras -Version: 2018.04-1 +Version: 2018.10-1 Build-Depends: magnum Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake index 61aa619cd..1a080b566 100644 --- a/ports/magnum-extras/portfile.cmake +++ b/ports/magnum-extras/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-extras - REF v2018.04 - SHA512 2c933d0cad6f0b6580a84dba22bfdadf120a302246cab404a99749e0ba7bb0d799ee606ca43cc1c39f85ae37a00dcc7374b9fd05eb2bb07945c9371a9c8a8492 + REF v2018.10 + SHA512 2f1164e321ceff9ae526cb2bae961147f52f56b35ea837c29ba0153f418a269056f469415ca0393dfb8fa5d916e92130aaccc61105d18e3f242820d13478eb33 HEAD_REF master ) diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL index cded5ea48..6fdb5c5cd 100644 --- a/ports/magnum-integration/CONTROL +++ b/ports/magnum-integration/CONTROL @@ -1,5 +1,5 @@ Source: magnum-integration -Version: 2018.04-1 +Version: 2018.10-1 Build-Depends: magnum Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake index 4790d07d5..1e1ba801a 100644 --- a/ports/magnum-integration/portfile.cmake +++ b/ports/magnum-integration/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-integration - REF v2018.04 - SHA512 ef22309dea452de8cf63d62f4b99f3e7b5b12b3580455e8fc1d53eabd921e24ec3824ce238a2b74cf0b6fd137e238b67c6b4653e750072b1105c6571e352d9fe + REF v2018.10 + SHA512 2743eb7ee377350e85c1112f5c81850922748f50dc2d5409ccb05bec2b3246c91b8e149891a72a8319125a9843b408fd8254efaffaed2100a425e3e7ef426bbe HEAD_REF master ) diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index 9722245f6..0aa1b075c 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,5 +1,5 @@ Source: magnum-plugins -Version: 2018.04-1 +Version: 2018.10-1 Build-Depends: magnum Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter @@ -39,6 +39,10 @@ Feature: jpegimporter Description: JpegImporter plugin Build-Depends: libjpeg-turbo, magnum[trade] +Feature: jpegimageconverter +Description: JpegImageConverter plugin +Build-Depends: libjpeg-turbo, magnum[trade] + Feature: miniexrimageconverter Description: MiniExrImageConverter plugin Build-Depends: magnum[trade] diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index 54ea7659c..aa7f120fe 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-plugins - REF v2018.04 - SHA512 0b8ae1488e210d111826532299d1e29c5eba32c75f7c210caff088a9a57459b6354474c7a53fccd0c78553d67d79bf041d471b5822c59cb2c9612126cf3e49ef + REF v2018.10 + SHA512 0ff79d2451957dd38f6bf9b1ee5b99f5ea9ac2cd993124f0bc4ae3e571d1a9f407876ecf59a34fd1bd86cda991e81e6632925b7a289e30b113b457bd1c7a0ae1 HEAD_REF master ) diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 788e3e5e6..8cb02ccc2 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,5 +1,5 @@ Source: magnum -Version: 2018.04-1 +Version: 2018.10-1 Build-Depends: corrade[pluginmanager], corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shapes, text, texturetools, trade, sdl2application diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index cf17ae5fe..e7f2833e7 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum - REF v2018.04 - SHA512 6ad50e782c8cb10157cf969a571f8c0c0c91161de60ac25cf86eda09106f4de73168618a1a5fe0931c3fd293c718911e14d610bd4f86fe3e073620bd7619a9eb + REF v2018.10 + SHA512 3c0998fc3600cb3799e89b4b97f6640e9b7ea9eb0ba937a2ccc0a9e5411f7dc466524a56a49ec04993530703e6688292af042a9aa6452af37f20d4449351cd96 HEAD_REF master ) diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index c94a09387..0eb160daa 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( REPO pocoproject/poco REF poco-1.9.0-release SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9 - HEAD_REF master + HEAD_REF develop PATCHES config_h.patch find_pcre.patch @@ -51,11 +51,11 @@ else() endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) else() - file(REMOVE + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe -- cgit v1.2.3 From 8174938d508e052f20fc0fb0e2d258a21d9f1d84 Mon Sep 17 00:00:00 2001 From: Glen Knowles Date: Thu, 25 Oct 2018 15:27:36 -0700 Subject: [dimcli] Update to 4.0.1 (#4549) * [dimcli] update to 3.1.1 * [dimcli] Update to 4.0.1 * [dimcli] Remove quotes around project name --- ports/dimcli/CONTROL | 2 +- ports/dimcli/fix-cmake.patch | 23 ----------------------- ports/dimcli/portfile.cmake | 12 +++--------- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 ports/dimcli/fix-cmake.patch diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index 96943086c..b1526996e 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,3 @@ Source: dimcli -Version: 3.1.1-2 +Version: 4.0.1-1 Description: C++ command line parser toolkit diff --git a/ports/dimcli/fix-cmake.patch b/ports/dimcli/fix-cmake.patch deleted file mode 100644 index 63795e041..000000000 --- a/ports/dimcli/fix-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f319ee..a38eca2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -264,7 +264,7 @@ endfunction() - # "-1.2.3" from the that vcpkg likes to add when building things. - get_filename_component(prjname "${CMAKE_CURRENT_SOURCE_DIR}" NAME) - string(REGEX REPLACE "(-[\.0-9\-]*)$" "" prjname ${prjname}) --project(${prjname}) -+project(dimcli) - string(TOUPPER "${prjname}" DEFINE_PREFIX) - - get_property(parent DIRECTORY PROPERTY PARENT_DIRECTORY) -@@ -323,9 +323,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) - set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER cmake) - - set(CMAKE_CONFIGURATION_TYPES Debug Release) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/bin) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/bin) - - if(MSVC) - # "/EHsc" - exceptions from c++ only (not from structured or "C") diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index f1cb2f4ec..f66120c5e 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -3,27 +3,21 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v3.1.1 - SHA512 ed9aeedc59a9d48c59aa8dd1adb9cb110771c1eab0bbab8f8b518e12a45cdafb0ea94301d082ed3a033ca2428c19c8d990c76f666d1e9822cddf6e744f1db701 + REF v4.0.1 + SHA512 e36008eed42997c467ef7f4780cacd7eb8acebeb48be56445914c0ae125c5dbf29a172e1fb2f9490a6f21db8f6de5fa0420f499aff996ee148ec3a5bef0adba5 HEAD_REF master - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/fix-cmake.patch" ) set(staticCrt OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") set(staticCrt ON) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(ENV{_CL_} "/DDIMCLI_LIB_DYN_LINK") -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} -DINSTALL_LIBS:BOOL=ON - -DRECURSIVE_GENERATE=ON + -DBUILD_PROJECT_NAME=dimcli ) vcpkg_install_cmake() -- cgit v1.2.3 From 30d5f959862fbfca1f7907259cb84f5963bb19d5 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 26 Oct 2018 06:53:48 +0800 Subject: [double-conversion] Remove unnecessary patch (#4321) * [double-conversion] Remove unnecessary patch * [double-conversion] Small portfile improvement * [double-conversion] Provoke rebuild --- ports/double-conversion/001-fix-arm.patch | 13 ------------- ports/double-conversion/CONTROL | 2 +- ports/double-conversion/portfile.cmake | 9 +-------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 ports/double-conversion/001-fix-arm.patch diff --git a/ports/double-conversion/001-fix-arm.patch b/ports/double-conversion/001-fix-arm.patch deleted file mode 100644 index 98ce2080c..000000000 --- a/ports/double-conversion/001-fix-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/double-conversion/utils.h b/double-conversion/utils.h" -index 51d5e61..24cd5f1 100644 ---- a/double-conversion/utils.h -+++ "b/double-conversion/utils.h" -@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); } - // disabled.) - // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) - #if defined(_M_X64) || defined(__x86_64__) || \ -- defined(__ARMEL__) || defined(__avr32__) || \ -+ defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || \ - defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ diff --git a/ports/double-conversion/CONTROL b/ports/double-conversion/CONTROL index 66cf5b1dd..a80898deb 100644 --- a/ports/double-conversion/CONTROL +++ b/ports/double-conversion/CONTROL @@ -1,3 +1,3 @@ Source: double-conversion -Version: 3.1.0 +Version: 3.1.0-1 Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles. diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index 99be98024..875b1aa0a 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -8,11 +8,6 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -29,9 +24,7 @@ endif() vcpkg_copy_pdbs() -# Include files should not be duplicated into the /debug/include directory. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/double-conversion) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/double-conversion/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright COPYONLY) -- cgit v1.2.3 From ff4902053870ad20d807dad804b158124521a7ec Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 25 Oct 2018 11:44:43 -0700 Subject: [openssl-unix] Consider CMAKE_OSX_SYSROOT --- ports/openssl-unix/CMakeLists.txt | 3 +++ ports/openssl-unix/CONTROL | 2 +- ports/openssl-unix/portfile.cmake | 15 ++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/openssl-unix/CMakeLists.txt b/ports/openssl-unix/CMakeLists.txt index 7639d1d4e..e8d916392 100644 --- a/ports/openssl-unix/CMakeLists.txt +++ b/ports/openssl-unix/CMakeLists.txt @@ -26,6 +26,7 @@ get_filename_component(COMPILER_ROOT "${CMAKE_C_COMPILER}" DIRECTORY) 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_C_FLAGS=${CMAKE_C_FLAGS}") message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}") message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") @@ -43,6 +44,8 @@ if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN) endif() if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") +elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) + set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}") endif() string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 6413eb371..28dc5da98 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p +Version: 1.0.2p-1 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake index 1484fc66c..c877905bb 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -4,7 +4,6 @@ endif() include(vcpkg_common_functions) set(OPENSSL_VERSION 1.0.2p) -set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) vcpkg_find_acquire_program(PERL) @@ -14,12 +13,14 @@ vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 ) -vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${MASTER_COPY_SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch - ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch - ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH + ARCHIVE ${OPENSSL_SOURCE_ARCHIVE} + REF ${OPENSSL_VERSION} + PATCHES + ConfigureIncludeQuotesFix.patch + STRINGIFYPatch.patch + EmbedSymbolsInStaticLibsZ7.patch ) if(CMAKE_HOST_WIN32) -- cgit v1.2.3 From f0cd4479e8cd87e358cc213c033158ac01617404 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Fri, 26 Oct 2018 19:28:03 +0300 Subject: [pixman] fix compilation on linux (#4570) --- ports/pixman/CMakeLists.txt | 5 ++--- ports/pixman/CONTROL | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/pixman/CMakeLists.txt b/ports/pixman/CMakeLists.txt index d355fe8c6..c75574865 100644 --- a/ports/pixman/CMakeLists.txt +++ b/ports/pixman/CMakeLists.txt @@ -1,11 +1,10 @@ cmake_minimum_required(VERSION 3.0) -project(pixman VERSION 0.32.0 LANGUAGES C) +project(pixman VERSION 0.34.0 LANGUAGES C) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) set(CMAKE_DEBUG_POSTFIX "d") -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - add_definitions(-DTLS=__thread) +if(UNIX) add_definitions(-DHAVE_PTHREADS) endif() diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index d3a5cede7..64d8abde0 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -1,3 +1,3 @@ Source: pixman -Version: 0.34.0-4 +Version: 0.34.0-5 Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. -- cgit v1.2.3 From f5c8349a85df6cf9eafe24849fa734102105cb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Rodr=C3=ADguez?= Date: Fri, 26 Oct 2018 14:25:35 -0300 Subject: [websocketpp] update to 0.8.1 (#4554) * [websocketpp] update to 0.8.1 * [websocketpp] Fix config file --- ports/websocketpp/CONTROL | 2 +- ports/websocketpp/portfile.cmake | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL index 991e6635c..5c7457a2a 100644 --- a/ports/websocketpp/CONTROL +++ b/ports/websocketpp/CONTROL @@ -1,4 +1,4 @@ Source: websocketpp -Version: 0.7.0-1 +Version: 0.8.1 Build-Depends: zlib, openssl, boost-asio Description: Library that implements RFC6455 The WebSocket Protocol \ No newline at end of file diff --git a/ports/websocketpp/portfile.cmake b/ports/websocketpp/portfile.cmake index 71b573ada..35514259c 100644 --- a/ports/websocketpp/portfile.cmake +++ b/ports/websocketpp/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zaphoyd/websocketpp - REF 0.7.0 - SHA512 91a86d4f5120db3f474169bb146f865f82167b1e9eedabec8793b31005e4ce3d22083283bc1b9f9e37fa0da835addcb2b68260a27c753852c06b3b1bb2f3c12e + REF 0.8.1 + SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c HEAD_REF master PATCHES openssl_110.patch @@ -13,14 +13,15 @@ vcpkg_from_github( file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/websocketpp) -# Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/websocketpp/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/websocketpp/COPYING ${CURRENT_PACKAGES_DIR}/share/websocketpp/copyright) - # Copy the header files file(COPY "${SOURCE_PATH}/websocketpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.hpp") -set(INSTALL_INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include") -set(WEBSOCKETPP_VERSION 0.7.0) +set(PACKAGE_INSTALL_INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include") +set(WEBSOCKETPP_VERSION 0.8.1) +set(PACKAGE_INIT " +macro(set_and_check) + set(\${ARGV}) +endmacro() +") configure_file(${SOURCE_PATH}/websocketpp-config.cmake.in "${CURRENT_PACKAGES_DIR}/share/websocketpp/websocketpp-config.cmake" @ONLY) -configure_file(${SOURCE_PATH}/websocketpp-configVersion.cmake.in "${CURRENT_PACKAGES_DIR}/share/websocketpp/websocketpp-configVersion.cmake" @ONLY) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/websocketpp/copyright COPYONLY) -- cgit v1.2.3 From c538d6d99668bb416153aade75ed5dd9f7b7c28d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 25 Oct 2018 10:38:15 -0700 Subject: Upgrades 2018.10.25 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/args/CONTROL | 2 +- ports/args/portfile.cmake | 4 ++-- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 ++-- ports/c-ares/CONTROL | 2 +- ports/c-ares/portfile.cmake | 4 ++-- ports/clara/CONTROL | 2 +- ports/clara/portfile.cmake | 4 ++-- ports/doctest/CONTROL | 2 +- ports/doctest/portfile.cmake | 4 ++-- ports/entt/CONTROL | 2 +- ports/entt/portfile.cmake | 4 ++-- ports/exiv2/CONTROL | 2 +- ports/exiv2/portfile.cmake | 6 +++--- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/gdcm2/CONTROL | 2 +- ports/gdcm2/portfile.cmake | 42 ++++++++++++---------------------------- ports/jsonnet/CONTROL | 2 +- ports/jsonnet/portfile.cmake | 4 ++-- ports/matio/CONTROL | 2 +- ports/matio/portfile.cmake | 4 ++-- ports/nuklear/CONTROL | 2 +- ports/nuklear/portfile.cmake | 4 ++-- ports/openal-soft/CONTROL | 2 +- ports/openal-soft/portfile.cmake | 4 ++-- ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 ++-- ports/rs-core-lib/CONTROL | 2 +- ports/rs-core-lib/portfile.cmake | 4 ++-- ports/sfml/CONTROL | 2 +- ports/sfml/portfile.cmake | 7 +++---- ports/spdlog/CONTROL | 2 +- ports/spdlog/portfile.cmake | 4 ++-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 ++-- ports/tiny-dnn/CONTROL | 2 +- ports/tiny-dnn/portfile.cmake | 4 ++-- ports/unicorn-lib/CONTROL | 2 +- ports/unicorn-lib/portfile.cmake | 4 ++-- ports/unicorn/CONTROL | 2 +- ports/unicorn/portfile.cmake | 4 ++-- ports/wangle/CONTROL | 2 +- ports/wangle/portfile.cmake | 4 ++-- 46 files changed, 81 insertions(+), 100 deletions(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 5ecd6e13c..ada833466 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-10-11 +Version: 2018-10-25 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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 475a222c3..e83b1a057 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF f340f773edab951656b19b6f1a77c964a78ec4c2 - SHA512 48f7de32255313292f0a86113149180d299902a1ced9cdf9dc5e6beefbd75eb0522ff4ab61e216474e64dd38aebc7c544a6cf7a3fea5836c82f28f19a582965a + REF 94c298e2a0ae409e283cab96c954a685bd865a70 + SHA512 217b903255a745613296707568f190368d7d54e0299e455369cb14226c191ba5867b1e7d68698b2f6377d4049fe900a3aa49cba8fa69acc378fd7c5c70461551 HEAD_REF master ) diff --git a/ports/args/CONTROL b/ports/args/CONTROL index 2fc33be71..7ab2310aa 100644 --- a/ports/args/CONTROL +++ b/ports/args/CONTROL @@ -1,3 +1,3 @@ Source: args -Version: 2018-10-11 +Version: 2018-10-25 Description: A simple header-only C++ argument parser library. diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake index 37ec56a1b..e319975e0 100644 --- a/ports/args/portfile.cmake +++ b/ports/args/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args - REF 24868affc8f7f88ce8781bc6a21c5c7d5067c508 - SHA512 123e72a0f1d275de565443f818f37d3cf38ca43056802395aecf89d3cd913f628675c742cd136bf5cd25347ce783a34d938e2d97b6acf52e7479737dd0b8da33 + REF a82a9d6c94d7c58d8b96c65bdc1aba09a4f3e5db + SHA512 0a7caf231117827eb2dbbca3d51259c701c1b8da61518565e5cfe379edd03f34a2dac2d35cdba659042e19e7b3076ef4b6aa6e01d2f9b66db59d1672f9f18f12 HEAD_REF master ) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 19a0ae5fb..eda565cff 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.6.29 +Version: 1.6.38 Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index a2892e5ac..03e5526ba 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 1.6.29 - SHA512 54fd4ed4ddcc1c88e7efc951de2f13bc4b95cd08adf3b5dc74cdea68908accdc6dbf2f00bdc6f5aef1b8bf4c74023f6c22410a18766cb283e9cee03c3fd27d5b + REF 1.6.38 + SHA512 1f70b43c8fcac62fb73ced8aeab5f979266dea5ef8dc683bf4420f4a30477dc4d7223b752a1b82cf0992d19bd8e0ef044c819b85f9781931eb9af2c060d15bfd HEAD_REF master ) diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL index 70eb454e4..204fd6668 100644 --- a/ports/c-ares/CONTROL +++ b/ports/c-ares/CONTROL @@ -1,4 +1,4 @@ Source: c-ares -Version: cares-1_14_0 +Version: cares-1_15_0 Description: A C library for asynchronous DNS requests Build-Depends: diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 4a569b567..bf704304e 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares - REF cares-1_14_0 - SHA512 3ae7938648aec2fae651667bef02139f7eef2e7cd425cc310b7e3d56f409646f6170d37a3c9269aa654bfb1ced0a52b89fe49be9023edf8ff57efd0efaf59052 + REF cares-1_15_0 + SHA512 3c925e0b3a25f3b656a145966ca763f77ae4ccefd87f2d9ae01cae786eeca0ce8397af4ab21da64f516b4603850638f969056184c310372d22aeb5cbfd2704c8 HEAD_REF master ) diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL index 815db6e52..4e7d58482 100644 --- a/ports/clara/CONTROL +++ b/ports/clara/CONTROL @@ -1,3 +1,3 @@ Source: clara -Version: 2018-04-02 +Version: 2018-10-25 Description: A simple to use command line parser for C++ \ No newline at end of file diff --git a/ports/clara/portfile.cmake b/ports/clara/portfile.cmake index b4f7a7b20..441be3b6b 100644 --- a/ports/clara/portfile.cmake +++ b/ports/clara/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO philsquared/Clara - REF ba5485cb56329db3ea3f5402ef596d3b512b903a - SHA512 8aa66e3e1a2b7c544d9d105ad9f803119791b971cce4dff63ae47b63a08fd422fc75108aeb69300fa9982568d689f506456c6f8ed7287a19b9ed84649fad9315 + REF a19db09c015f96f80d282e445ed3091ff20b4248 + SHA512 e7a9574d92ff8cc4b91094d30572bc5b36c30f5dc52c418e76ba2227c526551572f51d4a2fa29e9afab21be82e330070dd8a2118d75bdd49ac1e510755b4cdf4 HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 214950929..07885a75d 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.0.0 +Version: 2.0.1 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 007b3a21d..a84d9a21d 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.0.0 - SHA512 ad167201fa10890e868fab628d73588e66470fbf6d5bdf0cd4e4ce13510f0727411fa709eb748eb1b5de19307c75d2efbcd71cb678e3ef1d0632056d7af2f012 + REF 2.0.1 + SHA512 bbd676c8485d9bee4be3f2f6bdd0f72bced09767427533c8de3ea46b298182acaeff64e42683a4283512edd81bb444880b229e65f3296bb4afc8b5b93c03b970 HEAD_REF master ) diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL index 6187a2d10..1e0e1410f 100644 --- a/ports/entt/CONTROL +++ b/ports/entt/CONTROL @@ -1,3 +1,3 @@ Source: entt -Version: 2.7.3 +Version: cpp14 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 33a3edbfe..05462c453 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v2.7.3 - SHA512 ffdb26f43ebf0090eed5de589df4194282e2ab89e5014bfe4acc2670729b86c93ea85e25b4b1e72de975287b8f0aa9e72d89e1cfb649e0a0f4f72838b00e5215 + REF cpp14 + SHA512 aa3ced9084a0a973ed5c9384ab3950c8ed54239df7ae605600d8cd7c2774c4173d16ad5ea7442751dfbc675f881cab952844ba794fdf464710a85fc9d77a8a5d ) file(INSTALL diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index 461d3036c..7a09655f2 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,4 +1,4 @@ Source: exiv2 -Version: 2018-10-11 +Version: 2018-10-25 Build-Depends: zlib, expat, libiconv Description: Image metadata library and tools http://www.exiv2.org diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 30d5805f1..44930d2fa 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -3,10 +3,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 4c093fece194e55d029e0f6474e00bb38c1d3b46 - SHA512 33132eeb51dfe4bd22a0b2bd8a66d017c27ecc9c966d72ce0691f5d01d46d1d7881d9a96c35f0e3fd6165cbcc55a6ddb98d45685be9863f41a41e0af053a89a0 + REF dc086d2ebbb04817458b214708c5038600e96095 + SHA512 8a3dc2d948a31f6355f8c23620f4730599379fe83a6cacfe1c88d45f35cfd4a2e37c6e0c36e951961b3b9083aef9b881ccee1989c6f139e699e04db1f2d9dba9 HEAD_REF master - PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch" + PATCHES iconv.patch ) vcpkg_configure_cmake( diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index b63075ef9..8b8e6cc42 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.10.08.00 +Version: 2018.10.22.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index acf535aa8..a95b1baaf 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.10.08.00 - SHA512 934e46104a34c1cf550532c7f47476b339b210059b21813adbe840eab5aa2e8053303607e33ace73ddf18dd750588bc30699f39758d11f6f80a2e0233515f1db + REF v2018.10.22.00 + SHA512 ca039ee85c4269fb79ff01beb9e67a6a17220cdc997f59c5ca27514407e533f3d65c358fc5d99c5008a63d3837703db78707a04ba88093b9e63306012a5759e5 HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL index ddf669fb7..d3ff62aa7 100644 --- a/ports/gdcm2/CONTROL +++ b/ports/gdcm2/CONTROL @@ -1,4 +1,4 @@ Source: gdcm2 -Version: 2.8.7 +Version: 2.8.8 Description: Grassroots DICOM library Build-Depends: zlib, expat diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake index bea1d6db3..3bddfeff6 100644 --- a/ports/gdcm2/portfile.cmake +++ b/ports/gdcm2/portfile.cmake @@ -1,30 +1,12 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM - REF v2.8.7 - SHA512 06e58a201d2bf59273cd871d7fc7b858eaa1b02badcc1cdbd99aca6ff7d6b0b0199f2fe7ead935ff1edb9403d594e9d73ffaf4e388705e96c76d7eefa0b6c2ec + REF v2.8.8 + SHA512 92efa1b85e38a5e463933c36a275e1392608c9da4d7c3ab17acfa70bfa112bc03e8705086eaac4a3ad5153fde5116ccc038093adaa8598b18000f403f39db738 + PATCHES socketxx.patch ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/socketxx.patch -) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(GDCM_BUILD_SHARED_LIBS ON) else() @@ -33,20 +15,20 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF - -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS} - -DGDCM_INSTALL_INCLUDE_DIR=include - -DGDCM_USE_SYSTEM_EXPAT=ON - -DGDCM_USE_SYSTEM_ZLIB=ON - ${ADDITIONAL_OPTIONS} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF + -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS} + -DGDCM_INSTALL_INCLUDE_DIR=include + -DGDCM_USE_SYSTEM_EXPAT=ON + -DGDCM_USE_SYSTEM_ZLIB=ON + ${ADDITIONAL_OPTIONS} ) vcpkg_install_cmake() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ) diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index e6866ac2c..eba2463ce 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,3 +1,3 @@ Source: jsonnet -Version: 2018-10-11 +Version: 2018-10-25 Description: Jsonnet - The data templating language diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 7603877a5..09e7d92b4 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF 8b15e8d5c1202dde1be2cd8631025ff7719b688b - SHA512 5eb00c7473503ae4bab3aca1fe822bf3df8ae186db4bd46feb26114395690119e1934cbe601f033075d9e2672c80b1441741607e63b0d6b1fab559be6cde84d8 + REF edfcffc596af4a5977891849a2b813cf31bbff5e + SHA512 a0568fa00331ef2fe2e14c25c36b6668d15fbe3c4e92453a382832ae715c6eaff5047f0a91a98429052e0eaa16db25b850bb4544f44974abb7769125a1f4a7f2 HEAD_REF master ) diff --git a/ports/matio/CONTROL b/ports/matio/CONTROL index 7c891c035..df97421cf 100644 --- a/ports/matio/CONTROL +++ b/ports/matio/CONTROL @@ -1,4 +1,4 @@ Source: matio -Version: 1.5.12 +Version: 1.5.13 Description: MATLAB MAT File I/O Library Build-Depends: zlib, hdf5 diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index 86d5b6a1f..f51424d55 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tbeu/matio - REF v1.5.12 - SHA512 3bf6d2bf6460531dd2a740813bca3f3da6347b9fadb39803257f11bcceeaa7cf6657921c9ca9c8db02bf2020d5adf2ecf544b2455aa0ca897c0644493b1902a4 + REF v1.5.13 + SHA512 8525ee2c3f0e5cccf3dbae888d09a9477cbd1f2b17160fd15cc8e18792b027954ac18404ea74465ec6b8b5d057661502b1fc31fa6d119113139004c1bce7f712 HEAD_REF master ) diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL index cfcacd03d..15f605ebc 100644 --- a/ports/nuklear/CONTROL +++ b/ports/nuklear/CONTROL @@ -1,3 +1,3 @@ Source: nuklear -Version: 2018-09-18 +Version: 2018-10-25 Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index e50f291f8..d7570987f 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vurtun/nuklear - REF 2a379bc03879dc22ceb3a03f957fdf4870716cc6 - SHA512 5425267abcd410cf0f2e6d9e7a685eb33289f054b90fc5a9ea9630b5f9c03056c3ca92d0ee00d884806b9b1911bb2b30ebea447278d1eebcdda29347dd547d07 + REF 19c14bb777ebccf93fc9ed8a8b295f4a62cb32c9 + SHA512 ff9d9fcbba41b602e13060445dd67a6c07322fce4b9b210cde72e4ba9bb5f3805fec5aad66e2c9aeca191d0fdd4e9b747021e5e8aa62175f927fa39a91847b1a HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 296608f0f..6f16b26bd 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,3 @@ Source: openal-soft -Version: 1.19.0 +Version: 1.19.1 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 0f1abb08c..0af13af6c 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -6,8 +6,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kcat/openal-soft - REF openal-soft-1.19.0 - SHA512 59623792e560c9ef8069b7b4e4c12c67c9814433fc57d5b5650951f3adad338570ec785bbac8f7e1e7596220bab433e9f29161ced7d1a37da4f5418f6a3b7581 + REF openal-soft-1.19.1 + SHA512 4a64cc90ddeaa3773610b0bc8023d231100f3396f3fc5bd079db81600f80a789c75e6af03391bfc78a903c96bb71f8052a9ae802ea81422028e5b12b7eb6c47b HEAD_REF master PATCHES dont-export-symbols-in-static-build.patch diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index ebfeb05d0..5b1fbb005 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-10-11 +Version: 2018-10-25 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 5a038bc5d..983894037 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF 6272edcb53d3c8705f57df3b46b1f92e646e30bc - SHA512 4a4f1eb44e3d2acce8697405bb27c31953b8d154245a1864376376bcf92e867166a203adb53c3d1f76c0de77ad090992992e54242b18477d9d60fe61ffb7406c + REF 89528a380a7e9722dbf7b5a817251049eab355fb + SHA512 7654a41ea42e816e7ecd80e554e6e5ab11e7d2f4d2c547a3083f990500668c74ae74870fe5a6390521b44edc2be8ce11d86a187600229e3d8b9d8b3114cfa4e8 HEAD_REF master ) diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 022b8ee9e..564b25807 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2018-10-11 +Version: 2018-10-25 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index a001a06b0..a3eddc38d 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 4e142e1458f20086b3b4269d0537604117769e25 - SHA512 789fdeee5da0e9c64236f9bc0be32121c38a6fc3bec6976751a94ea78bd464a7c9389a5fd112d56eb6c10c7c2dc342276305b8e9831fe880c39f4f5017d26ddc + REF 5e2e7bb8663d078957a2f6994d9f1e3d4cf50601 + SHA512 d159b11c650572e486ce8376c03e688b5448fdf00d956edf141106d2e1173d86faf0eda843da69687a6f79eb443017dfe0fb1d9f70284444bfda7006d78aee38 HEAD_REF master ) diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index ed3580b4b..371300221 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,4 +1,4 @@ Source: sfml -Version: 2.5.0-2 +Version: 2.5.1 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 edf9de148..22ab3b8a3 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -2,11 +2,10 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML - REF 2.5.0 + REF 2.5.1 HEAD_REF master - SHA512 94306dcbed7d68bb7e226cd91e25950a07bcf393988c4bb79f9de3555c18c78cae4573e911235f712e711a7c02a614bf370df32b8d85240d2f08142327e05076 - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/use-system-freetype.patch" + SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 + PATCHES use-system-freetype.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index e74bed587..8ff960a23 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 1.2.0 +Version: 1.2.1 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 66c727073..21f3121e9 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.2.0 - SHA512 f45d682e736106fdf9b96560c06eb8e8cc86d342003f0ef344954bf76aabc68dcdff53a767e4244fc9c48a900ba9fb122bb645962c1666139f860d68a354bfa9 + REF v1.2.1 + SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 HEAD_REF v1.x ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index 876e74991..f01ffbbaf 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-10-11 +Version: 2018-10-25 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 13a2f85bd..a69291ee4 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 2a2b72f6c8aef200ecee4984f011e06052288ff2 - SHA512 459b980af10d7f6eaa10b571d18f0efa668a8fc87d47307534e9043721ed28648deab261575e61727c50bf98788fe1f109265de4f5b87eaf57a444bcc7f5bfdd + REF cd829a0b9a5c66203b63350fa029589669ec43f6 + SHA512 e8a9879c580f0a1450a023945555a2f8e042c11f04085ea1700fa7a4e8f4b2ac53a461530cf4106803472c040d3742c2c31173366a28571aa273f093c8d4bc39 HEAD_REF master ) diff --git a/ports/tiny-dnn/CONTROL b/ports/tiny-dnn/CONTROL index 2ce2693ac..9198ef7fd 100644 --- a/ports/tiny-dnn/CONTROL +++ b/ports/tiny-dnn/CONTROL @@ -1,3 +1,3 @@ Source: tiny-dnn -Version: 2018-09-18 +Version: 2018-10-25 Description: A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource. diff --git a/ports/tiny-dnn/portfile.cmake b/ports/tiny-dnn/portfile.cmake index 56946f95f..500a42906 100644 --- a/ports/tiny-dnn/portfile.cmake +++ b/ports/tiny-dnn/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tiny-dnn/tiny-dnn - REF 1aec6a1ece0ba7a5e018a070bd52e045d49d1411 - SHA512 173607504cf4e6cc5f70febbfc305dd1fe7168bc6eff82c90d202caa342c3aecf13a3c3cc7f70f4f9674b5649d3a14180fb682742025c408e3e4ea9ec6b99f8a + REF c0f576f5cb7b35893f62127cb7aec18f77a3bcc5 + SHA512 f2bdf8a39781e0b2e3383d9e7a4a92daa28ee32e6f390c3fb21e9b24a597a50a8ccc4b5be345c433943db4db70fd2df8922ce3f13a792a4e73cd1fdd35842acf HEAD_REF master ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index 808ab41a7..29f822e70 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2018-10-11 +Version: 2018-10-25 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index b2bc2f89b..009d54cbe 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF d1c0918397ce2e5b1631686ff85a475eface027a - SHA512 1a2d2cf9bf34210068de4dfb70c0511dd661f2dd1ee574ed5d7b9f8f94bb6f0bf455b1a78633ad776357e1d7ef179231089d6936fd00ad11a3b073a5ba1bed2b + REF 40da6ff4c2af8a393674513285f00ada5960e79c + SHA512 39657646ea04777fb083a049d4fa8e48a57808817d718f0f7f942d3c19da1249341f9010ab00466a33d64d5a196ff35a8bd5f8ffe24230903b3c7e83b4273c59 HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index f6c176b14..bd863c73e 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2018-10-11 +Version: 2018-10-25 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 7d49ec05b..849726575 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 400a0ab30978ed06525a0ca24437fdadb2b10642 - SHA512 2bf0d127672e83d5cee08918b43a0edc1b229213b1de5ef2fbe99e79c17f4cb9f02bb34c9c123012ba8fcf5e08990d773ba08053356512749f95146961b7d19a + REF 873fffc505b29c6179a8aece18b7e331e5f879e8 + SHA512 7fce35aaee00871ee7ab0517a51ef65f7e748252ac2a97a07ee18a04dcc733b5470fd6de8e0bc433c4bbecd47b8269b33871ba7df64975600d52b3ece15715ea HEAD_REF master ) diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index 4bb5a2269..566d6acbf 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle -Version: 2018.07.30.00-2 +Version: 2018.10.22.00 Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion 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/portfile.cmake b/ports/wangle/portfile.cmake index 4c39b486a..2e3daf795 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2018.10.15.00 - SHA512 aa7db7ef8c6332f951342228b6022fc2798e5cc2769ec7377c4f369a0e585832953e4454cef0b7c37ca368dc72f09278f92d5457bf7dffc31663ce7d28ee557d + REF v2018.10.22.00 + SHA512 cfaf783362989c67dad54d6bd15c3b2f710fd1c1e858cf549367033a50718b69f78fc58001e6202bf8cc84fbb0e9752c433a03dd2d91800bfe2645c7b5519fca HEAD_REF master PATCHES build.patch -- cgit v1.2.3 From ac1dd2022a1de05ee0a813f00346b1a9546ce03a Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 26 Oct 2018 21:31:59 -0700 Subject: [vcpkg-edit] Don't launch the editor in a clean environment --- toolsrc/src/vcpkg/base/system.cpp | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index d95752bba..6797111c2 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -117,10 +117,7 @@ namespace vcpkg::System } #if defined(_WIN32) - static void windows_create_clean_process(const CStringView cmd_line, - const std::unordered_map& extra_env, - PROCESS_INFORMATION& process_info, - DWORD dwCreationFlags) noexcept + static std::wstring compute_clean_environment(const std::unordered_map& extra_env) { static const std::string SYSTEM_ROOT = get_environment_variable("SystemRoot").value_or_exit(VCPKG_LINE_INFO); static const std::string SYSTEM_32 = SYSTEM_ROOT + R"(\system32)"; @@ -173,9 +170,6 @@ namespace vcpkg::System L"NVCUDASAMPLES_ROOT", }; - // Flush stdout before launching external process - fflush(nullptr); - std::wstring env_cstr; for (auto&& env_wstring : env_wstrings) @@ -206,10 +200,27 @@ namespace vcpkg::System env_cstr.push_back(L'\0'); } + return env_cstr; + } +#endif + +#if defined(_WIN32) + /// If non-null, an environment block to use for the new process. If null, the new + /// process will inherit the current environment. + static void windows_create_process(const CStringView cmd_line, + const wchar_t* maybe_environment, + DWORD dwCreationFlags, + PROCESS_INFORMATION* process_info) noexcept + { + Checks::check_exit(VCPKG_LINE_INFO, process_info != nullptr); + STARTUPINFOW startup_info; memset(&startup_info, 0, sizeof(STARTUPINFOW)); startup_info.cb = sizeof(STARTUPINFOW); + // Flush stdout before launching external process + fflush(nullptr); + // Wrapping the command in a single set of quotes causes cmd.exe to correctly execute const std::string actual_cmd_line = Strings::format(R"###(cmd.exe /c "%s")###", cmd_line); Debug::println("CreateProcessW(%s)", actual_cmd_line); @@ -219,10 +230,10 @@ namespace vcpkg::System nullptr, FALSE, IDLE_PRIORITY_CLASS | CREATE_UNICODE_ENVIRONMENT | dwCreationFlags, - env_cstr.data(), + (void*)maybe_environment, nullptr, &startup_info, - &process_info); + process_info); Checks::check_exit(VCPKG_LINE_INFO, succeeded, "Process creation failed with error code: %lu", GetLastError()); } @@ -236,7 +247,7 @@ namespace vcpkg::System PROCESS_INFORMATION process_info; memset(&process_info, 0, sizeof(PROCESS_INFORMATION)); - windows_create_clean_process(cmd_line, {}, process_info, DETACHED_PROCESS); + windows_create_process(cmd_line, nullptr, DETACHED_PROCESS, &process_info); CloseHandle(process_info.hThread); CloseHandle(process_info.hProcess); @@ -255,7 +266,8 @@ namespace vcpkg::System memset(&process_info, 0, sizeof(PROCESS_INFORMATION)); GlobalState::g_ctrl_c_state.transition_to_spawn_process(); - windows_create_clean_process(cmd_line, extra_env, process_info, NULL); + auto clean_env = compute_clean_environment(extra_env); + windows_create_process(cmd_line, clean_env.c_str(), NULL, &process_info); CloseHandle(process_info.hThread); -- cgit v1.2.3 From 74d385ff1649cb2d3c2146b69cbafe9651db4931 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 26 Oct 2018 21:37:51 -0700 Subject: [tiff] Disable use of liblzma in uwp to enable building --- ports/tiff/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index d858ff83a..cb40597b4 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.9-5 -Build-Depends: zlib, libjpeg-turbo, liblzma +Version: 4.0.9-6 +Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files -- cgit v1.2.3 From 3270a9a469d95350b4b3492e04e28dc4ec56d467 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 27 Oct 2018 12:50:27 -0700 Subject: [entityx] Fix osx build by enabling c++14 --- ports/entityx/CONTROL | 2 +- ports/entityx/enable-std14.patch | 12 ++++++++++++ ports/entityx/portfile.cmake | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ports/entityx/enable-std14.patch diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index cbf618e0a..dacd86ee9 100644 --- a/ports/entityx/CONTROL +++ b/ports/entityx/CONTROL @@ -1,3 +1,3 @@ Source: entityx -Version: 1.2.0-1 +Version: 1.2.0-2 Description: EntityX - A fast, type-safe C++ Entity-Component system. diff --git a/ports/entityx/enable-std14.patch b/ports/entityx/enable-std14.patch new file mode 100644 index 000000000..06eff08ee --- /dev/null +++ b/ports/entityx/enable-std14.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23f5063..1fa10b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,6 +24,7 @@ set(ENTITYX_BUILD_SHARED true CACHE BOOL "Build shared libraries?") + include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) + include(CheckCXXSourceCompiles) + ++set(CMAKE_CXX_STANDARD 14) + # Default compiler args + if(0) + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)") diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index 2c7978849..5df7da6cd 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 1.2.0 SHA512 682aa302cb4495666aab2c0b39a286f88cb28046bc8b2deb603402105e15e4b9692e32807077abc3f465e42a4e0f34a7e69169bc74fc5579a5c3d0e17b02fdb8 HEAD_REF master - PATCHES fix-cmake.patch + PATCHES + fix-cmake.patch + enable-std14.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 5bea5abe39232d4527f51bb96dad5b99589a2710 Mon Sep 17 00:00:00 2001 From: Farwaykorse Date: Sat, 27 Oct 2018 23:44:49 +0200 Subject: [uriparser] Update to 0.9.0 (#4587) --- ports/uriparser/CONTROL | 2 +- ports/uriparser/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL index 4a2789309..4777fe8e9 100644 --- a/ports/uriparser/CONTROL +++ b/ports/uriparser/CONTROL @@ -1,3 +1,3 @@ Source: uriparser -Version: 0.8.6 +Version: 0.9.0 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index 262c43592..8061a6221 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser - REF uriparser-0.8.6 - SHA512 281063a3cde215142305815b6469f96fe670d3693ae1add36683368c8b7e8fb04624bfb9a57770f0c5b8b5586419cb713a6d98aa29c34b9b2382682a71bff084 + REF uriparser-0.9.0 + SHA512 d0a317fa55531f75b0e7ec712ea36f8e36a8cf72fdb4f959f3df7cc7c519d09752b194579a4f288bcea56d7be105da3d79dd8323960e74daff93f1dad2b5085d HEAD_REF master ) -- cgit v1.2.3 From c23a7f5c9a28a0e5f796ca951c9428f9e224421b Mon Sep 17 00:00:00 2001 From: John Farrier Date: Sun, 28 Oct 2018 15:56:27 -0400 Subject: [celero] Update Celero to v2.4.0 (#4585) * Upgrade Celero to v2.2.0 * [celero] Fix installed cmake targets * Updated to Celero v2.4.0 --- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 43973721e..2afd57484 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,3 +1,3 @@ Source: celero -Version: 2.3.0-1 +Version: 2.4.0 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index 8c0bdbbb6..f9288fb8e 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF v2.3.0 - SHA512 bc145f9823b1e4bc03f13da9b9af986d6cc151b1edfc01384c4e90bcf0488f867ec2bdc39733f263c7ddda526645dd11a7c6051c73eb8657bc4442b448732242 + REF v2.4.0 + SHA512 4ba9f26bcda85bea00de27a6e8166f874f2c3852f74c54c089373caf71e1c066ac771fda73799d84c4c7a20986a71fd7a3b101b7b8972b9797ab3e8ed7918c30 HEAD_REF master ) -- cgit v1.2.3 From b084ab0103ad07f2f9000805b68d7202a231a248 Mon Sep 17 00:00:00 2001 From: Raynor Vliegendhart Date: Sun, 28 Oct 2018 22:51:30 +0100 Subject: [libgeotiff] Install doc files into the correct place (#4593) * [libgeotiff] Install doc files in the correct place The original portfile put documentation (authors, readme, etc.) inside of vcpkg/installed//doc. This commit modifies the portfile such that the files are installed to vcpkg/installed//share/libgeotiff/doc instead. * [libgeotiff] Bump version * [libgeotiff] Avoid file(INSTALL) --- ports/libgeotiff/CONTROL | 2 +- ports/libgeotiff/portfile.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index 8e8dbc3ef..dea361457 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,4 @@ Source: libgeotiff -Version: 1.4.2-4 +Version: 1.4.2-6 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/portfile.cmake b/ports/libgeotiff/portfile.cmake index 2c83b451a..afd203b03 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -36,7 +36,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgeotiff RENAME copyright) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libgeotiff/copyright COPYONLY) if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*) @@ -44,7 +44,7 @@ else() file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*.exe) endif() -file(INSTALL ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff/) +file(COPY ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libgeotiff) file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) @@ -56,4 +56,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT V file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() +# Move and cleanup doc files +file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/libgeotiff/doc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) + vcpkg_copy_pdbs() -- cgit v1.2.3 From 7136958e6a4d5100393bdc13ec09af0bacda481b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sun, 28 Oct 2018 03:38:46 -0700 Subject: [vcpkg hash] Also try sha512sum --- toolsrc/src/vcpkg/base/hash.cpp | 53 +++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/toolsrc/src/vcpkg/base/hash.cpp b/toolsrc/src/vcpkg/base/hash.cpp index 31bd8d05e..276f15eb9 100644 --- a/toolsrc/src/vcpkg/base/hash.cpp +++ b/toolsrc/src/vcpkg/base/hash.cpp @@ -174,21 +174,25 @@ namespace vcpkg::Hash return hash_type.substr(3, hash_type.length() - 3); } - static std::string run_shasum_and_post_process(const std::string& cmd_line) + static Optional run_shasum(const std::string& cmd_line) { const auto ec_data = System::cmd_execute_and_capture_output(cmd_line); - Checks::check_exit(VCPKG_LINE_INFO, - ec_data.exit_code == 0, - "Failed to run:\n" - " %s", - cmd_line); + if (ec_data.exit_code == 0) + { + return ec_data.output; + } - std::vector split = Strings::split(ec_data.output, " "); + return nullopt; + } + + static std::string parse_shasum_output(const std::string& shasum_output) + { + std::vector split = Strings::split(shasum_output, " "); Checks::check_exit(VCPKG_LINE_INFO, split.size() == 3, "Expected output of the form [hash filename\n] (3 tokens), but got\n" "[%s] (%s tokens)", - ec_data.output, + shasum_output, std::to_string(split.size())); return split[0]; @@ -198,8 +202,23 @@ namespace vcpkg::Hash { const std::string digest_size = get_digest_size(hash_type); Checks::check_exit(VCPKG_LINE_INFO, fs.exists(path), "File %s does not exist", path.u8string()); + + if (digest_size == "512") + { + const std::string cmd_line = Strings::format(R"(sha512sum "%s")", path.u8string()); + const auto shasum_output = run_shasum(cmd_line); + if (auto s = shasum_output.get()) + { + return parse_shasum_output(*s); + } + } + const std::string cmd_line = Strings::format(R"(shasum -a %s "%s")", digest_size, path.u8string()); - return run_shasum_and_post_process(cmd_line); + const auto shasum_output = run_shasum(cmd_line); + if (auto s = shasum_output.get()) + { + return parse_shasum_output(*s); + } } std::string get_string_hash(const std::string& s, const std::string& hash_type) @@ -207,8 +226,22 @@ namespace vcpkg::Hash const std::string digest_size = get_digest_size(hash_type); verify_has_only_allowed_chars(s); + if (digest_size == "512") + { + const std::string cmd_line = Strings::format(R"(echo -n "%s" | sha512sum)", s); + const auto shasum_output = run_shasum(cmd_line); + if (auto s = shasum_output.get()) + { + return parse_shasum_output(*s); + } + } + const std::string cmd_line = Strings::format(R"(echo -n "%s" | shasum -a %s)", s, digest_size); - return run_shasum_and_post_process(cmd_line); + const auto shasum_output = run_shasum(cmd_line); + if (auto s = shasum_output.get()) + { + return parse_shasum_output(*s); + } } #endif } -- cgit v1.2.3 From 60eca2d4cd9aa7fe8412455899669b7155d66d26 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 29 Oct 2018 22:00:13 -0700 Subject: [vcpkg hash] Try all shaXXXsum tools --- toolsrc/src/vcpkg/base/hash.cpp | 57 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/toolsrc/src/vcpkg/base/hash.cpp b/toolsrc/src/vcpkg/base/hash.cpp index 276f15eb9..7a74371db 100644 --- a/toolsrc/src/vcpkg/base/hash.cpp +++ b/toolsrc/src/vcpkg/base/hash.cpp @@ -174,17 +174,6 @@ namespace vcpkg::Hash return hash_type.substr(3, hash_type.length() - 3); } - static Optional run_shasum(const std::string& cmd_line) - { - const auto ec_data = System::cmd_execute_and_capture_output(cmd_line); - if (ec_data.exit_code == 0) - { - return ec_data.output; - } - - return nullopt; - } - static std::string parse_shasum_output(const std::string& shasum_output) { std::vector split = Strings::split(shasum_output, " "); @@ -203,22 +192,27 @@ namespace vcpkg::Hash const std::string digest_size = get_digest_size(hash_type); Checks::check_exit(VCPKG_LINE_INFO, fs.exists(path), "File %s does not exist", path.u8string()); - if (digest_size == "512") + // Try hash-specific tools, like sha512sum { - const std::string cmd_line = Strings::format(R"(sha512sum "%s")", path.u8string()); - const auto shasum_output = run_shasum(cmd_line); - if (auto s = shasum_output.get()) + const auto ec_data = System::cmd_execute_and_capture_output( + Strings::format(R"(sha%ssum "%s")", digest_size, path.u8string())); + if (ec_data.exit_code == 0) { - return parse_shasum_output(*s); + return parse_shasum_output(ec_data.output); } } - const std::string cmd_line = Strings::format(R"(shasum -a %s "%s")", digest_size, path.u8string()); - const auto shasum_output = run_shasum(cmd_line); - if (auto s = shasum_output.get()) + // Try shasum { - return parse_shasum_output(*s); + const auto ec_data = System::cmd_execute_and_capture_output( + Strings::format(R"(shasum -a %s "%s")", digest_size, path.u8string())); + if (ec_data.exit_code == 0) + { + return parse_shasum_output(ec_data.output); + } } + + Checks::exit_with_message(VCPKG_LINE_INFO, "Could not hash file %s with %s", path.u8string(), hash_type); } std::string get_string_hash(const std::string& s, const std::string& hash_type) @@ -226,22 +220,27 @@ namespace vcpkg::Hash const std::string digest_size = get_digest_size(hash_type); verify_has_only_allowed_chars(s); - if (digest_size == "512") + // Try hash-specific tools, like sha512sum { - const std::string cmd_line = Strings::format(R"(echo -n "%s" | sha512sum)", s); - const auto shasum_output = run_shasum(cmd_line); - if (auto s = shasum_output.get()) + const auto ec_data = + System::cmd_execute_and_capture_output(Strings::format(R"(echo -n "%s" | sha%ssum)", s, digest_size)); + if (ec_data.exit_code == 0) { - return parse_shasum_output(*s); + return parse_shasum_output(ec_data.output); } } - const std::string cmd_line = Strings::format(R"(echo -n "%s" | shasum -a %s)", s, digest_size); - const auto shasum_output = run_shasum(cmd_line); - if (auto s = shasum_output.get()) + // Try shasum { - return parse_shasum_output(*s); + const auto ec_data = System::cmd_execute_and_capture_output( + Strings::format(R"(echo -n "%s" | shasum -a %s)", s, digest_size)); + if (ec_data.exit_code == 0) + { + return parse_shasum_output(ec_data.output); + } } + + Checks::exit_with_message(VCPKG_LINE_INFO, "Could not hash input string with %s", hash_type); } #endif } -- cgit v1.2.3 From 70cf49fac24dec90deed153da5b11b9401dc36d5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 30 Oct 2018 14:10:41 -0700 Subject: [range-v3] Update. Use ericniebler/range-v3 even for Windows --- ports/range-v3/CONTROL | 3 +-- ports/range-v3/portfile.cmake | 51 +++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index ee21c16c9..b5a96d789 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,4 +1,3 @@ Source: range-v3 -Version: 0.3.5 -Build-Depends: range-v3-vs2015 (windows), range-v3-vs2015 (uwp) +Version: 0.4.0- 7f2eb04 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index cbeb38bf0..83292e4ab 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,36 +1,31 @@ include(vcpkg_common_functions) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) - message("The current range-v3 releases are not compatible with the current MSVC releases.") - message("The latest available range-v3 fork compatible with MSVC will be used instead.") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ericniebler/range-v3 - REF 0.3.5 - SHA512 0b8b97c32760f19e7a3f35b0f28b0c15c7735fbd1aa54f685c58faf50bf2cf112aed4ac7cfa9154b9caf7047400a6c7fd5c33d978f2e3cec6bc392a758aeabad - HEAD_REF master - ) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ericniebler/range-v3 + REF 7f2eb04e62e44074ddae64ba3715bc800f7c317b + SHA512 118e4bdba0ade864967ca56f82c7b26cfb6767c483844ffb9995b5e860533d365f91f6795b227e78a228569a2280e995c6d23feac5c493ad7718b6ae00d40eed + HEAD_REF master +) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DRANGE_V3_NO_TESTING=ON - -DRANGE_V3_NO_EXAMPLE=ON - -DRANGE_V3_NO_PERF=ON - -DRANGE_V3_NO_HEADER_CHECK=ON - ) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRANGE_V3_TESTS=ON + -DRANGE_V3_EXAMPLES=ON + -DRANGE_V3_PERF=ON + -DRANGE_V3_HEADER_CHECKS=ON + -DRANGES_CXX_STD=17 +) - vcpkg_install_cmake() +vcpkg_install_cmake() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) - vcpkg_copy_pdbs() +vcpkg_copy_pdbs() - file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) -endif() +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) \ No newline at end of file -- cgit v1.2.3 From a1079429209e3e9bcb923792da6be9f69ac98556 Mon Sep 17 00:00:00 2001 From: Roelf-Jilling Date: Wed, 31 Oct 2018 11:00:41 +0100 Subject: Remove import of user property pages when building vcpkg --- toolsrc/vcpkg/vcpkg.vcxproj | 12 ------------ toolsrc/vcpkglib/vcpkglib.vcxproj | 12 ------------ toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj | 12 ------------ toolsrc/vcpkgtest/vcpkgtest.vcxproj | 12 ------------ 4 files changed, 48 deletions(-) diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj index 2ab94eb0a..349f8fbf7 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj +++ b/toolsrc/vcpkg/vcpkg.vcxproj @@ -52,18 +52,6 @@ - - - - - - - - - - - - diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 315c48174..0cd3a9d25 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -55,18 +55,6 @@ - - - - - - - - - - - - diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj index a2ceef9ce..26fed0ec2 100644 --- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj +++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj @@ -52,18 +52,6 @@ - - - - - - - - - - - - diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj index a0d44918d..6bb0e8020 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj @@ -83,18 +83,6 @@ - - - - - - - - - - - - true -- cgit v1.2.3 From 5b41d50f977e8a21a6c1b2e1957867c012c97f03 Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Wed, 31 Oct 2018 14:55:17 -0700 Subject: range-v3: update the commit; don't build tests --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index b5a96d789..1ed4dc94c 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0- 7f2eb04 +Version: 0.4.0-01ccd0e Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 83292e4ab..f1d78711b 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 7f2eb04e62e44074ddae64ba3715bc800f7c317b - SHA512 118e4bdba0ade864967ca56f82c7b26cfb6767c483844ffb9995b5e860533d365f91f6795b227e78a228569a2280e995c6d23feac5c493ad7718b6ae00d40eed + REF 01ccd0e552860efe00e4e3e55bf823be445aabb4 + SHA512 5e6c3e597dc40128ae0642ca43340c88654c25d9239e6929edda44035f23b7dec3735baecd486ca3b161b453c8fe826f82124ced24da66e288e0e93fa5d51c54 HEAD_REF master ) @@ -12,11 +12,10 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DRANGE_V3_TESTS=ON - -DRANGE_V3_EXAMPLES=ON - -DRANGE_V3_PERF=ON - -DRANGE_V3_HEADER_CHECKS=ON - -DRANGES_CXX_STD=17 + -DRANGE_V3_TESTS=OFF + -DRANGE_V3_EXAMPLES=OFF + -DRANGE_V3_PERF=OFF + -DRANGE_V3_HEADER_CHECKS=OFF ) vcpkg_install_cmake() @@ -28,4 +27,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) vcpkg_copy_pdbs() file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) \ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) -- cgit v1.2.3 From 5a1a75d2d6bb27675bca2f009c7ae5579e84cea7 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 30 Oct 2018 16:40:38 -0700 Subject: [vcxproj] Explicitly specify intermediate and output directories Avoids case-sensitivity issues, flattens the layout, no Win32 but x86 instead Issue #4586 --- .gitignore | 4 ++++ scripts/bootstrap.ps1 | 4 ++-- toolsrc/dirs.proj | 2 +- toolsrc/vcpkg/vcpkg.vcxproj | 17 ++++++++++++++++- toolsrc/vcpkglib/vcpkglib.vcxproj | 17 ++++++++++++++++- .../vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj | 17 ++++++++++++++++- toolsrc/vcpkgtest/vcpkgtest.vcxproj | 16 ++++++++++++++++ 7 files changed, 71 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bc83e2959..befc51d8e 100644 --- a/.gitignore +++ b/.gitignore @@ -284,6 +284,10 @@ __pycache__/ /packages/ /scripts/buildsystems/tmp/ /toolsrc/build.rel/ +/toolsrc/msbuild.x86.debug/ +/toolsrc/msbuild.x86.release/ +/toolsrc/msbuild.x64.debug/ +/toolsrc/msbuild.x64.release/ #ignore custom triplets /triplets/* #add vcpkg-designed triplets back in diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 7ebbb2930..216e3fb09 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -328,7 +328,7 @@ if ($disableMetrics) } $platform = "x86" -$vcpkgReleaseDir = "$vcpkgSourcesPath\release" +$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release" if ($win64) { @@ -339,7 +339,7 @@ if ($win64) } $platform = "x64" - $vcpkgReleaseDir = "$vcpkgSourcesPath\x64\release" + $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release" } $arguments = ( diff --git a/toolsrc/dirs.proj b/toolsrc/dirs.proj index 17d9fa1b0..7729c9897 100644 --- a/toolsrc/dirs.proj +++ b/toolsrc/dirs.proj @@ -3,8 +3,8 @@ $(MSBuildThisFileDirectory) - + diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj index 349f8fbf7..8edea2244 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj +++ b/toolsrc/vcpkg/vcpkg.vcxproj @@ -53,7 +53,22 @@ - + + $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x86.debug\ + + + $(SolutionDir)msbuild.x86.release\ + $(SolutionDir)msbuild.x86.release\$(ProjectName)\ + + + $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x64.debug\ + + + $(SolutionDir)msbuild.x64.release\$(ProjectName)\ + $(SolutionDir)msbuild.x64.release\ + Level4 diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 0cd3a9d25..8df9b5b9d 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -56,7 +56,22 @@ - + + $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x86.debug\ + + + $(SolutionDir)msbuild.x86.release\ + $(SolutionDir)msbuild.x86.release\$(ProjectName)\ + + + $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x64.debug\ + + + $(SolutionDir)msbuild.x64.release\$(ProjectName)\ + $(SolutionDir)msbuild.x64.release\ + Level3 diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj index 26fed0ec2..e533d0e15 100644 --- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj +++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj @@ -53,7 +53,22 @@ - + + $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x86.debug\ + + + $(SolutionDir)msbuild.x86.release\ + $(SolutionDir)msbuild.x86.release\$(ProjectName)\ + + + $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x64.debug\ + + + $(SolutionDir)msbuild.x64.release\$(ProjectName)\ + $(SolutionDir)msbuild.x64.release\ + Level3 diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj index 6bb0e8020..4cda29461 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj @@ -84,6 +84,22 @@ + + $(SolutionDir)msbuild.x86.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x86.debug\ + + + $(SolutionDir)msbuild.x86.release\ + $(SolutionDir)msbuild.x86.release\$(ProjectName)\ + + + $(SolutionDir)msbuild.x64.debug\$(ProjectName)\ + $(SolutionDir)msbuild.x64.debug\ + + + $(SolutionDir)msbuild.x64.release\$(ProjectName)\ + $(SolutionDir)msbuild.x64.release\ + true -- cgit v1.2.3 From 9cd5f5be00adf42de40db6648793ebe12c7a0dc9 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 1 Nov 2018 01:36:37 -0700 Subject: [bootstrap.ps1] Cleanup intermediate files after build --- scripts/bootstrap.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 216e3fb09..200d47bd1 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -390,3 +390,4 @@ Write-Verbose("Placing vcpkg.exe in the correct location") Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" | Out-Null Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" | Out-Null +Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue -- cgit v1.2.3 From a589f9f9ed1623f005d1760c957fe5942df68001 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 1 Nov 2018 01:36:51 -0700 Subject: [bootstrap.ps1] Remove unneeded Out-Null --- scripts/bootstrap.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 200d47bd1..ed82a6ab1 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -388,6 +388,6 @@ Write-Host "`nBuilding vcpkg.exe... done.`n" Write-Verbose("Placing vcpkg.exe in the correct location") -Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" | Out-Null -Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" | Out-Null +Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue -- cgit v1.2.3 From cc3fae8e5ca3e47ff2d7e1de428aba2d515bec54 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 1 Nov 2018 19:47:20 -0700 Subject: [xerces-c] Avoid building executables (#4576) --- ports/xerces-c/CONTROL | 2 +- ports/xerces-c/disable-tests.patch | 21 +++++++++++++++++++++ ports/xerces-c/portfile.cmake | 15 +++++---------- 3 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 ports/xerces-c/disable-tests.patch diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index 3ba79b1e8..006210e2f 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,3 +1,3 @@ Source: xerces-c -Version: 3.2.2-4 +Version: 3.2.2-5 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. diff --git a/ports/xerces-c/disable-tests.patch b/ports/xerces-c/disable-tests.patch new file mode 100644 index 000000000..843b022d7 --- /dev/null +++ b/ports/xerces-c/disable-tests.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4254f89..aa08565 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,10 +175,16 @@ install( + COMPONENT "development") + + # Process subdirectories ++if(NOT DISABLE_DOC) + add_subdirectory(doc) ++endif() + add_subdirectory(src) ++if(NOT DISABLE_TESTS) + add_subdirectory(tests) ++endif() ++if(NOT DISABLE_SAMPLES) + add_subdirectory(samples) ++endif() + + # Display configuration summary + message(STATUS "") diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 0976bbbd3..b14981c74 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -6,11 +6,16 @@ vcpkg_from_github( REF Xerces-C_3_2_2 SHA512 66f60fe9194376ac0ca99d13ea5bce23ada86e0261dde30686c21ceb5499e754dab8eb0a98adadd83522bda62709377715501f6dac49763e3a686f9171cc63ea HEAD_REF trunk + PATCHES disable-tests.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DDISABLE_TESTS=ON + -DDISABLE_DOC=ON + -DDISABLE_SAMPLES=ON ) vcpkg_install_cmake() @@ -21,16 +26,6 @@ else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XercesC TARGET_PATH share/xercesc) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - file(GLOB release_exe "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file(GLOB debug_exe "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - if(release_exe OR debug_exe) - file(REMOVE ${release_exe} ${debug_exe}) - endif() -endif() - file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake _contents) string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" -- cgit v1.2.3 From 91ba6e46317a0a385920f09a948cbd94827bfcb7 Mon Sep 17 00:00:00 2001 From: Koby Kahane Date: Fri, 2 Nov 2018 05:47:44 +0200 Subject: [rocksdb] update to v5.15.10 (#4342) * [rocksdb] Update to v5.15.10 * [rocksdb] Cleanup * [rocksdb] Fix cmake targets name. * [toolchains] Set NDEBUG in release * [rocksdb] Disable vcpkg_test_cmake due to misbehavior in x64 * [tiff] Use lzma on linux --- ports/rocksdb/0001-disable-gtest.patch | 13 +++++++ ports/rocksdb/0002-disable-gtest.patch | 25 -------------- ports/rocksdb/0002-only-build-one-flavor.patch | 36 +++++++++++++++++++ ports/rocksdb/0003-only-build-one-flavor.patch | 48 -------------------------- ports/rocksdb/0003-zlib-findpackage.patch | 13 +++++++ ports/rocksdb/0004-use-find-package.patch | 13 +++++++ ports/rocksdb/0004-zlib-findpackage.patch | 13 ------- ports/rocksdb/CONTROL | 2 +- ports/rocksdb/pass-major-version.patch | 20 ----------- ports/rocksdb/portfile.cmake | 32 +++++------------ ports/rocksdb/use-find-package.patch | 13 ------- ports/rocksdb/vcpkg-cmake-wrapper.cmake | 9 +++++ scripts/toolchains/freebsd.cmake | 16 ++++----- scripts/toolchains/linux.cmake | 16 ++++----- scripts/toolchains/osx.cmake | 16 ++++----- 15 files changed, 117 insertions(+), 168 deletions(-) create mode 100644 ports/rocksdb/0001-disable-gtest.patch delete mode 100644 ports/rocksdb/0002-disable-gtest.patch create mode 100644 ports/rocksdb/0002-only-build-one-flavor.patch delete mode 100644 ports/rocksdb/0003-only-build-one-flavor.patch create mode 100644 ports/rocksdb/0003-zlib-findpackage.patch create mode 100644 ports/rocksdb/0004-use-find-package.patch delete mode 100644 ports/rocksdb/0004-zlib-findpackage.patch delete mode 100644 ports/rocksdb/pass-major-version.patch delete mode 100644 ports/rocksdb/use-find-package.patch create mode 100644 ports/rocksdb/vcpkg-cmake-wrapper.cmake diff --git a/ports/rocksdb/0001-disable-gtest.patch b/ports/rocksdb/0001-disable-gtest.patch new file mode 100644 index 000000000..82fe3ff62 --- /dev/null +++ b/ports/rocksdb/0001-disable-gtest.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b7d37359..9ab8954b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -445,7 +445,7 @@ include_directories(${PROJECT_SOURCE_DIR}/include) + include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.7.0/fused-src) + find_package(Threads REQUIRED) + +-add_subdirectory(third-party/gtest-1.7.0/fused-src/gtest) ++#add_subdirectory(third-party/gtest-1.7.0/fused-src/gtest) + + # Main library source code + diff --git a/ports/rocksdb/0002-disable-gtest.patch b/ports/rocksdb/0002-disable-gtest.patch deleted file mode 100644 index 8d42bbaf1..000000000 --- a/ports/rocksdb/0002-disable-gtest.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f1ecf23b8a10ab5a917da4a39fba343a00cab1a9 Mon Sep 17 00:00:00 2001 -From: Robert Schumacher -Date: Fri, 23 Feb 2018 01:44:57 -0800 -Subject: [PATCH 2/3] disable gtest - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5fb551a..faffc91 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -393,7 +393,7 @@ include_directories(${PROJECT_SOURCE_DIR}/include) - include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.7.0/fused-src) - find_package(Threads REQUIRED) - --add_subdirectory(third-party/gtest-1.7.0/fused-src/gtest) -+#add_subdirectory(third-party/gtest-1.7.0/fused-src/gtest) - - # Main library source code - --- -2.16.2.windows.1 - diff --git a/ports/rocksdb/0002-only-build-one-flavor.patch b/ports/rocksdb/0002-only-build-one-flavor.patch new file mode 100644 index 000000000..2d6b3aa07 --- /dev/null +++ b/ports/rocksdb/0002-only-build-one-flavor.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ab8954b6..5b0405f4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -793,6 +793,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + + install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + ++ if(NOT ROCKSDB_DISABLE_INSTALL_STATIC_LIB) + install( + TARGETS ${ROCKSDB_STATIC_LIB} + EXPORT RocksDBTargets +@@ -800,15 +801,23 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) ++ else() ++ set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) ++ endif() + ++ if(NOT ROCKSDB_DISABLE_INSTALL_SHARED_LIB) + install( + TARGETS ${ROCKSDB_SHARED_LIB} + EXPORT RocksDBTargets + COMPONENT runtime + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) ++ else() ++ set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) ++ endif() + + install( + EXPORT RocksDBTargets diff --git a/ports/rocksdb/0003-only-build-one-flavor.patch b/ports/rocksdb/0003-only-build-one-flavor.patch deleted file mode 100644 index d9b4cf6e5..000000000 --- a/ports/rocksdb/0003-only-build-one-flavor.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f77366e2bf8c136990b89ab235af8e0cf0e566f4 Mon Sep 17 00:00:00 2001 -From: Robert Schumacher -Date: Fri, 23 Feb 2018 01:45:18 -0800 -Subject: [PATCH 3/3] only build one flavor - ---- - CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index faffc91..89dc537 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -723,6 +723,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - - install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -+ if(NOT ROCKSDB_DISABLE_INSTALL_STATIC_LIB) - install( - TARGETS ${ROCKSDB_STATIC_LIB} - EXPORT RocksDBTargets -@@ -730,15 +731,23 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" - ) -+ else() -+ set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) -+ endif() - -+ if(NOT ROCKSDB_DISABLE_INSTALL_SHARED_LIB) - install( - TARGETS ${ROCKSDB_SHARED_LIB} - EXPORT RocksDBTargets - COMPONENT runtime - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" - ) -+ else() -+ set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) -+ endif() - - install( - EXPORT RocksDBTargets --- -2.16.2.windows.1 - diff --git a/ports/rocksdb/0003-zlib-findpackage.patch b/ports/rocksdb/0003-zlib-findpackage.patch new file mode 100644 index 000000000..c2d71dc00 --- /dev/null +++ b/ports/rocksdb/0003-zlib-findpackage.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b0405f4a..43256fc04 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,7 +88,7 @@ else() + endif() + + if(WITH_ZLIB) +- find_package(zlib REQUIRED) ++ find_package(ZLIB REQUIRED) + add_definitions(-DZLIB) + include_directories(${ZLIB_INCLUDE_DIR}) + list(APPEND THIRDPARTY_LIBS ${ZLIB_LIBRARIES}) diff --git a/ports/rocksdb/0004-use-find-package.patch b/ports/rocksdb/0004-use-find-package.patch new file mode 100644 index 000000000..a6c7b5f58 --- /dev/null +++ b/ports/rocksdb/0004-use-find-package.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43256fc04..204761256 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,7 @@ option(WITH_SNAPPY "build with SNAPPY" OFF) + option(WITH_LZ4 "build with lz4" OFF) + option(WITH_ZLIB "build with zlib" OFF) + option(WITH_ZSTD "build with zstd" OFF) +-if(MSVC) ++if(MSVC AND NOT VCPKG_TOOLCHAIN) + # Defaults currently different for GFLAGS. + # We will address find_package work a little later + option(WITH_GFLAGS "build with GFlags" OFF) diff --git a/ports/rocksdb/0004-zlib-findpackage.patch b/ports/rocksdb/0004-zlib-findpackage.patch deleted file mode 100644 index 25182760d..000000000 --- a/ports/rocksdb/0004-zlib-findpackage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb3b126..45ca7b6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,7 +86,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - include_directories(${ZLIB_INCLUDE_DIR}) - list(APPEND THIRDPARTY_LIBS ${ZLIB_LIBRARIES}) diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index e35d1c5a9..9f70efb78 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.14.2 +Version: 5.15.10 Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/pass-major-version.patch b/ports/rocksdb/pass-major-version.patch deleted file mode 100644 index 1cc3f2d13..000000000 --- a/ports/rocksdb/pass-major-version.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6bfbf2..ea6a884 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,6 +132,7 @@ endif() - - string(REGEX REPLACE "[^0-9a-f]+" "" GIT_SHA "${GIT_SHA}") - -+if(NOT DEFINED ROCKSDB_VERSION OR NOT DEFINED ROCKSDB_VERSION_MAJOR) - set(SH_CMD "sh") - execute_process(COMMAND - ${SH_CMD} -c "build_tools/version.sh full" -@@ -145,6 +146,7 @@ execute_process(COMMAND - OUTPUT_VARIABLE ROCKSDB_VERSION_MAJOR - ) - string(STRIP "${ROCKSDB_VERSION_MAJOR}" ROCKSDB_VERSION_MAJOR) -+endif() - - option(WITH_MD_LIBRARY "build with MD" ON) - if(WIN32 AND MSVC) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 8b4813aa8..0d124361b 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,19 +3,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v5.14.2 - SHA512 44ea887157daa1b504205d73ec07ff2c74164973aa057e58a02f39e0540dc394af8218da8bda57152c2a3171262e7147a5dbc4b6dd2c25eb35388d0786de0e35 + REF v5.15.10 + SHA512 3faef43cc343c20e044f92af7cd9eae9783612d888bfe17b7d0ae6812090088f43a128e5686600ec56f5a88c100eaa893b2551f8c32df793a4ccd94330c07037 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/0002-disable-gtest.patch" - "${CMAKE_CURRENT_LIST_DIR}/0003-only-build-one-flavor.patch" - "${CMAKE_CURRENT_LIST_DIR}/0004-zlib-findpackage.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-find-package.patch" - "${CMAKE_CURRENT_LIST_DIR}/pass-major-version.patch" + 0001-disable-gtest.patch + 0002-only-build-one-flavor.patch + 0003-zlib-findpackage.patch + 0004-use-find-package.patch ) file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake") @@ -25,12 +20,7 @@ file(COPY DESTINATION "${SOURCE_PATH}/cmake/modules" ) -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(WITH_MD_LIBRARY OFF) -else() - set(WITH_MD_LIBRARY ON) -endif() - +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROCKSDB_DISABLE_INSTALL_SHARED_LIB) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_DISABLE_INSTALL_STATIC_LIB) @@ -49,10 +39,6 @@ if("zlib" IN_LIST FEATURES) set(WITH_ZLIB ON) endif() -get_filename_component(ROCKSDB_VERSION "${SOURCE_PATH}" NAME) -string(REPLACE "rocksdb-" "" ROCKSDB_VERSION "${ROCKSDB_VERSION}") -string(REGEX REPLACE "^([0-9]+)." "\\1" ROCKSDB_MAJOR_VERSION "${ROCKSDB_VERSION}") - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -69,8 +55,6 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB} -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB} - -DROCKSDB_VERSION=${ROCKSDB_VERSION} - -DROCKSDB_VERSION_MAJOR=${ROCKSDB_MAJOR_VERSION} -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE @@ -84,6 +68,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/rocksdb RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE.leveldb DESTINATION ${CURRENT_PACKAGES_DIR}/share/rocksdb) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${SOURCE_PATH}/LICENSE.leveldb DESTINATION ${CURRENT_PACKAGES_DIR}/share/rocksdb) vcpkg_copy_pdbs() diff --git a/ports/rocksdb/use-find-package.patch b/ports/rocksdb/use-find-package.patch deleted file mode 100644 index 1a79c2286..000000000 --- a/ports/rocksdb/use-find-package.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3ac9ce..931e9f2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ option(WITH_JEMALLOC "build with JeMalloc" OFF) - option(WITH_SNAPPY "build with SNAPPY" OFF) - option(WITH_LZ4 "build with lz4" OFF) - option(WITH_ZLIB "build with zlib" OFF) --if(MSVC) -+if(MSVC AND NOT VCPKG_TOOLCHAIN) - # Defaults currently different for GFLAGS. - # We will address find_package work a little later - option(WITH_GFLAGS "build with GFlags" OFF) diff --git a/ports/rocksdb/vcpkg-cmake-wrapper.cmake b/ports/rocksdb/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..455facf22 --- /dev/null +++ b/ports/rocksdb/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_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() diff --git a/scripts/toolchains/freebsd.cmake b/scripts/toolchains/freebsd.cmake index 9edbb8394..ecd4a4478 100644 --- a/scripts/toolchains/freebsd.cmake +++ b/scripts/toolchains/freebsd.cmake @@ -5,14 +5,14 @@ set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS}" CACHE STRING "") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") endif() diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index 524d745cf..ade9db90b 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -5,14 +5,14 @@ set(CMAKE_SYSTEM_NAME Linux CACHE STRING "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS}" CACHE STRING "") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") endif() diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake index 296d74ebe..9465ae0de 100644 --- a/scripts/toolchains/osx.cmake +++ b/scripts/toolchains/osx.cmake @@ -13,14 +13,14 @@ set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${VCPKG_LINKER_FLAGS}" CACHE STRING "") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") endif() -- cgit v1.2.3 From 01371c88e742532f4ff0cd58c74d5f48c104a854 Mon Sep 17 00:00:00 2001 From: Farwaykorse Date: Sat, 3 Nov 2018 00:17:07 +0100 Subject: [nanodbc] add support for install --head (#4641) * [nanodbc] add support for use of --head * single line copyright handler * support cmake targets for v2.13 --- ports/nanodbc/portfile.cmake | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index 7019852ea..ff90b4b19 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -1,17 +1,23 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(STATUS "Warning: Static building not supported yet. Building dynamic.") - set(VCPKG_LIBRARY_LINKAGE dynamic) -endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nanodbc-2.12.4) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/nanodbc/nanodbc/archive/v2.12.4.tar.gz" - FILENAME "nanodbc-2.12.4.tar.gz" +# Only static libraries are supported. +# See https://github.com/nanodbc/nanodbc/issues/13 +if(VCPKG_USE_HEAD_VERSION) # v2.13 + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +else() # v2.12.4 + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nanodbc/nanodbc + REF v2.12.4 SHA512 b9a924516b2a777e5f1497774997672320548722ed53413b0a7ad5d503e2f8ca1099f5059a912b7aae410928f4c4edcdfd02e4cfbf415976cd222697b354b4e6 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) +# Legacy, remove at release of v2.13 +if(NOT VCPKG_USE_HEAD_VERSION) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES @@ -20,18 +26,27 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/0003_export_def.patch ${CMAKE_CURRENT_LIST_DIR}/0004_unicode.patch ) +endif() +# /Legacy vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS +# Legacy, remove at release of v2.13 -DNANODBC_EXAMPLES=OFF -DNANODBC_TEST=OFF -DNANODBC_USE_UNICODE=ON +# /Legacy + -DNANODBC_DISABLE_EXAMPLES=ON + -DNANODBC_DISABLE_TESTS=ON + -DNANODBC_ENABLE_UNICODE=ON ) vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +endif() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanodbc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/nanodbc/LICENSE ${CURRENT_PACKAGES_DIR}/share/nanodbc/copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanodbc RENAME copyright) -- cgit v1.2.3 From 1c2c69529e0ca44bd2fa4da68507d07aa3f310a4 Mon Sep 17 00:00:00 2001 From: Mark Salisbury Date: Fri, 2 Nov 2018 17:20:02 -0600 Subject: When downloading a tool, print URL and filepath (#4640) I'm seeing the error below: Building package zlib[core]:x86-windows... A suitable version of git was not found (required v2.17.1). Downloading portable git v2.17.1... Downloading git... WinHttpSendRequest() failed: 12002 I suspect the WinHttpSendRequest error is due to being behind a proxy - most download issues seem to be this. Or perhaps because a sys admin somewhere has disabled WinInet, somehow. I don't know. I don't know how to debug WinHttpSendRequest(); a quick google search didn't help. By printing the URL that vcpkg is trying to download, and where it's trying to download to, I can pop the URL in my browser, save it at the location specified, and move on with my life. --- toolsrc/src/vcpkg/tools.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 313b5997b..e28291428 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -191,6 +191,7 @@ namespace vcpkg if (!fs.exists(tool_data.download_path)) { System::println("Downloading %s...", tool_name); + System::println(" %s -> %s", tool_data.url, tool_data.download_path.string()); Downloads::download_file(fs, tool_data.url, tool_data.download_path, tool_data.sha512); System::println("Downloading %s... done.", tool_name); } -- cgit v1.2.3 From 315ef424f8a2e98e0c601360683d2d831e70918d Mon Sep 17 00:00:00 2001 From: crackedmind Date: Sun, 4 Nov 2018 02:15:07 +0300 Subject: [autocomplete] Add autocompletion for `vcpkg upgrade` --- toolsrc/src/vcpkg/commands.autocomplete.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index 564404421..bded1ee39 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -56,6 +56,7 @@ namespace vcpkg::Commands::Autocomplete "cache", "version", "contact", + "upgrade" }; Util::unstable_keep_if(public_commands, [&](const std::string& s) { @@ -124,6 +125,7 @@ namespace vcpkg::Commands::Autocomplete CommandEntry{"edit", R"###(^edit\s(.*\s|)(\S*)$)###", Edit::COMMAND_STRUCTURE}, CommandEntry{"remove", R"###(^remove\s(.*\s|)(\S*)$)###", Remove::COMMAND_STRUCTURE}, CommandEntry{"integrate", R"###(^integrate(\s+)(\S*)$)###", Integrate::COMMAND_STRUCTURE}, + CommandEntry{"upgrade", R"###(^upgrade(\s+)(\S*)$)###", Upgrade::COMMAND_STRUCTURE}, }; for (auto&& command : COMMANDS) -- cgit v1.2.3 From 4ef6ddddd2abbe38390d9ad7cb62e4e5c75627c9 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Mon, 5 Nov 2018 04:24:45 +0900 Subject: [opencv] Update to OpenCV 3.4.3 (#4636) Update opencv port to OpenCV 3.4.3. --- ports/opencv/0001-winrt-fixes.patch | 13 +------ ports/opencv/0002-install-options.patch | 52 ++++++++++++++------------ ports/opencv/0005-remove-protobuf-target.patch | 17 ++------- ports/opencv/CONTROL | 2 +- ports/opencv/portfile.cmake | 6 +-- 5 files changed, 37 insertions(+), 53 deletions(-) diff --git a/ports/opencv/0001-winrt-fixes.patch b/ports/opencv/0001-winrt-fixes.patch index f913d92a4..fa8c8cfc9 100644 --- a/ports/opencv/0001-winrt-fixes.patch +++ b/ports/opencv/0001-winrt-fixes.patch @@ -1,17 +1,6 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -311,7 +311,7 @@ OCV_OPTION(INSTALL_TESTS "Install accuracy and performance test binar - # OpenCV build options - # =================================================== - OCV_OPTION(ENABLE_CCACHE "Use ccache" (UNIX AND NOT IOS AND (CMAKE_GENERATOR MATCHES "Makefile" OR CMAKE_GENERATOR MATCHES "Ninja")) ) --OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers" ON IF (NOT IOS AND NOT CMAKE_CROSSCOMPILING) ) -+OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers" ON IF (NOT IOS AND (MSVC OR NOT CMAKE_CROSSCOMPILING)) ) - OCV_OPTION(ENABLE_SOLUTION_FOLDERS "Solution folder in Visual Studio or in other IDEs" (MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode) ) - OCV_OPTION(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF IF CMAKE_COMPILER_IS_GNUCXX ) - OCV_OPTION(ENABLE_COVERAGE "Enable coverage collection with GCov" OFF IF CMAKE_COMPILER_IS_GNUCXX ) --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -842,7 +842,7 @@ macro(ocv_create_module) +@@ -848,7 +848,7 @@ macro(ocv_create_module) set(the_module_target ${the_module}) endif() diff --git a/ports/opencv/0002-install-options.patch b/ports/opencv/0002-install-options.patch index 830c9f385..03e1334f1 100644 --- a/ports/opencv/0002-install-options.patch +++ b/ports/opencv/0002-install-options.patch @@ -1,6 +1,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7c76ecf3..d1c14bfcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -307,6 +307,10 @@ OCV_OPTION(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF ) +@@ -312,6 +312,10 @@ OCV_OPTION(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF ) OCV_OPTION(INSTALL_ANDROID_EXAMPLES "Install Android examples" OFF IF ANDROID ) OCV_OPTION(INSTALL_TO_MANGLED_PATHS "Enables mangled install paths, that help with side by side installs." OFF IF (UNIX AND NOT ANDROID AND NOT APPLE_FRAMEWORK AND BUILD_SHARED_LIBS) ) OCV_OPTION(INSTALL_TESTS "Install accuracy and performance test binaries and test data" OFF) @@ -8,21 +10,12 @@ +OCV_OPTION(INSTALL_LICENSE "Install license file" ON) +OCV_OPTION(INSTALL_OTHER "Install other files" ON) +OCV_OPTION(INSTALL_FORCE_UNIX_PATHS "Force unix-style installation" OFF) - + # OpenCV build options # =================================================== -@@ -335,7 +339,7 @@ OCV_OPTION(CV_ENABLE_INTRINSICS "Use intrinsic-based optimized code" ON ) - OCV_OPTION(CV_DISABLE_OPTIMIZATION "Disable explicit optimized code (dispatched code/intrinsics/loop unrolling/etc)" OFF ) - OCV_OPTION(CV_TRACE "Enable OpenCV code trace" ON) - --OCV_OPTION(ENABLE_PYLINT "Add target with Pylint checks" (${BUILD_DOCS} OR ${BUILD_EXAMPLES}) IF (NOT CMAKE_CROSSCOMPILING AND NOT APPLE_FRAMEWORK) ) -+OCV_OPTION(ENABLE_PYLINT "Add target with Pylint checks" (BUILD_DOCS OR BUILD_EXAMPLES) IF (NOT CMAKE_CROSSCOMPILING AND NOT APPLE_FRAMEWORK) ) - - if(ENABLE_IMPL_COLLECTION) - add_definitions(-DCV_COLLECT_IMPL_DATA) -@@ -372,7 +376,9 @@ else() +@@ -378,7 +382,9 @@ else() endif() - + if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) + if(DEFINED OpenCV_DISABLE_ARCH_PATH) @@ -31,9 +24,9 @@ ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") else() message(STATUS "Can't detect runtime and/or arch") -@@ -427,12 +433,8 @@ else() +@@ -433,12 +439,8 @@ else() ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") - + if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - if(OpenCV_STATIC) - ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") @@ -46,26 +39,28 @@ ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples) ocv_update(OPENCV_JAR_INSTALL_PATH java) ocv_update(OPENCV_OTHER_INSTALL_PATH etc) -@@ -895,7 +897,7 @@ if(NOT OPENCV_LICENSE_FILE) +@@ -901,7 +903,7 @@ if(NOT OPENCV_LICENSE_FILE) endif() - + # for UNIX it does not make sense as LICENSE and readme will be part of the package automatically -if(ANDROID OR NOT UNIX) +if(ANDROID OR NOT UNIX AND INSTALL_LICENSE) install(FILES ${OPENCV_LICENSE_FILE} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ DESTINATION ./ COMPONENT libs) +diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake +index b2ca82bad..c2f6e001d 100644 --- a/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake @@ -105,7 +105,7 @@ 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(((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) OR INSTALL_FORCE_UNIX_PATHS) ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") endif() - + @@ -117,7 +117,7 @@ endif() # -------------------------------------------------------------------------------------------- # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages @@ -75,6 +70,8 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) if(BUILD_SHARED_LIBS) set(_lib_suffix "lib") +diff --git a/cmake/OpenCVGenHeaders.cmake b/cmake/OpenCVGenHeaders.cmake +index 477b91055..57dc82e13 100644 --- a/cmake/OpenCVGenHeaders.cmake +++ b/cmake/OpenCVGenHeaders.cmake @@ -1,7 +1,9 @@ @@ -85,20 +82,23 @@ +if(INSTALL_HEADERS) + install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev) +endif() - + # platform-specific config file ocv_compiler_optimization_fill_cpu_config() @@ -29,4 +31,6 @@ set(OPENCV_MODULE_DEFINITIONS_CONFIGMAKE "${OPENCV_MODULE_DEFINITIONS_CONFIGMAKE #endforeach() - + configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv_modules.hpp.in" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp") -install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev) +if(INSTALL_HEADERS) + install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev) +endif() +\ No newline at end of file +diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake +index 54f100d3c..eae83b074 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -994,7 +994,9 @@ macro(_ocv_create_module) +@@ -1000,7 +1000,9 @@ macro(_ocv_create_module) foreach(hdr ${OPENCV_MODULE_${the_module}_HEADERS}) string(REGEX REPLACE "^.*opencv2/" "opencv2/" hdr2 "${hdr}") if(NOT hdr2 MATCHES "private" AND hdr2 MATCHES "^(opencv2/?.*)/[^/]+.h(..)?$" ) @@ -109,21 +109,25 @@ endif() endforeach() endif() +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 1f0d72008..86b9d8929 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,8 +1,10 @@ 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_OTHER) + install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) + install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) +endif() - + 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/include/CMakeLists.txt b/include/CMakeLists.txt +index b4e48e6fa..5ac6f1603 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,7 +1,9 @@ diff --git a/ports/opencv/0005-remove-protobuf-target.patch b/ports/opencv/0005-remove-protobuf-target.patch index b538ee040..a31e6d168 100644 --- a/ports/opencv/0005-remove-protobuf-target.patch +++ b/ports/opencv/0005-remove-protobuf-target.patch @@ -1,6 +1,8 @@ +diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake +index b9171f14f..6e06310b1 100644 --- a/cmake/OpenCVFindProtobuf.cmake +++ b/cmake/OpenCVFindProtobuf.cmake -@@ -44,17 +44,6 @@ else() +@@ -43,17 +43,6 @@ else() # end of compatibility block if(Protobuf_FOUND) @@ -11,21 +13,10 @@ - add_library(libprotobuf UNKNOWN IMPORTED) - set_target_properties(libprotobuf PROPERTIES - IMPORTED_LOCATION "${Protobuf_LIBRARY}" -- INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}" +- INTERFACE_INCLUDE_SYSTEM_DIRECTORIES "${Protobuf_INCLUDE_DIR}" - ) - get_protobuf_version(Protobuf_VERSION "${Protobuf_INCLUDE_DIR}") - endif() set(HAVE_PROTOBUF TRUE) endif() endif() ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -65,7 +65,7 @@ endif() - - ocv_module_include_directories(${fw_inc} ${CMAKE_CURRENT_LIST_DIR}/src/ocl4dnn/include ${OPENCL_INCLUDE_DIRS}) - ocv_glob_module_sources(SOURCES ${fw_srcs}) --ocv_create_module(libprotobuf ${LAPACK_LIBRARIES}) -+ocv_create_module() - ocv_add_samples() - ocv_add_accuracy_tests() - ocv_add_perf_tests() diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 5450f3906..458bbb25e 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.1 +Version: 3.4.3-1 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 78ed5fa51..19bd3e43e 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(OPENCV_PORT_VERSION "3.4.1") +set(OPENCV_PORT_VERSION "3.4.3") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_PORT_VERSION} - SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b + SHA512 d653a58eb5e3939b9fdb7438ac35f77cf4385cf72d5d22bfd21722a109e1b3283dbb9407985061b7548114f0d05c9395aac9bb62b4d2bc1f68da770a49987fef HEAD_REF master ) @@ -218,7 +218,7 @@ if(BUILD_opencv_contrib) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_PORT_VERSION} - SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1 + SHA512 456c6f878fb3bd5459f6430405cf05c609431f8d7db743aa699fc75c305d019682ee3a804bf0cf5107597dd1dbbb69b08be3535a0e6c717e4773ed7c05d08e59 HEAD_REF master ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") -- cgit v1.2.3 From ccafb5641156e9e59d16d6f2db407f1514b4e939 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 4 Nov 2018 20:27:02 +0100 Subject: [ace] Retrieve source package from github which has much more bandwidth (#4628) * ace 6.5.2 * [ace] Retrieve source package from github which has much more bandwidth as download.dre * [ace] Use previous filename --- ports/ace/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 98b000122..3f5df8868 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -9,7 +9,7 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) vcpkg_download_distfile(ARCHIVE - URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.zip" + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_2/ACE.zip" FILENAME "ACE-6.5.2.zip" SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98 ) -- cgit v1.2.3 From f11fd8aa5de71d6664b6dfb0b5425308b6426bcc Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sun, 4 Nov 2018 20:28:27 +0100 Subject: [fribidi] new port (#4627) --- ports/fribidi/CONTROL | 3 +++ ports/fribidi/portfile.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 ports/fribidi/CONTROL create mode 100644 ports/fribidi/portfile.cmake diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL new file mode 100644 index 000000000..65e9a2248 --- /dev/null +++ b/ports/fribidi/CONTROL @@ -0,0 +1,3 @@ +Source: fribidi +Version: 1.0.5 +Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake new file mode 100644 index 000000000..d366b89ef --- /dev/null +++ b/ports/fribidi/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fribidi/fribidi + REF v1.0.5 + SHA512 c51b67cc3e7610bef9a66f2456f7602fe010164c2c01e7d91026cefa4a08fdce5165b6eb3814e76cd89e766356fb71adc08bf75d9b2f5802f71c18b5d0476887 +HEAD_REF master) + +vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Ddocs=false + --backend=ninja) + +vcpkg_install_meson() +vcpkg_copy_pdbs() + +file(GLOB EXE_FILES + "${CURRENT_PACKAGES_DIR}/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" +) +if (EXE_FILES) + file(REMOVE ${EXE_FILES}) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From dfa01ba5ff29af14891f197fbae569278936285b Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Sun, 4 Nov 2018 19:29:53 +0000 Subject: [linalg] inital port (#4625) --- ports/linalg/CONTROL | 3 +++ ports/linalg/portfile.cmake | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 ports/linalg/CONTROL create mode 100644 ports/linalg/portfile.cmake diff --git a/ports/linalg/CONTROL b/ports/linalg/CONTROL new file mode 100644 index 000000000..eb2afe6f3 --- /dev/null +++ b/ports/linalg/CONTROL @@ -0,0 +1,3 @@ +Source: linalg +Version: 2.1 +Description: linalg.h is a single header public domain linear algebra library for C++11 diff --git a/ports/linalg/portfile.cmake b/ports/linalg/portfile.cmake new file mode 100644 index 000000000..4f2777755 --- /dev/null +++ b/ports/linalg/portfile.cmake @@ -0,0 +1,12 @@ +#header-only library +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sgorsten/linalg + REF v2.1 + SHA512 48d8248ea1bca3d4fe35d038690f496cd0c8c9469d76eca684668ce6fef5df0eb9556f9b49e4da90e2c2e8ef475791877aa815c3f9437c097fbfc303134d02d7 + HEAD_REF master +) + +configure_file(${SOURCE_PATH}/UNLICENSE ${CURRENT_PACKAGES_DIR}/share/linalg/copyright COPYONLY) +configure_file(${SOURCE_PATH}/linalg.h ${CURRENT_PACKAGES_DIR}/include/linalg.h COPYONLY) \ No newline at end of file -- cgit v1.2.3 From eebb20eee7b4826638b3e07dd3513635bc276c79 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Sun, 4 Nov 2018 22:33:51 +0300 Subject: [nlohmann-json] Update to 3.4.0 (#4619) --- ports/nlohmann-json/CONTROL | 2 +- ports/nlohmann-json/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 8ee107a92..1e628ba81 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,3 +1,3 @@ Source: nlohmann-json -Version: 3.3.0 +Version: 3.4.0 Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 5cee9565e..d3926cab6 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_VERSION 3.3.0) +set(SOURCE_VERSION 3.4.0) vcpkg_download_distfile(HEADER URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp" FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp" - SHA512 c4e4bb84d1488f87a02c4e12409491225e345cc508e6dbbee1a3542fbd4953052c256d0fe78c4d3ce02d44c3a2155fe66f0c8a93a3851ddf94fec4f9f3fd6918 + SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d ) vcpkg_download_distfile(LICENSE -- cgit v1.2.3 From 1c01a56dc8aa66c3769c29fce09dbcf8938cc17a Mon Sep 17 00:00:00 2001 From: "Force.Charlie-I" Date: Mon, 5 Nov 2018 03:35:31 +0800 Subject: [nghttp2] update 1.34.0 (#4621) * [nghttp2] update 1.34.0 * [ports] update nghttp2 to 1.34.0 --- ports/nghttp2/CONTROL | 2 +- ports/nghttp2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL index 09297c507..eb070c132 100644 --- a/ports/nghttp2/CONTROL +++ b/ports/nghttp2/CONTROL @@ -1,3 +1,3 @@ Source: nghttp2 -Version: 1.33.0 +Version: 1.34.0 Description: Implementation of the Hypertext Transfer Protocol version 2 in C diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 96829566c..cf80ecd66 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) set(LIB_NAME nghttp2) -set(LIB_VERSION 1.33.0) +set(LIB_VERSION 1.34.0) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) @@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 39c37a6579d1da6a6bcfb32c822f59943796ef4c11d82146924b8e279653c4afca496b6cc7fd65b0181f95fa5007a2dd0589038d6f4354c75d65e60d29528268 + SHA512 f027f8e043c58710ff34a65c705c0a76d91ffbf20f684606dbbbecc10f0e1fbc98a41047b8df5061af0bda6e8f89a9587e33c6549181f9317c4d3336e4a8b62e ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 087691c94a45bbfb636c9bc4ebb63906ac012edf Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Tue, 6 Nov 2018 23:56:40 +0200 Subject: fdlibm init (#4165) * fdlibm init * fix links * Fix different hashes creation with google host * Move functions to script * Fix documentation * [vcpkg_from_git] Add SHA512 argument, switch to zip to better support Windows. * [fdlibm] Trigger rebuild * [vcpkg_from_git] Use FETCH_HEAD reference to support tags --- ports/fdlibm/CMakeLists.txt | 28 +++++++ ports/fdlibm/CONTROL | 3 + ports/fdlibm/libm5.def | 88 +++++++++++++++++++++ ports/fdlibm/portfile.cmake | 24 ++++++ scripts/cmake/vcpkg_common_functions.cmake | 1 + scripts/cmake/vcpkg_from_git.cmake | 118 +++++++++++++++++++++++++++++ 6 files changed, 262 insertions(+) create mode 100644 ports/fdlibm/CMakeLists.txt create mode 100644 ports/fdlibm/CONTROL create mode 100644 ports/fdlibm/libm5.def create mode 100644 ports/fdlibm/portfile.cmake create mode 100644 scripts/cmake/vcpkg_from_git.cmake diff --git a/ports/fdlibm/CMakeLists.txt b/ports/fdlibm/CMakeLists.txt new file mode 100644 index 000000000..c31f04ab4 --- /dev/null +++ b/ports/fdlibm/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.8) +project(fdlibm C) + +file(GLOB fdlibm_SOURCES "*.c") + +include_directories(".") + +if(WIN32) +set(fdlibm_SOURCES ${fdlibm_SOURCES} libm5.def) +endif() + + +add_library(fdlibm ${fdlibm_SOURCES}) + +install( + TARGETS fdlibm + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/manual-link + ARCHIVE DESTINATION lib/manual-link +) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + FILES + fdlibm.h + DESTINATION include + ) +endif() diff --git a/ports/fdlibm/CONTROL b/ports/fdlibm/CONTROL new file mode 100644 index 000000000..e519980bb --- /dev/null +++ b/ports/fdlibm/CONTROL @@ -0,0 +1,3 @@ +Source: fdlibm +Version: 5.3-2 +Description: FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic diff --git a/ports/fdlibm/libm5.def b/ports/fdlibm/libm5.def new file mode 100644 index 000000000..2de0ad485 --- /dev/null +++ b/ports/fdlibm/libm5.def @@ -0,0 +1,88 @@ +EXPORTS + __ieee754_acos @ 1 ; + __ieee754_acosh @ 2 ; + __ieee754_asin @ 3 ; + __ieee754_atan2 @ 4 ; + __ieee754_atanh @ 5 ; + __ieee754_cosh @ 6 ; + __ieee754_exp @ 7 ; + __ieee754_fmod @ 8 ; + __ieee754_gamma @ 9 ; + __ieee754_gamma_r @ 10 ; + __ieee754_hypot @ 11 ; + __ieee754_j0 @ 12 ; + __ieee754_j1 @ 13 ; + __ieee754_jn @ 14 ; + __ieee754_lgamma @ 15 ; + __ieee754_lgamma_r @ 16 ; + __ieee754_log @ 17 ; + __ieee754_log10 @ 18 ; + __ieee754_pow @ 19 ; + __ieee754_rem_pio2 @ 20 ; + __ieee754_remainder @ 21 ; + __ieee754_scalb @ 22 ; + __ieee754_sinh @ 23 ; + __ieee754_sqrt @ 24 ; + __ieee754_y0 @ 25 ; + __ieee754_y1 @ 26 ; + __ieee754_yn @ 27 ; + __kernel_cos @ 28 ; + __kernel_rem_pio2 @ 29 ; + __kernel_sin @ 30 ; + __kernel_standard @ 31 ; + __kernel_tan @ 32 ; + _fdlib_version @ 33 DATA ; + acos @ 34 ; + acosh @ 35 ; + asin @ 36 ; + asinh @ 37 ; + atan @ 38 ; + atan2 @ 39 ; + atanh @ 40 ; + cbrt @ 41 ; + ceil @ 42 ; + copysign @ 43 ; + cos @ 44 ; + cosh @ 45 ; + erf @ 46 ; + erfc @ 47 ; + exp @ 48 ; + expm1 @ 49 ; + fabs @ 50 ; + ieee_finite @ 51 ; + floor @ 52 ; + fmod @ 53 ; + frexp @ 54 ; + ieee_gamma @ 55 ; + ieee_gamma_r @ 56 ; + hypot @ 57 ; + ilogb @ 58 ; + ieee_isnan @ 59 ; + j0 @ 60 ; + j1 @ 61 ; + jn @ 62 ; + ldexp @ 63 ; + ieee_lgamma @ 64 ; + ieee_lgamma_r @ 65 ; + log @ 66 ; + log10 @ 67 ; + log1p @ 68 ; + logb @ 69 ; + ieee_matherr @ 70 ; + modf @ 71 ; + nextafter @ 72 ; + pow @ 73 ; + remainder @ 74 ; + rint @ 75 ; + ieee_scalb @ 76 ; + scalbn @ 77 ; + signgam @ 78 DATA ; + ieee_significand @ 79 ; + sin @ 80 ; + sinh @ 81 ; + sqrt @ 82 ; + tan @ 83 ; + tanh @ 84 ; + y0 @ 85 ; + y1 @ 86 ; + yn @ 87 ; diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake new file mode 100644 index 000000000..fb616db7b --- /dev/null +++ b/ports/fdlibm/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://android.googlesource.com/platform/external/fdlibm + REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac + SHA512 08c16ff7cc6f24d962090bf5ab192d3c8ab33d9f60390ca510898c918cefa1b19572ad6bbf49c327bb09d8a9ab52d8341ec14c44abe169d2d319523567f1300f +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY) diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index 595ebb00e..c8b8fa977 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -27,4 +27,5 @@ include(vcpkg_get_program_files_32_bit) include(vcpkg_get_program_files_platform_bitness) include(vcpkg_get_windows_sdk) include(vcpkg_replace_string) +include(vcpkg_from_git) include(vcpkg_test_cmake) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake new file mode 100644 index 000000000..c2965292d --- /dev/null +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -0,0 +1,118 @@ +## # 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 full commit id of the current latest master. +## +## ### PATCHES +## A list of patches to be applied to the extracted sources. +## +## Relative paths are based on the port directory. +## +## ## Notes: +## `REF` and `URL` must be specified. +## +## ## Examples: +## +## * [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) + +function(vcpkg_from_git) + set(oneValueArgs OUT_SOURCE_PATH URL REF SHA512) + set(multipleValuesArgs PATCHES) + cmake_parse_arguments(_vdud "" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN}) + + if(NOT DEFINED _vdud_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + + if(NOT DEFINED _vdud_URL) + message(FATAL_ERROR "The git url must be specified") + endif() + + if(NOT DEFINED _vdud_REF) + message(FATAL_ERROR "The git ref must be specified.") + endif() + + if(NOT DEFINED _vdud_SHA512) + message(FATAL_ERROR "vcpkg_from_git requires a SHA512 argument. If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") + endif() + + string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}") + set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.zip") + set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.zip") + set(TEMP_SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SANITIZED_REF}") + + function(test_hash FILE_PATH FILE_KIND CUSTOM_ERROR_ADVICE) + file(SHA512 ${FILE_PATH} FILE_HASH) + if(NOT FILE_HASH STREQUAL _vdud_SHA512) + message(FATAL_ERROR + "\nFile does not have expected hash:\n" + " File path: [ ${FILE_PATH} ]\n" + " Expected hash: [ ${_vdud_SHA512} ]\n" + " Actual hash: [ ${FILE_HASH} ]\n" + "${CUSTOM_ERROR_ADVICE}\n") + endif() + endfunction() + + if(NOT EXISTS "${ARCHIVE}") + if(_VCPKG_NO_DOWNLOADS) + message(FATAL_ERROR "Downloads are disabled, but '${ARCHIVE}' does not exist.") + endif() + message(STATUS "Fetching ${_vdud_URL}...") + find_program(GIT NAMES git git.cmd) + # Note: git init is safe to run multiple times + vcpkg_execute_required_process( + COMMAND ${GIT} init git-tmp + WORKING_DIRECTORY ${DOWNLOADS} + LOGNAME git-init + ) + vcpkg_execute_required_process( + COMMAND ${GIT} fetch ${_vdud_URL} ${_vdud_REF} --depth 1 -n + WORKING_DIRECTORY ${DOWNLOADS}/git-tmp + LOGNAME git-fetch + ) + file(MAKE_DIRECTORY "${DOWNLOADS}/temp") + vcpkg_execute_required_process( + COMMAND ${GIT} archive FETCH_HEAD -o "${TEMP_ARCHIVE}" + WORKING_DIRECTORY ${DOWNLOADS}/git-tmp + LOGNAME git-archive + ) + test_hash("${TEMP_ARCHIVE}" "downloaded repo" "") + get_filename_component(downloaded_file_dir "${ARCHIVE}" DIRECTORY) + file(MAKE_DIRECTORY "${downloaded_file_dir}") + file(RENAME "${TEMP_ARCHIVE}" "${ARCHIVE}") + else() + message(STATUS "Using cached ${ARCHIVE}") + test_hash("${ARCHIVE}" "cached file" "Please delete the file and retry if this file should be downloaded again.") + endif() + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${SANITIZED_REF}" + PATCHES ${_vdud_PATCHES} + NO_REMOVE_ONE_LEVEL + ) + + set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() -- cgit v1.2.3 From 2c72e57bf453c7d22744cb210e28a6c967f4ed25 Mon Sep 17 00:00:00 2001 From: Tom Henoch <40023589+Tom-Henoch@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:26:03 +0100 Subject: aixlog port (#4660) --- ports/aixlog/CONTROL | 3 +++ ports/aixlog/portfile.cmake | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 ports/aixlog/CONTROL create mode 100644 ports/aixlog/portfile.cmake diff --git a/ports/aixlog/CONTROL b/ports/aixlog/CONTROL new file mode 100644 index 000000000..12e2a88c9 --- /dev/null +++ b/ports/aixlog/CONTROL @@ -0,0 +1,3 @@ +Source: aixlog +Version: 1.2.1 +Description: Header-only C++ logging library diff --git a/ports/aixlog/portfile.cmake b/ports/aixlog/portfile.cmake new file mode 100644 index 000000000..4838372d6 --- /dev/null +++ b/ports/aixlog/portfile.cmake @@ -0,0 +1,32 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO badaix/aixlog + REF v1.2.1 + SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12 + ) + + + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aixlog) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/aixlog/LICENSE ${CURRENT_PACKAGES_DIR}/share/aixlog/copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME aixlog) -- cgit v1.2.3 From d2ffdca39b4cbc250d4ae753b6017f9fa631b5bb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 6 Nov 2018 15:47:02 -0800 Subject: [docs] Regenerate docs for vcpkg_from_git --- docs/maintainers/portfile-functions.md | 1 + docs/maintainers/vcpkg_from_git.md | 48 ++++++++++++++++++++++++++++++++++ scripts/cmake/vcpkg_from_git.cmake | 14 +++++++--- 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 docs/maintainers/vcpkg_from_git.md diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 3180609ad..1aad301eb 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -16,6 +16,7 @@ - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.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\_install\_cmake](vcpkg_install_cmake.md) diff --git a/docs/maintainers/vcpkg_from_git.md b/docs/maintainers/vcpkg_from_git.md new file mode 100644 index 000000000..6b24a558d --- /dev/null +++ b/docs/maintainers/vcpkg_from_git.md @@ -0,0 +1,48 @@ +# vcpkg_from_git + +Download and extract a project from git + +## Usage: +```cmake +vcpkg_from_git( + OUT_SOURCE_PATH + URL + REF <59f7335e4d...> + SHA512 + [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. + +### SHA512 +The SHA512 hash that should match the archive form of the commit. + +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### 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. + +### 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`, `SHA512`, and `URL` must be specified. + +## Examples: + +* [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) + +## Source +[scripts/cmake/vcpkg_from_git.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_git.cmake) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index c2965292d..5f6930412 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -7,7 +7,8 @@ ## vcpkg_from_git( ## OUT_SOURCE_PATH ## URL -## [REF <59f7335e4d...>] +## REF <59f7335e4d...> +## SHA512 ## [PATCHES ...] ## ) ## ``` @@ -21,8 +22,15 @@ ## ### URL ## The url of the git repository. ## +## ### SHA512 +## The SHA512 hash that should match the archive form of the commit. +## +## This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +## ## ### REF -## The full commit id of the current latest master. +## 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. ## ## ### PATCHES ## A list of patches to be applied to the extracted sources. @@ -30,7 +38,7 @@ ## Relative paths are based on the port directory. ## ## ## Notes: -## `REF` and `URL` must be specified. +## `OUT_SOURCE_PATH`, `REF`, `SHA512`, and `URL` must be specified. ## ## ## Examples: ## -- cgit v1.2.3 From 4ed42720318b1b2bb82a4bb604876c55e8de31f5 Mon Sep 17 00:00:00 2001 From: Christian Meurin <32344571+NebuHiiEjamu@users.noreply.github.com> Date: Tue, 6 Nov 2018 17:03:59 -0800 Subject: win_flex 2.5.9 is no longer downloadable, use 2.5.16 (#4658) * win_flex 2.5.9 is no longer downloadable, use 2.5.16 * [vcpkg_find_acquire_program] Fix links to flex and bison. Use subdir to avoid conflict with previous version. --- scripts/cmake/vcpkg_find_acquire_program.cmake | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 4cb123fd6..1ff2ab071 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -140,12 +140,13 @@ function(vcpkg_find_acquire_program VAR) set(ARCHIVE "meson-0.47.1.zip") set(HASH 0f6462835583a51707bee82d852018cfcb7444c0dad95b2ba08814e500a5cfe3f731dc6c1fb73c765d1120ee2a2d6600e15d8d393bab1993e84bd4354b2e6855) elseif(VAR MATCHES "FLEX") - if(CMAKE_HOST_WIN32) - set(PROGNAME win_flex) - set(PATHS ${DOWNLOADS}/tools/win_flex) - set(URL "https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip/download") - set(ARCHIVE "win_flex_bison-2.5.9.zip") - set(HASH 9580f0e46893670a011645947c1becda69909a41a38bb4197fe33bd1ab7719da6b80e1be316f269e1a4759286870d49a9b07ef83afc4bac33232bd348e0bc814) + if(CMAKE_HOST_WIN32) + set(PROGNAME win_flex) + set(SUBDIR win_flex-2.5.16) + set(PATHS ${DOWNLOADS}/tools/win_flex/${SUBDIR}) + set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") + set(ARCHIVE "win_flex_bison-2.5.16.zip") + set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) else() set(PROGNAME flex) set(APT_PACKAGE_NAME flex) @@ -154,10 +155,11 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "BISON") if(CMAKE_HOST_WIN32) set(PROGNAME win_bison) - set(PATHS ${DOWNLOADS}/tools/win_bison) - set(URL "https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip/download") - set(ARCHIVE "win_flex_bison-2.5.9.zip") - set(HASH 9580f0e46893670a011645947c1becda69909a41a38bb4197fe33bd1ab7719da6b80e1be316f269e1a4759286870d49a9b07ef83afc4bac33232bd348e0bc814) + set(SUBDIR win_bison-2.5.16) + set(PATHS ${DOWNLOADS}/tools/win_bison/${SUBDIR}) + set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") + set(ARCHIVE "win_flex_bison-2.5.16.zip") + set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) else() set(PROGNAME bison) set(APT_PACKAGE_NAME bison) -- cgit v1.2.3 From bed365bfae208241f2a69f6fba89145ab710051a Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Wed, 7 Nov 2018 02:07:46 +0100 Subject: add fmi4cpp port (#4650) --- ports/fmi4cpp/CONTROL | 4 ++++ ports/fmi4cpp/portfile.cmake | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/fmi4cpp/CONTROL create mode 100644 ports/fmi4cpp/portfile.cmake diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL new file mode 100644 index 000000000..35090616d --- /dev/null +++ b/ports/fmi4cpp/CONTROL @@ -0,0 +1,4 @@ +Source: fmi4cpp +Version: 0.4.0 +Description: FMI 2.0 implementation written in modern C++ +Build-Depends: boost-property-tree, boost-ublas, boost-odeint, bzip2 (linux), openssl (linux), libzip diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake new file mode 100644 index 000000000..435ab2c51 --- /dev/null +++ b/ports/fmi4cpp/portfile.cmake @@ -0,0 +1,40 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SFI-Mechatronics/FMI4cpp + REF v0.4.0 + SHA512 356485da5799a5720b3bea9bd935a76c36eb5c242cecfd2325f47175bad0eafa1e088fb1b96b639b8419e2a5a39f7b07fbe9d89d3f8e568e00b8910b7e991111 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DFMI4CPP_BUILD_TESTS=OFF + -DFMI4CPP_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/FMI4cpp") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmi4cpp RENAME copyright) + +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3 From a0d6a2925c5eb2cb7b3c793f74eff3220f893007 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Wed, 7 Nov 2018 09:29:12 +0800 Subject: [Sqlite3] update to 3.25.2 (#4600) * [Sqlite3] update to 3.25.2 * [sqlite3] Use vcpkg_extract_source_archive_ex --- ports/sqlite3/CONTROL | 2 +- ports/sqlite3/portfile.cmake | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index 1b8de9b7c..91ea02a14 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,5 +1,5 @@ Source: sqlite3 -Version: 3.24.0-2 +Version: 3.25.2 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. Feature: tool diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 423dda8c5..b2422aecc 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,14 +1,19 @@ include(vcpkg_common_functions) -set(SQLITE_VERSION 3240000) -set(SQLITE_HASH c7050bdd33c50b24e8c9fd2409b7bccbdcd8d6f064b435ee34b6c4a4de6283bce2500d4a3aa3821be2069804dff45a575ff331c97b39e02b227ef32e542ed6cb) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-${SQLITE_VERSION}) +set(SQLITE_VERSION 3250200) +set(SQLITE_HASH f87b4ab405f85df85b5d63e9e28c4db76202dc2d5461e0d0c626fa7521570d89a1122403c037704859ecb58ac1747ebf4b3c8a2f3a3c3d8492e8060df92e379f) vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2018/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 ${SQLITE_HASH}) -vcpkg_extract_source_archive(${ARCHIVE}) + SHA512 ${SQLITE_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SQLITE_VERSION} +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -- cgit v1.2.3 From eaf30a4221de8fe49bb12199cd8c1c9fe4864add Mon Sep 17 00:00:00 2001 From: Sergey Sychugin <40148988+sychugin@users.noreply.github.com> Date: Wed, 7 Nov 2018 04:43:59 +0300 Subject: [fftw] Update to 3.3.8 (#4269) --- ports/fftw3/CONTROL | 2 +- ports/fftw3/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL index fd9e59766..a0ed88124 100644 --- a/ports/fftw3/CONTROL +++ b/ports/fftw3/CONTROL @@ -1,3 +1,3 @@ Source: fftw3 -Version: 3.3.7-2 +Version: 3.3.8 Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST). diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 2cf78f44c..ca3201ec3 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,5 +1,5 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.7) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.8) # This can be removed in the next source code update if(EXISTS "${SOURCE_PATH}/CMakeLists.txt") @@ -10,9 +10,9 @@ if(EXISTS "${SOURCE_PATH}/CMakeLists.txt") endif() vcpkg_download_distfile(ARCHIVE - URLS "http://www.fftw.org/fftw-3.3.7.tar.gz" - FILENAME "fftw-3.3.7.tar.gz" - SHA512 a5db54293a6d711408bed5894766437eee920be015ad27023c7a91d4581e2ff5b96e3db0201e6eaccf7b064c4d32db1a2a8fab3e6813e524b4743ddd6216ba77 + URLS "http://www.fftw.org/fftw-3.3.8.tar.gz" + FILENAME "fftw-3.3.8.tar.gz" + SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From f194e98593ac5638a15cb4b9675f52e63d2ffaf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Rodr=C3=ADguez?= Date: Tue, 6 Nov 2018 22:48:34 -0300 Subject: added vscode autodetection in macOS (#4589) --- toolsrc/src/vcpkg/commands.edit.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index b9d9d8c1a..044ae1c47 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -107,9 +107,6 @@ namespace vcpkg::Commands::Edit void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - static const fs::path VS_CODE_INSIDERS = fs::path{"Microsoft VS Code Insiders"} / "Code - Insiders.exe"; - static const fs::path VS_CODE = fs::path{"Microsoft VS Code"} / "Code.exe"; - auto& fs = paths.get_filesystem(); const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); @@ -129,6 +126,10 @@ namespace vcpkg::Commands::Edit candidate_paths.emplace_back(*editor_path); } +#ifdef _WIN32 + static const fs::path VS_CODE_INSIDERS = fs::path{"Microsoft VS Code Insiders"} / "Code - Insiders.exe"; + static const fs::path VS_CODE = fs::path{"Microsoft VS Code"} / "Code.exe"; + const auto& program_files = System::get_program_files_platform_bitness(); if (const fs::path* pf = program_files.get()) { @@ -153,6 +154,10 @@ namespace vcpkg::Commands::Edit const std::vector from_registry = find_from_registry(); candidate_paths.insert(candidate_paths.end(), from_registry.cbegin(), from_registry.cend()); +#elif defined(__APPLE__) + candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"}); + candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"}); +#endif const auto it = Util::find_if(candidate_paths, [&](const fs::path& p) { return fs.exists(p); }); if (it == candidate_paths.cend()) -- cgit v1.2.3 From ab0212d6930011041683f7acc016323bd4ecf4fe Mon Sep 17 00:00:00 2001 From: Lyle Tafoya Date: Wed, 7 Nov 2018 01:50:54 +0000 Subject: Fixes #4464 GLFW3 dynamic build failure on Linux (#4467) * Fixes #4464 GLFW3 dynamic build failure on Linux * [glfw3] Use vcpkg_from_github and remove outdated patch * [glfw3] Note dependency on xcursor --- ports/glfw3/portfile.cmake | 74 +++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 0df468bc3..dcc7da89d 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,30 +1,22 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glfw-3.2.1) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.zip" - FILENAME "glfw-3.2.1.zip" - SHA512 73dd6d4a8d28a2b423f0fb25489659c1a845182b7ef09848d4f442cdc489528aea90f43ac84aeedb9d2301c4487f39782b647ee4959e67e83babb838372b980c + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO glfw/glfw + REF 3.2.1 + SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc + HEAD_REF master + PATCHES move-cmake-min-req.patch ) -vcpkg_extract_source_archive(${ARCHIVE}) -if(NOT EXISTS ${SOURCE_PATH}/patch-config.stamp) - message(STATUS "Patching src/glfw3Config.cmake.in") - file(READ ${SOURCE_PATH}/src/glfw3Config.cmake.in CONFIG) - string(REPLACE "\"@GLFW_LIB_NAME@\"" "NAMES @GLFW_LIB_NAME@ @GLFW_LIB_NAME@dll" - CONFIG ${CONFIG} - ) - #string(REPLACE "@PACKAGE_CMAKE_INSTALL_PREFIX@" "@PACKAGE_CMAKE_INSTALL_PREFIX@/../.." - # CONFIG ${CONFIG} - #) - file(WRITE ${SOURCE_PATH}/src/glfw3Config.cmake.in "${CONFIG}") - file(APPEND ${SOURCE_PATH}/src/glfw3Config.cmake.in "set(GLFW3_LIBRARIES \${GLFW3_LIBRARY})\n") - file(WRITE ${SOURCE_PATH}/patch-config.stamp) -endif() +if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message( +"GLFW3 currently requires the following libraries from the system package manager: + xinerama + xcursor -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/move-cmake-min-req.patch -) +These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxcursor-dev") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -32,40 +24,28 @@ vcpkg_configure_cmake( -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF - -DPACKAGE_CMAKE_INSTALL_PREFIX=\${CMAKE_CURRENT_LIST_DIR}/../.. ) vcpkg_install_cmake() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/glfw3 ${CURRENT_PACKAGES_DIR}/share/glfw3) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) -file(READ ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets.cmake _contents) -set(pattern "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\n") -string(REPLACE "${pattern}${pattern}${pattern}" "${pattern}${pattern}" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets.cmake "${_contents}") - -file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/glfw3/glfw3Targets-debug.cmake _contents) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-debug.cmake "${_contents}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glfw3) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/bin/glfw3.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glfw3.dll) - foreach(_conf release - debug) - file(READ ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake _contents) - string(REPLACE "lib/glfw3.dll" "bin/glfw3.dll" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake "${_contents}") - endforeach() - + if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll OR EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/bin/glfw3.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glfw3.dll) + foreach(_conf release debug) + file(READ ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake _contents) + string(REPLACE "lib/glfw3.dll" "bin/glfw3.dll" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake "${_contents}") + endforeach() + endif() endif() file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glfw3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/glfw3/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/glfw3/copyright) -vcpkg_copy_pdbs() +vcpkg_copy_pdbs() -- cgit v1.2.3 From 2253ec837ad0af4cc70fcaf2d3aaa522176bd935 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Wed, 7 Nov 2018 03:04:07 +0100 Subject: [SDL2 TTF] Fix package name in find_package (#4596) --- ports/sdl2-ttf/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sdl2-ttf/CMakeLists.txt b/ports/sdl2-ttf/CMakeLists.txt index 7c3e8fc77..2954a1e20 100644 --- a/ports/sdl2-ttf/CMakeLists.txt +++ b/ports/sdl2-ttf/CMakeLists.txt @@ -3,7 +3,7 @@ project(SDL2_TTF C) find_path(SDL_INCLUDE_DIR SDL2/SDL.h) find_library(SDL_LIBRARY NAMES SDL2d SDL2) -find_package(FreeType REQUIRED) +find_package(Freetype REQUIRED) add_library(SDL2_ttf SDL_ttf.c version.rc) -- cgit v1.2.3 From 9ad166279c913cf0becc56865d05ed5806fad8aa Mon Sep 17 00:00:00 2001 From: Etienne Dechamps Date: Wed, 7 Nov 2018 02:26:01 +0000 Subject: [portaudio] Copy PDB files. (#4583) This helps with debugging. According to docs/maintainers/vcpkg_copy_pdbs.md this should always be done. --- ports/portaudio/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index da9b4bb32..236cb2cea 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -47,6 +47,8 @@ else () file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) endif () +vcpkg_copy_pdbs() + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/portaudio) file(RENAME ${CURRENT_PACKAGES_DIR}/share/portaudio/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/portaudio/copyright) -- cgit v1.2.3 From 8c13a782a044edc67f655b5dcb0227e737136e74 Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 7 Nov 2018 13:48:16 +0300 Subject: sobjectizer updated to v.5.5.23 --- ports/sobjectizer/CONTROL | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index 094c14a29..ca08ad3a4 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.22.1 +Version: 5.5.23 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 3d6aa515c..5ca178ef5 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.22.1) +set(VERSION 5.5.23) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 400995d23fc7e53360e75ed6c001d678fabf7965bc90288679409068aeea026af99b194935d09dcd27410da8cb05ede08efd0b1fc5e3baa0402ea1d12ea331cd + SHA512 61c2b9e42d88eafef67b38a1b517af7cbda131835d8ae60c914bd89d21e84801278292064c7ad823c0b31a376b0db68f1ee4a7e87892c2f166c39e8068d86122 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 068032bc548817a04709970f76268a6d7b1767c7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 7 Nov 2018 13:27:27 -0800 Subject: [vcpkg-fetch] Downgrade version of 7zip to hotfix NuGet.org changing the file hashes. --- scripts/vcpkgTools.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index c2045433d..3f0f72c58 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -60,11 +60,11 @@ QtInstallerFramework-win-x86.zip - 18.01.0 - 7-Zip.CommandLine.18.1.0\tools\7za.exe - https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0 - 8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b2571305b3ae3f4e2b85fc4a290aeda63d1a13b8 - 7-zip.commandline.18.1.0.nupkg + 16.4.0 + 7-Zip.CommandLine.16.4.0\tools\7za.exe + https://www.nuget.org/api/v2/package/7-Zip.CommandLine/16.4.0 + 2142734a2ad8d8988b080a9f1814991ee7eeaf8e14b2473d2ad3a006ffe7b2a80e9b812b6695c095730090d4016ac2866be7599156669deaf13bea12d62bf068 + 7-zip.commandline.16.4.0.nupkg 18.01.0 -- cgit v1.2.3 From 799de417ea2f703151dc275527ff723ab8801a2b Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Wed, 7 Nov 2018 14:44:38 -0800 Subject: [opus] Update to 1.3. (#4580) --- ports/opus/CONTROL | 2 +- ports/opus/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL index e5c715bba..dd92faea5 100644 --- a/ports/opus/CONTROL +++ b/ports/opus/CONTROL @@ -1,3 +1,3 @@ Source: opus -Version: 1.2.1-1 +Version: 1.3 Description: Totally open, royalty-free, highly versatile audio codec diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index ed2ed092e..d15be61f1 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -6,8 +6,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opus - REF v1.2.1 - SHA512 fdc64b43875dd07dc9eb1c37e9a61d1c10e3095de62ed9597d51b93445136958c9f5fee78c33ae7f90c72a20200083cdc727d8e79f2f9e580ad4e2f8c50cccb4 + REF v1.3 + SHA512 5ac067514b6471432fcd027b912dcaa765e2bdc986ea289a2aeb57660d18fa1460a0a697b9736d8e2b65eb7b72ad4fa36b9b213389fe1e64335db8e9ad51b750 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-main.patch" ) -- cgit v1.2.3 From 4aba36cd381f42bead4b74bc49362359873f9760 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 7 Nov 2018 23:49:47 +0100 Subject: Qt version bump 5.11.2 (#4629) * Qt 5.11.2 version bump * removed unecessary qt patch * fix wrong hash for qt5-networkauth --- ports/qt5-3d/CONTROL | 2 +- ports/qt5-3d/portfile.cmake | 2 +- ports/qt5-activeqt/CONTROL | 2 +- ports/qt5-activeqt/portfile.cmake | 4 ++-- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/fix-msvc2017.patch | 27 ----------------------- ports/qt5-base/portfile.cmake | 5 ++--- ports/qt5-charts/CONTROL | 2 +- ports/qt5-charts/portfile.cmake | 2 +- ports/qt5-datavis3d/CONTROL | 2 +- ports/qt5-datavis3d/portfile.cmake | 2 +- ports/qt5-declarative/CONTROL | 2 +- ports/qt5-declarative/portfile.cmake | 2 +- ports/qt5-gamepad/CONTROL | 2 +- ports/qt5-gamepad/portfile.cmake | 2 +- ports/qt5-graphicaleffects/CONTROL | 2 +- ports/qt5-graphicaleffects/portfile.cmake | 2 +- ports/qt5-imageformats/CONTROL | 2 +- ports/qt5-imageformats/portfile.cmake | 2 +- ports/qt5-modularscripts/CONTROL | 2 +- ports/qt5-modularscripts/qt_modular_library.cmake | 2 +- ports/qt5-multimedia/CONTROL | 2 +- ports/qt5-multimedia/portfile.cmake | 2 +- ports/qt5-networkauth/CONTROL | 2 +- ports/qt5-networkauth/portfile.cmake | 2 +- ports/qt5-quickcontrols/CONTROL | 2 +- ports/qt5-quickcontrols/portfile.cmake | 2 +- ports/qt5-quickcontrols2/CONTROL | 2 +- ports/qt5-quickcontrols2/portfile.cmake | 2 +- ports/qt5-script/CONTROL | 2 +- ports/qt5-script/portfile.cmake | 2 +- ports/qt5-scxml/CONTROL | 2 +- ports/qt5-scxml/portfile.cmake | 2 +- ports/qt5-serialport/CONTROL | 2 +- ports/qt5-serialport/portfile.cmake | 2 +- ports/qt5-speech/CONTROL | 2 +- ports/qt5-speech/portfile.cmake | 2 +- ports/qt5-svg/CONTROL | 2 +- ports/qt5-svg/portfile.cmake | 2 +- ports/qt5-tools/CONTROL | 2 +- ports/qt5-tools/portfile.cmake | 2 +- ports/qt5-virtualkeyboard/CONTROL | 2 +- ports/qt5-virtualkeyboard/portfile.cmake | 2 +- ports/qt5-websockets/CONTROL | 2 +- ports/qt5-websockets/portfile.cmake | 2 +- ports/qt5-winextras/CONTROL | 2 +- ports/qt5-winextras/portfile.cmake | 2 +- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5-xmlpatterns/portfile.cmake | 2 +- ports/qt5/CONTROL | 2 +- 50 files changed, 51 insertions(+), 79 deletions(-) delete mode 100644 ports/qt5-base/fix-msvc2017.patch diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 37041854f..bcf523665 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index fde84f741..e98d4da83 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qt3d d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a) +qt_modular_library(qt3d 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe) diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index a84f32cf4..2df390330 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-activeqt -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake index 25f7df0a3..6f2e479a9 100644 --- a/ports/qt5-activeqt/portfile.cmake +++ b/ports/qt5-activeqt/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtactiveqt a6fb4a3a53f5965e0913276a784f2fce81351a9c54cc190f15b431a497e04a4b823a8cec132713e382dc4e3ab2edef967e920c7aaa7392a72d7b12263c9f4876) +qt_modular_library(qtactiveqt 50027f3429a4e9f140e259f228ea46420284a9632bba3ed92b9b44fbc1c168b6b2d039986d6a07e17ae1afff4f0aec3ccfe8a660322449a3258ab251c1910135) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts) +#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 4eb7e3842..820137710 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.11.1-5 +Version: 5.11.2-1 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/fix-msvc2017.patch b/ports/qt5-base/fix-msvc2017.patch deleted file mode 100644 index c1f9254ff..000000000 --- a/ports/qt5-base/fix-msvc2017.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf ---- a/mkspecs/common/msvc-version.conf 2018-06-15 03:29:31.000000000 -0400 -+++ b/mkspecs/common/msvc-version.conf 2018-08-23 00:26:46.436806400 -0400 -@@ -112,4 +112,11 @@ - COMPAT_MKSPEC = - } - -+ -+# MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without -+# this flag since the fix breaks binary compatibility. -+greaterThan(QMAKE_MSC_VER, 1914) { -+ DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE -+} -+ - !isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC -diff -Naur a/qmake/Makefile.win32 b/qmake/Makefile.win32 ---- a/qmake/Makefile.win32 2018-06-15 03:29:31.000000000 -0400 -+++ b/qmake/Makefile.win32 2018-08-23 00:27:45.764849600 -0400 -@@ -39,7 +39,7 @@ - -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS \ - -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ - -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ -- -DQT_NO_FOREACH -DUNICODE -+ -DQT_NO_FOREACH -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE - CFLAGS = $(CFLAGS_PCH) $(CFLAGS_BARE) $(CFLAGS) - - CXXFLAGS_BARE = $(CFLAGS_BARE) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b58fe326e..b6d140f88 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -12,13 +12,13 @@ include(configure_qt) include(install_qt) set(MAJOR_MINOR 5.11) -set(FULL_VERSION ${MAJOR_MINOR}.1) +set(FULL_VERSION ${MAJOR_MINOR}.2) set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" FILENAME ${ARCHIVE_NAME} - SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 + SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -28,7 +28,6 @@ vcpkg_extract_source_archive_ex( fix-system-freetype.patch fix-system-pcre2.patch fix-system-pcre2-linux.patch - fix-msvc2017.patch ) # Remove vendored dependencies to ensure they are not picked up by the build diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index a5bc1b33e..4a73bcdc4 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake index 85f923df5..fdf59fe17 100644 --- a/ports/qt5-charts/portfile.cmake +++ b/ports/qt5-charts/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtcharts e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b) +qt_modular_library(qtcharts 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d) diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index ccffcfb13..34842f14d 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake index 73986d089..a74f82cd7 100644 --- a/ports/qt5-datavis3d/portfile.cmake +++ b/ports/qt5-datavis3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdatavis3d e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd) +qt_modular_library(qtdatavis3d ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8) diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index e2d9e280c..9de065478 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 1bb2b866c..7949ba8f8 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdeclarative d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053) +qt_modular_library(qtdeclarative 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts) \ No newline at end of file diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index 3123faa51..68927e58c 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake index 6c101a040..9e97d17ea 100644 --- a/ports/qt5-gamepad/portfile.cmake +++ b/ports/qt5-gamepad/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgamepad 47dfe1fdd693300520f9710d0a161936d8f1805b4558d6f692ed204f8d6784d45adb73bd472fb255deed792a610c94b35a72143deb0d8f227b8a9996dd1703cc) +qt_modular_library(qtgamepad 65200780a7a27ca6fd6bd624b38c6568eacc2209816b3214ac2b63b5e510613cd492f846b5f67922aa5605eab1064e3e6ff060b610519e0546a0005736f55274) diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index 25af45fd7..f8c7d27cd 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 GraphicalEffects Module. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake index f92175512..3b765d796 100644 --- a/ports/qt5-graphicaleffects/portfile.cmake +++ b/ports/qt5-graphicaleffects/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgraphicaleffects 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297) +qt_modular_library(qtgraphicaleffects a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 1a5a5d1db..f8cb675b9 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index 37eae1e2e..b87bebaee 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtimageformats 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d) +qt_modular_library(qtimageformats 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index 2186d94e0..09e07dd08 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 2018-09-10-2 +Version: 2018-11-01-1 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 22859c8e1..4066a6b51 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -9,7 +9,7 @@ function(qt_modular_library NAME HASH) endif() set(MAJOR_MINOR 5.11) - set(FULL_VERSION ${MAJOR_MINOR}.1) + set(FULL_VERSION ${MAJOR_MINOR}.2) set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index 04fc5a057..7c910ee27 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index b5b31cd8d..f03f71183 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtmultimedia cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c) +qt_modular_library(qtmultimedia f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f) diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index 803649af6..bf8b15e0c 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Network Authorization Module Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake index 13e2c289e..2a27d21e9 100644 --- a/ports/qt5-networkauth/portfile.cmake +++ b/ports/qt5-networkauth/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtnetworkauth 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d) \ No newline at end of file +qt_modular_library(qtnetworkauth f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d) diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index 513a36083..fc4fb902b 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 QuickControls Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake index 3a9251a81..6b8983cf7 100644 --- a/ports/qt5-quickcontrols/portfile.cmake +++ b/ports/qt5-quickcontrols/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c) +qt_modular_library(qtquickcontrols 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25) diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index 79483beed..f13d9df72 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake index db6fbd957..7f96cf5a3 100644 --- a/ports/qt5-quickcontrols2/portfile.cmake +++ b/ports/qt5-quickcontrols2/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols2 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68) +qt_modular_library(qtquickcontrols2 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6) diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index adcc055c8..2b49490c9 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,3 +1,3 @@ Source: qt5-script -Version: 5.9.2 +Version: 5.11.2 Description:Qt5 Script Module. diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake index 9e6f5f338..9999ad6cf 100755 --- a/ports/qt5-script/portfile.cmake +++ b/ports/qt5-script/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscript 3ce2e57a0a6b2382614f689edca0deed87afe944c1c41decb3b9f420449fa59f2b79e6330e78e01a950761a95903113eaa7fbf261886361114acf5015d93254c) +qt_modular_library(qtscript b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00) diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index 202592db6..a00542c74 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake index e89fe3213..7680b6eb0 100644 --- a/ports/qt5-scxml/portfile.cmake +++ b/ports/qt5-scxml/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscxml d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689) +qt_modular_library(qtscxml 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab) diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index 8d0fd79dd..af03e1254 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake index 31efd0155..daf037cdb 100644 --- a/ports/qt5-serialport/portfile.cmake +++ b/ports/qt5-serialport/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtserialport 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404) +qt_modular_library(qtserialport babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d) diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index bd87a987b..1f4c2420c 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Speech Module Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows) diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake index 7700ee57c..b1d36265b 100644 --- a/ports/qt5-speech/portfile.cmake +++ b/ports/qt5-speech/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtspeech d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51) +qt_modular_library(qtspeech b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02) diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index a95e3aa73..d88bb1742 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index 02b081c30..0de3de3fd 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtsvg 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39) +qt_modular_library(qtsvg d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57) diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 6a512e1b7..81df69267 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index d4eaab82b..8c7d0c047 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qttools cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482) +qt_modular_library(qttools a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts) \ No newline at end of file diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index e21b0e2e2..ebdb27623 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake index ad969ae2e..210997bfc 100644 --- a/ports/qt5-virtualkeyboard/portfile.cmake +++ b/ports/qt5-virtualkeyboard/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtvirtualkeyboard e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0) +qt_modular_library(qtvirtualkeyboard 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index b2af643ab..e10c241d0 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake index b117e619c..67ea215f3 100644 --- a/ports/qt5-websockets/portfile.cmake +++ b/ports/qt5-websockets/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwebsockets 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc) +qt_modular_library(qtwebsockets 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3) diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index 12dcadb9b..5b9377077 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-winextras -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-modularscripts, qt5-base, atlmfc diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake index 1ec503a0b..adc3bdbe1 100644 --- a/ports/qt5-winextras/portfile.cmake +++ b/ports/qt5-winextras/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwinextras 6ba1ddb6ff467fc413bf6a3d111e449215b696949dcfb399c17de9eb6d2ca20f867dd0c57d467e2924452e1d3d429fcc3dd119cc7d8bbfbcf0feeb9f6ca92918) +qt_modular_library(qtwinextras ac9ca4d188f7dadbdd124321cba39fb159f9225c23ab955c06ff3939080065a5e8f176f34504c59ae5fee602328550487187ed0648e7896dcd6bed698a6b45d8) diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 874644acd..21e0069ab 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.11.1 +Version: 5.11.2 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index ca064eec0..6484f4610 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtxmlpatterns 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066) +qt_modular_library(qtxmlpatterns f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f) diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index dc34eee95..9f3ea3778 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.9.2-1 +Version: 5.11.2 Description: Qt5 Application Framework Build-Depends: qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-3d, qt5-winextras, qt5-xmlpatterns \ No newline at end of file -- cgit v1.2.3 From 273b8ce3d0d3533f3b959a7ecf4b0aa1eef22cab Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 7 Nov 2018 17:10:51 -0800 Subject: [vcpkg-fetch] Switch back to 18.1.0; add hack in vcpkg.exe to map the hashes together. --- scripts/vcpkgTools.xml | 16 ++++++++-------- toolsrc/src/vcpkg/base/downloads.cpp | 12 +++++++++++- toolsrc/vcpkg.sln | 1 + 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 3f0f72c58..747963c07 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -60,11 +60,11 @@ QtInstallerFramework-win-x86.zip - 16.4.0 - 7-Zip.CommandLine.16.4.0\tools\7za.exe - https://www.nuget.org/api/v2/package/7-Zip.CommandLine/16.4.0 - 2142734a2ad8d8988b080a9f1814991ee7eeaf8e14b2473d2ad3a006ffe7b2a80e9b812b6695c095730090d4016ac2866be7599156669deaf13bea12d62bf068 - 7-zip.commandline.16.4.0.nupkg + 18.1.0 + 7-Zip.CommandLine.18.1.0\tools\7za.exe + https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0 + 8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b2571305b3ae3f4e2b85fc4a290aeda63d1a13b8 + 7-zip.commandline.18.1.0.nupkg 18.01.0 @@ -78,20 +78,20 @@ ninja.exe https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip 9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5 - ninja-win.zip + ninja-win-1.8.2.zip 1.8.2 ninja https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip 38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5 - ninja-linux.zip + ninja-linux-1.8.2.zip 1.8.2 ninja https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3 - ninja-mac.zip + ninja-mac-1.8.2.zip diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index 1d7b3527d..fad3ff119 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -102,7 +102,17 @@ namespace vcpkg::Downloads const fs::path& path, const std::string& sha512) { - const std::string actual_hash = vcpkg::Hash::get_file_hash(fs, path, "SHA512"); + std::string actual_hash = vcpkg::Hash::get_file_hash(fs, path, "SHA512"); + + // + // This is the NEW hash for 7zip + if (actual_hash == "a9dfaaafd15d98a2ac83682867ec5766720acf6e99d40d1a00d480692752603bf3f3742623f0ea85647a92374df" + "405f331afd6021c5cf36af43ee8db198129c0") + // This is the OLD hash for 7zip + actual_hash = "8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b257" + "1305b3ae3f4e2b85fc4a290aeda63d1a13b8"; + // + Checks::check_exit(VCPKG_LINE_INFO, sha512 == actual_hash, "File does not have the expected hash:\n" diff --git a/toolsrc/vcpkg.sln b/toolsrc/vcpkg.sln index 6b92c973b..8d0c849c6 100644 --- a/toolsrc/vcpkg.sln +++ b/toolsrc/vcpkg.sln @@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{F589 ..\scripts\get_triplet_environment.cmake = ..\scripts\get_triplet_environment.cmake ..\scripts\internalCI.ps1 = ..\scripts\internalCI.ps1 ..\scripts\ports.cmake = ..\scripts\ports.cmake + ..\scripts\vcpkgTools.xml = ..\scripts\vcpkgTools.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmake", "cmake", "{A0122231-04D5-420B-81CA-7960946E5E65}" -- cgit v1.2.3 From c6f4bb5acaf25d50ee1fbd8b1f112469756e81a2 Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 8 Nov 2018 10:42:01 +0300 Subject: sobjectizer updated to v.5.5.23 (#4668) --- ports/sobjectizer/CONTROL | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index 094c14a29..ca08ad3a4 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.22.1 +Version: 5.5.23 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 3d6aa515c..5ca178ef5 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.22.1) +set(VERSION 5.5.23) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 400995d23fc7e53360e75ed6c001d678fabf7965bc90288679409068aeea026af99b194935d09dcd27410da8cb05ede08efd0b1fc5e3baa0402ea1d12ea331cd + SHA512 61c2b9e42d88eafef67b38a1b517af7cbda131835d8ae60c914bd89d21e84801278292064c7ad823c0b31a376b0db68f1ee4a7e87892c2f166c39e8068d86122 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 17870d0fddde801632b717471ae8c39d9ed59cc6 Mon Sep 17 00:00:00 2001 From: MilesYang Date: Thu, 8 Nov 2018 15:43:13 +0800 Subject: add igloo port (#4657) * add igloo port * [igloo] Use vcpkg_from_github * add snowhouse --- ports/igloo/CONTROL | 3 +++ ports/igloo/portfile.cmake | 16 ++++++++++++++++ ports/snowhouse/CONTROL | 3 +++ ports/snowhouse/portfile.cmake | 14 ++++++++++++++ 4 files changed, 36 insertions(+) create mode 100644 ports/igloo/CONTROL create mode 100644 ports/igloo/portfile.cmake create mode 100644 ports/snowhouse/CONTROL create mode 100644 ports/snowhouse/portfile.cmake diff --git a/ports/igloo/CONTROL b/ports/igloo/CONTROL new file mode 100644 index 000000000..ffa162695 --- /dev/null +++ b/ports/igloo/CONTROL @@ -0,0 +1,3 @@ +Source: igloo +Version: 1.1.1 +Description: A framework for unit testing in C++ diff --git a/ports/igloo/portfile.cmake b/ports/igloo/portfile.cmake new file mode 100644 index 000000000..a1ab17576 --- /dev/null +++ b/ports/igloo/portfile.cmake @@ -0,0 +1,16 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO joakimkarlsson/igloo + REF igloo.1.1.1 + SHA512 69d8edb840aa1e2c1df4529a39b94e2d33dbc9fb5869ae91a0f062d29b7fbb73d4e2180080e7696cb69fbf5126c7c53c98dddb003e0e5e796812330e1a4ba32e + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/igloo DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igloo/external/snowhouse) +file(WRITE "${CURRENT_PACKAGES_DIR}/include/igloo/external/snowhouse/snowhouse/snowhouse.h" "#include ") + +file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/igloo) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/igloo/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/igloo/copyright) \ No newline at end of file diff --git a/ports/snowhouse/CONTROL b/ports/snowhouse/CONTROL new file mode 100644 index 000000000..b376f4639 --- /dev/null +++ b/ports/snowhouse/CONTROL @@ -0,0 +1,3 @@ +Source: snowhouse +Version: 3.0.1 +Description: An assertion library for C++ diff --git a/ports/snowhouse/portfile.cmake b/ports/snowhouse/portfile.cmake new file mode 100644 index 000000000..229a6e5d5 --- /dev/null +++ b/ports/snowhouse/portfile.cmake @@ -0,0 +1,14 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO banditcpp/snowhouse + REF v3.0.1 + SHA512 b20a703e79a2821bdc43b2a235ed7634499f877f9e96bd0d39eb563ce5c94d4577449cc15dc850176a1b44eb55cf3425885cb4d46a92444a7aa3001ce5d0a3eb + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h) + +file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/snowhouse) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/snowhouse/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/snowhouse/copyright) \ No newline at end of file -- cgit v1.2.3 From 40af541c5053e618741ad6aadcfdbbe520129c94 Mon Sep 17 00:00:00 2001 From: Stefan Ivanov Date: Thu, 8 Nov 2018 09:44:36 +0200 Subject: [rapidcheck] Add initial support for RapidCheck (#4605) * Add initial support for RapidCheck Create a portfile for the C++ property-based testing library RapidCheck. This port is relatively straight forward but there are a couple of caveats: * The current port uses a branch from a fork that I modified as the CMake installation logic had some problems. The library was almost exclusively used by being added as a subfolder so the CMake export machinery was probably not well tested. * The changes are going to get merged into the main repository eventually and then it would be possible to change where the source code is downloaded. I am unaware when the main RapidCheck library maintainer will accept my pull request, so it is better to have this library in VCPKG sooner, rather than later. * Update the RapidCheck portfile to download the library sources for the main repository * Since the maintainer of RapidCheck very quickly merged the required CMake modifications to enable the proper installation of the library, it is better to now use the official repository's master branch. * Change the versioning of the library to be based on the date of the git reference chosen since rapid check does not have an explicit versioning scheme. * Update rapidcheck and modify configuration step * [rapidcheck] Tidy --- ports/rapidcheck/CONTROL | 3 +++ ports/rapidcheck/portfile.cmake | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 ports/rapidcheck/CONTROL create mode 100644 ports/rapidcheck/portfile.cmake diff --git a/ports/rapidcheck/CONTROL b/ports/rapidcheck/CONTROL new file mode 100644 index 000000000..67c82313c --- /dev/null +++ b/ports/rapidcheck/CONTROL @@ -0,0 +1,3 @@ +Source: rapidcheck +Version: 2018-11-05-1 +Description: A property-based testing library for C++ (a la QuickCheck) with the goal of being simple to use with as little boilerplate as possible. diff --git a/ports/rapidcheck/portfile.cmake b/ports/rapidcheck/portfile.cmake new file mode 100644 index 000000000..bdebdb656 --- /dev/null +++ b/ports/rapidcheck/portfile.cmake @@ -0,0 +1,30 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emil-e/rapidcheck + REF cf9e0d8bd8c94e9dc00dc0ab302352bfaf1a3ac5 + SHA512 6cef62edbda391c3527d63db350842f669841ad2c751a64773250cd40bb65f26c2c394b107ef5530c2d3bd15b7079148fa9778d68a7346225bbb15227b1553c5 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRC_INSTALL_ALL_EXTRAS=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/rapidcheck/cmake) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/rapidcheck/copyright COPYONLY) + +# Post-build test for cmake libraries +vcpkg_test_cmake(PACKAGE_NAME rapidcheck) -- cgit v1.2.3 From 52b2759a75ddff09c088ee6fc7d0eba81a132991 Mon Sep 17 00:00:00 2001 From: Etienne Dechamps Date: Thu, 8 Nov 2018 07:45:26 +0000 Subject: [portaudio] Add pa_win_waveformat.h to public includes (#4582) * [portaudio] Add pa_win_waveformat.h to public includes. pa_win_wasapi.h includes pa_win_waveformat.h, so it has to be distributed for pa_win_wasapi.h to be usable. * [portaudio] Bump control version --- ports/portaudio/CONTROL | 2 +- ports/portaudio/pa_win_waveformat.patch | 27 +++++++++++++++++++++++++++ ports/portaudio/portfile.cmake | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ports/portaudio/pa_win_waveformat.patch diff --git a/ports/portaudio/CONTROL b/ports/portaudio/CONTROL index 8b74bfd6f..ceeec644c 100644 --- a/ports/portaudio/CONTROL +++ b/ports/portaudio/CONTROL @@ -1,3 +1,3 @@ Source: portaudio -Version: 19.0.6.00-3 +Version: 19.0.6.00-4 Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O. diff --git a/ports/portaudio/pa_win_waveformat.patch b/ports/portaudio/pa_win_waveformat.patch new file mode 100644 index 000000000..cba073947 --- /dev/null +++ b/ports/portaudio/pa_win_waveformat.patch @@ -0,0 +1,27 @@ +From fa727918e9e56c2a18dbdcfd276c60ac616c56ba Mon Sep 17 00:00:00 2001 +From: Etienne Dechamps +Date: Sat, 27 Oct 2018 15:14:27 +0100 +Subject: [PATCH] Add pa_win_waveformat.h to public includes. + +pa_win_wasapi.h includes pa_win_waveformat.h, so it has to be +distributed for pa_win_wasapi.h to be usable. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 789671a..6a3ed8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -210,7 +210,7 @@ IF(WIN32) + IF(PA_USE_WASAPI) + SET(PA_WASAPI_SOURCES src/hostapi/wasapi/pa_win_wasapi.c) + SOURCE_GROUP("hostapi\\wasapi" FILES ${PA_WASAPI_SOURCES}) +- SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h) ++ SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h include/pa_win_waveformat.h) + SET(PA_SOURCES ${PA_SOURCES} ${PA_WASAPI_SOURCES}) + SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid) + IF(NOT MSVC) +-- +2.14.1.windows.1 + diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 236cb2cea..349828158 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex( find_dsound.patch wasapi_support.patch crt_linkage_build_config.patch + pa_win_waveformat.patch ) # NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided -- cgit v1.2.3 From 5459adf5decc9e64b7f0cf3b1ab57e2f2a636a87 Mon Sep 17 00:00:00 2001 From: Jayesh Badwaik Date: Thu, 8 Nov 2018 08:48:23 +0100 Subject: [pixel] added support for dascandy/pixel (#4637) * + added support for dascandy/pixel * [pixel] Cleanup comments * [SDL2] Add SDL2::SDL2{,-static} wrapper * [pixel] update to v0.2 - fixes linking problem against SDL2 * [pixel] Bump control version --- ports/pixel/CONTROL | 4 ++++ ports/pixel/portfile.cmake | 21 +++++++++++++++++++++ ports/sdl2/CONTROL | 2 +- ports/sdl2/portfile.cmake | 9 +++------ ports/sdl2/vcpkg-cmake-wrapper.cmake | 8 ++++++++ 5 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 ports/pixel/CONTROL create mode 100644 ports/pixel/portfile.cmake create mode 100644 ports/sdl2/vcpkg-cmake-wrapper.cmake diff --git a/ports/pixel/CONTROL b/ports/pixel/CONTROL new file mode 100644 index 000000000..a6445bea3 --- /dev/null +++ b/ports/pixel/CONTROL @@ -0,0 +1,4 @@ +Source: pixel +Version: 0.2 +Description: Simple 2D Graphics based on standard and portable OpenGL. +Build-Depends: glew, opengl, sdl2 diff --git a/ports/pixel/portfile.cmake b/ports/pixel/portfile.cmake new file mode 100644 index 000000000..a00dc88f6 --- /dev/null +++ b/ports/pixel/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dascandy/pixel + REF v0.2 + SHA512 53485d298e34f8fda6c14dc07687e21281e4ef9d0567a654e5ded0589e1ac8e6bd84adbef922f0a12806f508c887299a6fc99c2415313029b8f7a6efc1cc3f59 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL index 6f39484dd..397b81ed5 100644 --- a/ports/sdl2/CONTROL +++ b/ports/sdl2/CONTROL @@ -1,3 +1,3 @@ Source: sdl2 -Version: 2.0.8-1 +Version: 2.0.8-3 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 5d7ac5314..69d788fb0 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -6,13 +6,9 @@ vcpkg_from_github( REF release-2.0.8 SHA512 5922dbeb14bb22991160251664b417d3f846867c18b5ecc1bd19c328ffd69b16252b7d45b9a317bafd1207fdb66d93a022dfb239e02447db9babd941956b6b37 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/export-symbols-only-in-shared-build.patch - ${CMAKE_CURRENT_LIST_DIR}/enable-winrt-cmake.patch + export-symbols-only-in-shared-build.patch + enable-winrt-cmake.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -75,5 +71,6 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) endforeach() endif() +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2) file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2 RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/sdl2/vcpkg-cmake-wrapper.cmake b/ports/sdl2/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..c99178db1 --- /dev/null +++ b/ports/sdl2/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +_find_package(${ARGS}) +if(TARGET SDL2::SDL2 AND NOT TARGET SDL2::SDL2-static) + add_library( SDL2::SDL2-static INTERFACE IMPORTED) + set_target_properties(SDL2::SDL2-static PROPERTIES INTERFACE_LINK_LIBRARIES "SDL2::SDL2") +elseif(TARGET SDL2::SDL2-static AND NOT TARGET SDL2::SDL2) + add_library( SDL2::SDL2 INTERFACE IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES "SDL2::SDL2-static") +endif() -- cgit v1.2.3 From 8407472fb2540efac6818ac1cd0e3b1734ce36ce Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Thu, 8 Nov 2018 10:49:02 +0300 Subject: [entt] Update to version 2.7.3 (#4649) * [entt] Update to version 2.7.3 [entt] Support cmake targets * [entt] Fix non-windows cmake targets --- ports/entt/CONTROL | 2 +- ports/entt/portfile.cmake | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL index 1e0e1410f..3489f8e78 100644 --- a/ports/entt/CONTROL +++ b/ports/entt/CONTROL @@ -1,3 +1,3 @@ Source: entt -Version: cpp14 +Version: 2.7.3-1 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 05462c453..e69ed624f 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -4,15 +4,27 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF cpp14 - SHA512 aa3ced9084a0a973ed5c9384ab3950c8ed54239df7ae605600d8cd7c2774c4173d16ad5ea7442751dfbc675f881cab952844ba794fdf464710a85fc9d77a8a5d + REF v2.7.3 + SHA512 ffdb26f43ebf0090eed5de589df4194282e2ab89e5014bfe4acc2670729b86c93ea85e25b4b1e72de975287b8f0aa9e72d89e1cfb649e0a0f4f72838b00e5215 + HEAD_REF master ) -file(INSTALL - ${SOURCE_PATH}/src/entt - DESTINATION ${CURRENT_PACKAGES_DIR}/include +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF ) -# Handle copyright/readme/package files +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/entt) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/entt RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/entt) -- cgit v1.2.3 From 130bd6f868e1c06264161fb3f24ec28b1a1fb354 Mon Sep 17 00:00:00 2001 From: Maxime GIMENO Date: Thu, 8 Nov 2018 08:50:15 +0100 Subject: CGAL: Fix CMakeConfig.cmake (#4655) * Fix CMakeConfig * [cgal] Bump control version --- ports/cgal/CONTROL | 2 +- ports/cgal/portfile.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index ef39cf54e..a84c50ce1 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 4.13-1 +Version: 4.13-2 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic 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 bf261f66a..40475b7c2 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -45,7 +45,9 @@ endif() file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents) string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}") string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "${_contents}") + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)") file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright) -- cgit v1.2.3 From 75744206edd0304c5de3f6d857e412c1a2e48e9c Mon Sep 17 00:00:00 2001 From: Etienne Dechamps Date: Thu, 8 Nov 2018 07:50:51 +0000 Subject: [portaudio] Enable debug output (#4592) * [portaudio] Enable debug output. This is enabled by default in the original MSVC project in the PortAudio distribution, but not in their CMake build. This commit fixes the regression. I don't think there are any performance concerns with this, as PortAudio (AFAICT) does not log from performance-critical code. Note that this change might still be somewhat controversial, because PortAudio will by default dump its debug output directly to stderr, which is not particularly nice. However, the alternative is not having any way for end users to troubleshoot PortAudio issues at all, which IMHO is worse. Applications can always call `PaUtil_SetDebugPrintFunction()` to redirect the output away from stderr, and I encourage them to do so. * [portaudio] Bump control version --- ports/portaudio/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 349828158..503b08048 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( -DPA_USE_WASAPI=ON -DPA_USE_WDMKS=ON -DPA_USE_WMME=ON + -DPA_ENABLE_DEBUG_OUTPUT:BOOL=ON ) vcpkg_install_cmake() -- cgit v1.2.3 From 550c9422add13436f4ccf9c094d423874db69c21 Mon Sep 17 00:00:00 2001 From: Markus Leuthold Date: Thu, 8 Nov 2018 08:54:29 +0100 Subject: add missing dependency for openvdb[tools] (#4271) --- ports/openvdb/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index 7576ff790..22c216b5c 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -5,4 +5,4 @@ Description: Sparse volume data structure and tools Feature: tools Description: OpenVDB utilities: view, print and render -Build-Depends: glew, glfw3 +Build-Depends: glew, glfw3, boost-ptr-container -- cgit v1.2.3 From 848233b137fc93edd04c45a039d03de8b5abc1b4 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Thu, 8 Nov 2018 00:57:08 -0700 Subject: Update libpng cmake wrapper for dynamic libraries (#4590) * Update libpng cmake wrapper for dynamic libraries * [libpng] Bump control version * [libgd] Fix parallel source directory writes --- ports/libgd/CONTROL | 2 +- ports/libgd/no-write-source-dir.patch | 14 ++++++++++++++ ports/libgd/portfile.cmake | 24 ++++++++++-------------- ports/libpng/CONTROL | 2 +- ports/libpng/vcpkg-cmake-wrapper.cmake | 2 ++ 5 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 ports/libgd/no-write-source-dir.patch diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index f86afe90f..a8373f515 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,4 +1,4 @@ Source: libgd -Version: 2.2.4-3 +Version: 2.2.4-4 Description: Open source code library for the dynamic creation of images by programmers. Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig diff --git a/ports/libgd/no-write-source-dir.patch b/ports/libgd/no-write-source-dir.patch new file mode 100644 index 000000000..3017e7ee4 --- /dev/null +++ b/ports/libgd/no-write-source-dir.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b16d4a4..5126085 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,8 @@ else (USE_EXT_GD) + CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) + CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) + +- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) ++ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES) ++ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) + + option(BUILD_SHARED_LIBS "Build shared libs" ON) + option(BUILD_STATIC_LIBS "Build static libs" OFF) diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index 61445641e..7e8051acc 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -1,19 +1,15 @@ include(vcpkg_common_functions) -set(LIBGD_VERSION 2.2.4) -set(LIBGD_HASH 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libgd-gd-${LIBGD_VERSION}) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/libgd/libgd/archive/gd-${LIBGD_VERSION}.tar.gz" - FILENAME "gd-${LIBGD_VERSION}.tar.gz" - SHA512 ${LIBGD_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-cmake.patch") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libgd/libgd + REF gd-2.2.4 + SHA512 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee + HEAD_REF master + PATCHES + 0001-fix-cmake.patch + no-write-source-dir.patch +) #delete CMake builtins modules file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake) diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index d7e4b8e89..e16f6b1c8 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.35 +Version: 1.6.35-1 Build-Depends: zlib Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/vcpkg-cmake-wrapper.cmake b/ports/libpng/vcpkg-cmake-wrapper.cmake index 88813d68c..cb9c74f32 100644 --- a/ports/libpng/vcpkg-cmake-wrapper.cmake +++ b/ports/libpng/vcpkg-cmake-wrapper.cmake @@ -1,4 +1,6 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a") set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a" CACHE FILEPATH "") +elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE FILEPATH "") endif() _find_package(${ARGS}) -- cgit v1.2.3 From 9fe14bc18ec4b8f12238cd8790c44e42325f8e52 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 1 Nov 2018 19:27:44 -0700 Subject: Updates 2018.11.01 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 ++-- ports/brynet/CONTROL | 2 +- ports/brynet/portfile.cmake | 4 ++-- ports/catch2/CONTROL | 2 +- ports/catch2/portfile.cmake | 4 ++-- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 4 ++-- ports/clara/CONTROL | 2 +- ports/clara/portfile.cmake | 4 ++-- ports/directxmesh/CONTROL | 2 +- ports/directxmesh/portfile.cmake | 4 ++-- ports/directxtex/CONTROL | 2 +- ports/directxtex/portfile.cmake | 4 ++-- ports/directxtk/CONTROL | 2 +- ports/directxtk/portfile.cmake | 4 ++-- ports/exiv2/CONTROL | 2 +- ports/exiv2/portfile.cmake | 4 ++-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/glm/CONTROL | 2 +- ports/glm/portfile.cmake | 4 ++-- ports/jsonnet/CONTROL | 2 +- ports/jsonnet/portfile.cmake | 4 ++-- ports/nuklear/CONTROL | 2 +- ports/nuklear/portfile.cmake | 4 ++-- ports/openimageio/CONTROL | 2 +- ports/openimageio/portfile.cmake | 4 ++-- ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 ++-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 ++-- ports/wangle/CONTROL | 2 +- ports/wangle/portfile.cmake | 4 ++-- ports/zeromq/CONTROL | 2 +- ports/zeromq/portfile.cmake | 4 ++-- 38 files changed, 57 insertions(+), 57 deletions(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index ada833466..867474e2e 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-10-25 +Version: 2018-11-01 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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index e83b1a057..c77c7dfd2 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 94c298e2a0ae409e283cab96c954a685bd865a70 - SHA512 217b903255a745613296707568f190368d7d54e0299e455369cb14226c191ba5867b1e7d68698b2f6377d4049fe900a3aa49cba8fa69acc378fd7c5c70461551 + REF cc8dcd307b76a575d2e3e0958a4fe4c7193c2f68 + SHA512 7f558fc27cbbcd9cabc0630cf4683cf0f0a713ef71197211d5bc73dbc404d1e47a9d61555fddaa9f840a99ff0235256af38d34b3ed076967172824f35124f348 HEAD_REF master ) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index eda565cff..3f045567a 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.6.38 +Version: 1.6.43 Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 03e5526ba..c48627c7b 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 1.6.38 - SHA512 1f70b43c8fcac62fb73ced8aeab5f979266dea5ef8dc683bf4420f4a30477dc4d7223b752a1b82cf0992d19bd8e0ef044c819b85f9781931eb9af2c060d15bfd + REF 1.6.43 + SHA512 aeff9d6fa67b4c468c0d14b527ba64db2e4552e8dff9943a918430cbf8f787f3871c8138dc4d88eb829a4a1a5d0dace2a81eb7fcf607e48cc4e0f1bdf1499991 HEAD_REF master ) diff --git a/ports/brynet/CONTROL b/ports/brynet/CONTROL index f94ec56ee..a08457902 100644 --- a/ports/brynet/CONTROL +++ b/ports/brynet/CONTROL @@ -1,3 +1,3 @@ Source: brynet -Version: 0.9.0 +Version: 1.0.0 Description: A C++ cross platform high performance tcp network library, and support SSL/HTTP/Websocket. diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake index 7922b704c..0224eae76 100644 --- a/ports/brynet/portfile.cmake +++ b/ports/brynet/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IronsDu/brynet - REF v0.9.0 - SHA512 49543833be0d8eb2dce2b00a85d48087e9756b93febaae0c7cd83b7f44f9cd8d81976069f8b84344807bee2df785b80fbb65a1a93e8c6a9c942f9554063a05c1 + REF v1.0.0 + SHA512 f2ad0514d5b25828b38d929bf352a8a35c39816982f7a3aaca2b6d74a7e592d8a37d2af6b77d6babf2eec25063ed1bb50704e8871d18d7e5f777021d18604b9c HEAD_REF master ) diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index a120bc416..de2d71c35 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.4.1 +Version: 2.4.2 Description: A modern, header-only test framework for unit testing. Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 202ac8701..b36595d2c 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.4.1 - SHA512 054751959b675a4c871538f2e65b50e0efbaee8d0fafb26f0013a2b0da6fab406dbe9493dc4888c5651bce3da32ab7d7a56694dd68427377c6b0b25804657356 + REF v2.4.2 + SHA512 7422c5c114d93b57cac5596e573d0993ecc6db37708df3491d346bb3aad7a1ee1d1008689ae7b8ef4b0b4fa41aa66566580f807778ae2e4f278687d6fe7aa38b HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 6170fb678..9d8704ea1 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.4.0 +Version: 2.4.1 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 8dd1626f6..70b397e45 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.4.0 + REF v.2.4.1 HEAD_REF master - SHA512 5aae75afcccc965e11eae6f322a15d245d2f75b7ad4914c61add3638c1bfaf5d9cf8cc52b52743cd21b149e0397ce180ab5e5f29dc09d37b443c3f3550c8a5a5) + SHA512 b0582a158024a13c9d6779e4e6a37487bb8c18b3e91f8fa56a6d0ee3dbaede2567f00c29432f41ca8e3845e98566375b285fb674721225705f6ade91894db081) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL index 4e7d58482..cce19cdf1 100644 --- a/ports/clara/CONTROL +++ b/ports/clara/CONTROL @@ -1,3 +1,3 @@ Source: clara -Version: 2018-10-25 +Version: 2018-11-01 Description: A simple to use command line parser for C++ \ No newline at end of file diff --git a/ports/clara/portfile.cmake b/ports/clara/portfile.cmake index 441be3b6b..142b30120 100644 --- a/ports/clara/portfile.cmake +++ b/ports/clara/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO philsquared/Clara - REF a19db09c015f96f80d282e445ed3091ff20b4248 - SHA512 e7a9574d92ff8cc4b91094d30572bc5b36c30f5dc52c418e76ba2227c526551572f51d4a2fa29e9afab21be82e330070dd8a2118d75bdd49ac1e510755b4cdf4 + REF a6dfbbd011a79a5f729950d6f4b72c08f9529283 + SHA512 ec3004807c35b54b2defbec7d794817cd90dad5e442fa30c7a4ef3f72d6fcfd789302388bae8752b98d7145071d43851326e476d053b15f800f9117e1a3a0d74 HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index e625af354..728f61b5f 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,3 +1,3 @@ Source: directxmesh -Version: aug2018 +Version: oct2018 Description: DirectXMesh geometry processing library \ No newline at end of file diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 4263b2aa8..81adb18b6 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF aug2018 - SHA512 5aaafd434024327b9ab59eab7f0247a5e0d439e5cad22929adc78edd41ac987c5da70e3ae26637beea923333651ceae3127f1ff274aad3497948508a1a8b1912 + REF oct2018 + SHA512 eb96fa3104932650bff3b051005e84f1eb52c135085ec1f4f56b7bbd99300ca600721cd18c3a9c8d4334e3280369df7d1d92ab6556fc82c72e1a54d04853331a HEAD_REF master ) diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 3196c68b1..05edc2238 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,3 +1,3 @@ Source: directxtex -Version: aug2018b +Version: oct2018 Description: DirectXTex texture processing library \ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index bcdeebfbd..a5d6deca5 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF aug2018b - SHA512 51ccd4855d399db4980a0f859da25e9473cf5b4ae44f2594b13ba7813d4fd3f4c424ce750ca0b096e40999c935269522fb6bfe2b2e1910f0f8a6c6c1ea76c399 + REF oct2018 + SHA512 6bb395c92ca60af03fb3b86dd64542feb0a633b49386a438d0e73f108a4af60913bd695a1c90069eeb83df4ec49289e1a8ae3ac131ddca372eb6dd20d14590d7 HEAD_REF master ) diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 1f0637c44..100f7f99a 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,3 +1,3 @@ Source: directxtk -Version: aug2018 +Version: oct2018b Description: A collection of helper classes for writing DirectX 11.x code in C++. diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 5ef37d1f2..2e6267bad 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF aug2018 - SHA512 9408916864900a098bb77244144c71d1786b3fe76468c50a92fbf21f71407c7f7c6834d9e69a13b4b93161362252599ccb12f6a87b6ca7a8b23d12e6e73dd166 + REF oct2018b + SHA512 d9eb0d0537dd6638bfe089bbaa77ad4c4065d43c53143686e60b8c62814f1c7a0fc9a0361a418b1f0fa0881faa14c92c604fffb6670dd8c1260e67d56fea9bab HEAD_REF master ) diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index 7a09655f2..afe77d9a1 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,4 +1,4 @@ Source: exiv2 -Version: 2018-10-25 +Version: 2018-11-01 Build-Depends: zlib, expat, libiconv Description: Image metadata library and tools http://www.exiv2.org diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 44930d2fa..d884c4441 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF dc086d2ebbb04817458b214708c5038600e96095 - SHA512 8a3dc2d948a31f6355f8c23620f4730599379fe83a6cacfe1c88d45f35cfd4a2e37c6e0c36e951961b3b9083aef9b881ccee1989c6f139e699e04db1f2d9dba9 + REF c87749a5e22d0583fd2b876701dbf1c8052004dd + SHA512 5c17e6100a2ca12de92e1549c9d683e45692f846e8fec4277d18593a181d0d0b39b70b676f840c232b0c04adf5301df41cfc137e95cd8a40816bd993f752c78d HEAD_REF master PATCHES iconv.patch ) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 8b8e6cc42..4f8007e70 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.10.22.00 +Version: 2018.10.29.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index a95b1baaf..a71b39067 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.10.22.00 - SHA512 ca039ee85c4269fb79ff01beb9e67a6a17220cdc997f59c5ca27514407e533f3d65c358fc5d99c5008a63d3837703db78707a04ba88093b9e63306012a5759e5 + REF v2018.10.29.00 + SHA512 82714564713224e1a8dcfa0d7722cf9396374da29daf6afdb7ea058d33eaedd9e41b2ed9033bc3c3cbb6a51fa0e5cd0a48fedecfa110a13a1ca308d2a7518d1b HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL index c7c099c72..3da56cf54 100644 --- a/ports/glm/CONTROL +++ b/ports/glm/CONTROL @@ -1,3 +1,3 @@ Source: glm -Version: 0.9.9.2 +Version: 0.9.9.3 Description: OpenGL Mathematics (GLM) https://glm.g-truc.net diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index 90f7875fb..7eca98766 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/glm - REF 0.9.9.2 - SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a + REF 0.9.9.3 + SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650 HEAD_REF master ) diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index eba2463ce..3a96ceeb1 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,3 +1,3 @@ Source: jsonnet -Version: 2018-10-25 +Version: 2018-11-01 Description: Jsonnet - The data templating language diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 09e7d92b4..6a8e0f5cb 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF edfcffc596af4a5977891849a2b813cf31bbff5e - SHA512 a0568fa00331ef2fe2e14c25c36b6668d15fbe3c4e92453a382832ae715c6eaff5047f0a91a98429052e0eaa16db25b850bb4544f44974abb7769125a1f4a7f2 + REF a0876b301daf8f45e16ac5f7bb814d0617772bb0 + SHA512 a57380ecc578b11f3a763202abb7ab703f2cc3c098ca7602d0bd199594a9e8d1cebc6d51332658edb08bf088e565d6afae0cb2faaf127fa33542a406de1ac055 HEAD_REF master ) diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL index 15f605ebc..f7d01c295 100644 --- a/ports/nuklear/CONTROL +++ b/ports/nuklear/CONTROL @@ -1,3 +1,3 @@ Source: nuklear -Version: 2018-10-25 +Version: 2018-11-01 Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index d7570987f..b7e6bfff8 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vurtun/nuklear - REF 19c14bb777ebccf93fc9ed8a8b295f4a62cb32c9 - SHA512 ff9d9fcbba41b602e13060445dd67a6c07322fce4b9b210cde72e4ba9bb5f3805fec5aad66e2c9aeca191d0fdd4e9b747021e5e8aa62175f927fa39a91847b1a + REF 181cfd86c47ae83eceabaf4e640587b844e613b6 + SHA512 33f6200d046c96b8d42ff851ba788bf4f57d8aa99591b866e8691204378f23d5dce06343521834cd10ffaecc42566d97ce2c3becf48caaadf0cdc270cf69bdbb HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 6f3687ca6..86ae5bd55 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,5 +1,5 @@ Source: openimageio -Version: 1.8.15-1 +Version: 1.8.16 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, 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 diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 7997a6105..93b04e627 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF Release-1.8.15 - SHA512 e022e5c7e300d3dd952bcf3476e1b676a8931f67ba6b3959b26c75b9709907ac1c1b99de651f5876045f9a333e325a161b0d5159cb5bf385eb4f9f90a04707c7 + REF Release-1.8.16 + SHA512 a919341df7d9625a869cad266d8434881b63a47f3da8daccf4bbab6675d45bd121ff780dd911a7447450fee44cd7bdd42d73aec59a99b667d6d98e79682db2c7 HEAD_REF master PATCHES # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES' diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 5b1fbb005..c2482bcfb 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-10-25 +Version: 2018-11-01 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 983894037..eb14b12b3 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF 89528a380a7e9722dbf7b5a817251049eab355fb - SHA512 7654a41ea42e816e7ecd80e554e6e5ab11e7d2f4d2c547a3083f990500668c74ae74870fe5a6390521b44edc2be8ce11d86a187600229e3d8b9d8b3114cfa4e8 + REF d9cebde0175aa1ffd38aab9a395a038464d55ce7 + SHA512 820ebc96f6cc583e50bdd637b8bf6b4e8ef6be5a74a49174bf845d037f0dd21ee3b1fbc220bc3cbbd6987205195b6c0990040f43da723f90038a20690a7553ff HEAD_REF master ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index f01ffbbaf..d52f25eba 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-10-25 +Version: 2018-11-01 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index a69291ee4..9fb495c84 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF cd829a0b9a5c66203b63350fa029589669ec43f6 - SHA512 e8a9879c580f0a1450a023945555a2f8e042c11f04085ea1700fa7a4e8f4b2ac53a461530cf4106803472c040d3742c2c31173366a28571aa273f093c8d4bc39 + REF 92be4f312b88eac0a4ac450eda29fd20de11b1f0 + SHA512 0c1c7eb30fc63efa483cd9970305b5285c7d6f57151a9e0f602ff757b05cede3adb13688c5d1436c05ffd4bd142ca7676db8e35cbf4d38e9112033f6a2e77ff4 HEAD_REF master ) diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index 566d6acbf..ba204005d 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle -Version: 2018.10.22.00 +Version: 2018.10.29.00 Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion 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/portfile.cmake b/ports/wangle/portfile.cmake index 2e3daf795..1ecec2f4f 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2018.10.22.00 - SHA512 cfaf783362989c67dad54d6bd15c3b2f710fd1c1e858cf549367033a50718b69f78fc58001e6202bf8cc84fbb0e9752c433a03dd2d91800bfe2645c7b5519fca + REF v2018.10.29.00 + SHA512 28363960b8437882eca67ed3a6de34dcce6323bc42bb12505334e79c5ea1004c1cc37565b88629531441024914253d8d2e6f0a0cb7eeee88b71d8ff35516abe3 HEAD_REF master PATCHES build.patch diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index a4a6dd37d..84b0ad93c 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2018-10-11 +Version: 2018-11-01 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index b19d2821a..ebff91236 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF cfc9d5f5198e611d8d3ad4482d57cf6bb5b6bf59 - SHA512 1917bb9838798d6d977171cc03477ac909cbcf999527a0019efac9a31176f5becba5eef269569777121288dbd2d601c0c579e83cfe1cb1aa6eb093f74adcc955 + REF efc9a3021fb61ca92b9869f0ad8308d29a3ebfa3 + SHA512 04c2d94c497a0398243c1fc8c5e1bdcc3a9da873ccf688a9345db334d12e562c8131e7976fa2123fb8f760cc450bd0cfe33a486d1f31880b7d69379e10be7caa HEAD_REF master ) -- cgit v1.2.3 From efe7c7eb28e0330eb3e61d7e5be3e68ddaad9175 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Fri, 9 Nov 2018 03:45:58 +0900 Subject: [pcl] Update to PCL 1.9.0 (#4677) Update PCL port to PCL 1.9.0. --- ports/pcl/CONTROL | 2 +- ports/pcl/boost_uuid_random_generator_compat.patch | 13 ----- ports/pcl/cmakelists.patch | 25 --------- ports/pcl/config.patch | 63 ---------------------- ports/pcl/config_install.patch | 22 -------- ports/pcl/find_cuda.patch | 15 ------ ports/pcl/find_flann.patch | 11 +--- ports/pcl/find_openni2.patch | 12 ----- ports/pcl/find_qhull.patch | 13 ----- ports/pcl/pcl_config.patch | 45 ++++++++++++++++ ports/pcl/pcl_utils.patch | 22 ++++++++ ports/pcl/portfile.cmake | 15 ++---- ports/pcl/uuid-detail-sha1.patch | 13 ----- ports/pcl/vs2017-15.4-workaround.patch | 41 -------------- 14 files changed, 73 insertions(+), 239 deletions(-) delete mode 100644 ports/pcl/boost_uuid_random_generator_compat.patch delete mode 100644 ports/pcl/cmakelists.patch delete mode 100644 ports/pcl/config.patch delete mode 100644 ports/pcl/config_install.patch delete mode 100644 ports/pcl/find_cuda.patch delete mode 100644 ports/pcl/find_openni2.patch delete mode 100644 ports/pcl/find_qhull.patch create mode 100644 ports/pcl/pcl_config.patch create mode 100644 ports/pcl/pcl_utils.patch delete mode 100644 ports/pcl/uuid-detail-sha1.patch delete mode 100644 ports/pcl/vs2017-15.4-workaround.patch diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index b1b20fe06..0a12f78c8 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,5 +1,5 @@ Source: pcl -Version: 1.8.1-12 +Version: 1.9.0-1 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, vtk, 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-ptr-container, boost-uuid, boost-interprocess, boost-asio diff --git a/ports/pcl/boost_uuid_random_generator_compat.patch b/ports/pcl/boost_uuid_random_generator_compat.patch deleted file mode 100644 index 891890b46..000000000 --- a/ports/pcl/boost_uuid_random_generator_compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0405dca2..00e5238e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -168,6 +168,8 @@ if(CMAKE_COMPILER_IS_MSVC) - endif() - endif() - -+add_definitions(-DBOOST_UUID_RANDOM_GENERATOR_COMPAT) -+ - if(CMAKE_COMPILER_IS_PATHSCALE) - if("${CMAKE_CXX_FLAGS}" STREQUAL "") - SET(CMAKE_CXX_FLAGS "-Wno-uninitialized -zerouv -pthread -mp") diff --git a/ports/pcl/cmakelists.patch b/ports/pcl/cmakelists.patch deleted file mode 100644 index d385fd291..000000000 --- a/ports/pcl/cmakelists.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d36a581fb..b68962e97 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -258,7 +258,7 @@ if(OPENMP_FOUND) - set(OPENMP_DLL VCOMP120) - elseif(MSVC_VERSION EQUAL 1900) - set(OPENMP_DLL VCOMP140) -- elseif(MSVC_VERSION EQUAL 1910) -+ elseif(MSVC_VERSION MATCHES "^191[0-9]$") - set(OPENMP_DLL VCOMP140) - endif() - if(OPENMP_DLL) -@@ -327,9 +327,9 @@ endif(WITH_PNG) - # Qhull - option(WITH_QHULL "Include convex-hull operations" TRUE) - if(WITH_QHULL) -- if(NOT PCL_SHARED_LIBS OR WIN32) -+ if(NOT PCL_SHARED_LIBS) - set(QHULL_USE_STATIC ON) -- endif(NOT PCL_SHARED_LIBS OR WIN32) -+ endif(NOT PCL_SHARED_LIBS) - find_package(Qhull) - if(QHULL_FOUND) - include_directories(${QHULL_INCLUDE_DIRS}) diff --git a/ports/pcl/config.patch b/ports/pcl/config.patch deleted file mode 100644 index 1b46ab7ce..000000000 --- a/ports/pcl/config.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index f4ef6a0ff..3a2c259dc 100644 ---- a/PCLConfig.cmake.in -+++ b/PCLConfig.cmake.in -@@ -155,7 +155,7 @@ macro(find_qhull) - NAMES "@QHULL_LIBRARY_DEBUG_NAME@" - HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}" - PATHS "$ENV{PROGRAMFILES}/qhull" "$ENV{PROGRAMW6432}/qhull" -- PATH_SUFFIXES project build bin lib) -+ PATH_SUFFIXES project build bin lib debug/lib) - - find_package_handle_standard_args(qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIRS) - -@@ -443,7 +443,7 @@ macro(find_flann) - HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" - PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" - "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann" -- PATH_SUFFIXES lib) -+ PATH_SUFFIXES lib debug/lib) - - find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS) - if(FLANN_FOUND) -@@ -715,25 +715,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR) - if(WIN32 AND NOT MINGW) - # PCLConfig.cmake is installed to PCL_ROOT/cmake - get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) -+ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) - else(WIN32 AND NOT MINGW) - # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y - get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) - endif(WIN32 AND NOT MINGW) - - # check whether PCLConfig.cmake is found into a PCL installation or in a build tree --if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") -+if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") - # Found a PCL installation - # pcl_message("Found a PCL installation") -- set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") -- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@") -- if(EXISTS "${PCL_ROOT}/3rdParty") -- set(PCL_ALL_IN_ONE_INSTALLER ON) -- endif(EXISTS "${PCL_ROOT}/3rdParty") --elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") -- # Found a non-standard (likely ANDROID) PCL installation -- # pcl_message("Found a PCL installation") - set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include") -- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib") -+ set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@") - if(EXISTS "${PCL_ROOT}/3rdParty") - set(PCL_ALL_IN_ONE_INSTALLER ON) - endif(EXISTS "${PCL_ROOT}/3rdParty") -@@ -743,9 +736,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") - set(PCL_INCLUDE_DIRS "${PCL_DIR}/include") # for pcl_config.h - set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@") - set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@") --else(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") -+else(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") - pcl_report_not_found("PCL can not be found on this machine") --endif(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") -+endif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") - - #set a suffix for debug libraries - set(PCL_DEBUG_SUFFIX "@CMAKE_DEBUG_POSTFIX@") diff --git a/ports/pcl/config_install.patch b/ports/pcl/config_install.patch deleted file mode 100644 index ae5e8257b..000000000 --- a/ports/pcl/config_install.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake -index 69f1e76a4..37305815e 100644 ---- a/cmake/pcl_utils.cmake -+++ b/cmake/pcl_utils.cmake -@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS) - endif (NOT DEFINED LIB_INSTALL_DIR) - if(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT -- "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") -+ "include") - else(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir - endif(NOT ANDROID) -@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS) - set(BIN_INSTALL_DIR "bin") - set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") - if(WIN32 AND NOT MINGW) -- set(PCLCONFIG_INSTALL_DIR "cmake") -+ set(PCLCONFIG_INSTALL_DIR "share/pcl") - else(WIN32 AND NOT MINGW) - set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") - endif(WIN32 AND NOT MINGW) diff --git a/ports/pcl/find_cuda.patch b/ports/pcl/find_cuda.patch deleted file mode 100644 index 6e872cdab..000000000 --- a/ports/pcl/find_cuda.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/pcl_find_cuda.cmake b/cmake/pcl_find_cuda.cmake -index fd9cfa9..ae9e612 100644 ---- a/cmake/pcl_find_cuda.cmake -+++ b/cmake/pcl_find_cuda.cmake -@@ -43,7 +43,9 @@ if(CUDA_FOUND) - - # Find a complete list for CUDA compute capabilities at http://developer.nvidia.com/cuda-gpus - -- if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0") -+ if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "9.0") -+ set(__cuda_arch_bin "3.0 3.5 5.0 5.2 5.3 6.0 6.1 7.0") -+ elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0") - set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2 5.3 6.0 6.1") - elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "6.5") - set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2") diff --git a/ports/pcl/find_flann.patch b/ports/pcl/find_flann.patch index e9760e502..263be2926 100644 --- a/ports/pcl/find_flann.patch +++ b/ports/pcl/find_flann.patch @@ -1,5 +1,5 @@ diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake -index b5739dc95..d2c3fd07e 100644 +index 1cecacfa9..3169d6d7b 100644 --- a/cmake/Modules/FindFLANN.cmake +++ b/cmake/Modules/FindFLANN.cmake @@ -10,8 +10,8 @@ @@ -13,12 +13,3 @@ index b5739dc95..d2c3fd07e 100644 else(FLANN_USE_STATIC) set(FLANN_RELEASE_NAME flann_cpp) set(FLANN_DEBUG_NAME flann_cpp-gd) -@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG - NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME} - HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" - PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -- PATH_SUFFIXES lib) -+ PATH_SUFFIXES lib debug/lib) - - if(NOT FLANN_LIBRARY_DEBUG) - set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY}) diff --git a/ports/pcl/find_openni2.patch b/ports/pcl/find_openni2.patch deleted file mode 100644 index 4bd3e0799..000000000 --- a/ports/pcl/find_openni2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake -index 713099a14..f31de96a6 100644 ---- a/cmake/Modules/FindOpenNI2.cmake -+++ b/cmake/Modules/FindOpenNI2.cmake -@@ -51,6 +51,7 @@ find_path(OPENNI2_INCLUDE_DIRS OpenNI.h - PATHS - "$ENV{OPENNI2_INCLUDE${OPENNI2_SUFFIX}}" # Win64 needs '64' suffix - /usr/include/openni2 # common path for deb packages -+ PATH_SUFFIXES include/openni2 - ) - - find_library(OPENNI2_LIBRARY diff --git a/ports/pcl/find_qhull.patch b/ports/pcl/find_qhull.patch deleted file mode 100644 index e845293be..000000000 --- a/ports/pcl/find_qhull.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/Modules/FindQhull.cmake b/cmake/Modules/FindQhull.cmake -index 698bd151b..44c1d5d8d 100644 ---- a/cmake/Modules/FindQhull.cmake -+++ b/cmake/Modules/FindQhull.cmake -@@ -55,7 +55,7 @@ find_library(QHULL_LIBRARY_DEBUG - NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME} - HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}" - PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull" -- PATH_SUFFIXES project build bin lib) -+ PATH_SUFFIXES project build bin lib debug/lib) - - if(NOT QHULL_LIBRARY_DEBUG) - set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY}) diff --git a/ports/pcl/pcl_config.patch b/ports/pcl/pcl_config.patch new file mode 100644 index 000000000..17af6cfb6 --- /dev/null +++ b/ports/pcl/pcl_config.patch @@ -0,0 +1,45 @@ +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index 7ec40baa0..837d78c82 100644 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -388,25 +388,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR) + if(WIN32 AND NOT MINGW) + # PCLConfig.cmake is installed to PCL_ROOT/cmake + get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) ++ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) + else(WIN32 AND NOT MINGW) + # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y + get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) + endif(WIN32 AND NOT MINGW) + + # check whether PCLConfig.cmake is found into a PCL installation or in a build tree +-if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") ++if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") + # Found a PCL installation + # pcl_message("Found a PCL installation") +- set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@") +- if(EXISTS "${PCL_ROOT}/3rdParty") +- set(PCL_ALL_IN_ONE_INSTALLER ON) +- endif(EXISTS "${PCL_ROOT}/3rdParty") +-elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") +- # Found a non-standard (likely ANDROID) PCL installation +- # pcl_message("Found a PCL installation") + set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include") +- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib") ++ set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@") + if(EXISTS "${PCL_ROOT}/3rdParty") + set(PCL_ALL_IN_ONE_INSTALLER ON) + endif(EXISTS "${PCL_ROOT}/3rdParty") +@@ -416,9 +409,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") + set(PCL_INCLUDE_DIRS "${PCL_DIR}/include") # for pcl_config.h + set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@") + set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@") +-else(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") ++else(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") + pcl_report_not_found("PCL can not be found on this machine") +-endif(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") ++endif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") + + #set a suffix for debug libraries + set(PCL_DEBUG_SUFFIX "@CMAKE_DEBUG_POSTFIX@") diff --git a/ports/pcl/pcl_utils.patch b/ports/pcl/pcl_utils.patch new file mode 100644 index 000000000..3f266cdfd --- /dev/null +++ b/ports/pcl/pcl_utils.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake +index 41a64a269..a12718339 100644 +--- a/cmake/pcl_utils.cmake ++++ b/cmake/pcl_utils.cmake +@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS) + endif (NOT DEFINED LIB_INSTALL_DIR) + if(NOT ANDROID) + set(INCLUDE_INSTALL_ROOT +- "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") ++ "include") + else(NOT ANDROID) + set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir + endif(NOT ANDROID) +@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS) + set(BIN_INSTALL_DIR "bin") + set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") + if(WIN32 AND NOT MINGW) +- set(PCLCONFIG_INSTALL_DIR "cmake") ++ set(PCLCONFIG_INSTALL_DIR "share/pcl") + else(WIN32 AND NOT MINGW) + set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") + endif(WIN32 AND NOT MINGW) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index dc4619ed3..650e6de1a 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -3,19 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl - REF pcl-1.8.1 - SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7 + REF pcl-1.9.0 + SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc HEAD_REF master - PATCHES cmakelists.patch - config.patch - config_install.patch + PATCHES pcl_utils.patch + pcl_config.patch find_flann.patch - find_qhull.patch - find_openni2.patch - find_cuda.patch - vs2017-15.4-workaround.patch - boost_uuid_random_generator_compat.patch - uuid-detail-sha1.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) diff --git a/ports/pcl/uuid-detail-sha1.patch b/ports/pcl/uuid-detail-sha1.patch deleted file mode 100644 index 8c2536cab..000000000 --- a/ports/pcl/uuid-detail-sha1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp -index 5b12331..b83f320 100644 ---- a/visualization/src/pcl_visualizer.cpp -+++ b/visualization/src/pcl_visualizer.cpp -@@ -100,7 +100,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/ports/pcl/vs2017-15.4-workaround.patch b/ports/pcl/vs2017-15.4-workaround.patch deleted file mode 100644 index 5600c9dc8..000000000 --- a/ports/pcl/vs2017-15.4-workaround.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/io/include/pcl/io/ply/ply_parser.h b/io/include/pcl/io/ply/ply_parser.h -index 649d19a..45709a8 100644 ---- a/io/include/pcl/io/ply/ply_parser.h -+++ b/io/include/pcl/io/ply/ply_parser.h -@@ -115,7 +115,7 @@ namespace pcl - - class scalar_property_definition_callbacks_type - { -- private: -+ public: - template - struct callbacks_element - { -@@ -123,7 +123,8 @@ namespace pcl - typedef T scalar_type; - typename scalar_property_definition_callback_type::type callback; - }; -- -+ -+ private: - typedef boost::mpl::inherit_linearly< - scalar_types, - boost::mpl::inherit< -@@ -218,6 +219,7 @@ namespace pcl - boost::mpl::_1,boost::mpl::transform > > > - {}; - -+ public: - template - struct callbacks_element - { -@@ -225,7 +227,8 @@ namespace pcl - typedef typename T::second scalar_type; - typename list_property_definition_callback_type::type callback; - }; -- -+ -+ private: - typedef boost::mpl::inherit_linearly::type, boost::mpl::inherit > >::type callbacks; - callbacks callbacks_; - -- cgit v1.2.3 From 7bb03fd2fc53ec0851e98aabf98047e8caf79a8b Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Fri, 9 Nov 2018 03:46:25 +0900 Subject: [vtk] Fix FindLZ4 (#4676) Fix find lz4 library of debug configuration. --- ports/vtk/CONTROL | 2 +- ports/vtk/fix-find-lz4.patch | 20 ++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/vtk/fix-find-lz4.patch diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e75795e74..d06f16331 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-2 +Version: 8.1.0-3 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora diff --git a/ports/vtk/fix-find-lz4.patch b/ports/vtk/fix-find-lz4.patch new file mode 100644 index 000000000..7389a24f4 --- /dev/null +++ b/ports/vtk/fix-find-lz4.patch @@ -0,0 +1,20 @@ +diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake +index 07343e1f79..b43a9af2c7 100644 +--- a/CMake/FindLZ4.cmake ++++ b/CMake/FindLZ4.cmake +@@ -1,7 +1,13 @@ +- +-find_library(LZ4_LIBRARIES NAMES lz4) ++find_library(LZ4_LIBRARY NAMES lz4 PATH_SUFFIXES lib) ++find_library(LZ4_LIBRARY_DEBUG NAME lz4d PATH_SUFFIXES debug/lib) + find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) + ++if(NOT LZ4_LIBRARY_DEBUG) ++ set(LZ4_LIBRARY_DEBUG ${LZ4_LIBRARY}) ++endif(NOT LZ4_LIBRARY_DEBUG) ++ ++set(LZ4_LIBRARIES optimized ${LZ4_LIBRARY} debug ${LZ4_LIBRARY_DEBUG}) ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(LZ4 + DEFAULT_MSG diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index c547929ce..edb245eb0 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -67,6 +67,7 @@ vcpkg_from_github( fix-find-libharu.patch fix-find-mysql.patch fix-find-odbc.patch + fix-find-lz4.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, -- cgit v1.2.3 From 1d7fa4c74a1cfdc962d5a58408b8f431e4f6ba52 Mon Sep 17 00:00:00 2001 From: Oscar Morante Date: Thu, 8 Nov 2018 20:53:06 +0200 Subject: add nanovg port (#4667) --- ports/nanovg/CMakeLists.txt | 31 +++++++++++++++++++++++++++++++ ports/nanovg/CONTROL | 3 +++ ports/nanovg/nanovgConfig.cmake | 1 + ports/nanovg/portfile.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 ports/nanovg/CMakeLists.txt create mode 100644 ports/nanovg/CONTROL create mode 100644 ports/nanovg/nanovgConfig.cmake create mode 100644 ports/nanovg/portfile.cmake diff --git a/ports/nanovg/CMakeLists.txt b/ports/nanovg/CMakeLists.txt new file mode 100644 index 000000000..87a7d3339 --- /dev/null +++ b/ports/nanovg/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.11) +project(nanovg C) + +set(NANOVG_SOURCES src/nanovg.c) +set(NANOVG_HEADERS src/nanovg.h src/nanovg_gl.h src/nanovg_gl_utils.h) +add_library(nanovg STATIC ${NANOVG_SOURCES} ${NANOVG_HEADERS}) +set_target_properties(nanovg PROPERTIES PUBLIC_HEADER "${NANOVG_HEADERS}") +target_include_directories(nanovg PRIVATE 3rdparty/nanovg/src) + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_definitions(nanovg PRIVATE DEBUG) +else() + target_compile_definitions(nanovg PRIVATE NDEBUG) +endif() + +install(TARGETS nanovg + EXPORT nanovgTargets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include) + +install(EXPORT nanovgTargets + FILE nanovgTargets.cmake + NAMESPACE nanovg:: + DESTINATION share/nanovg) + +include(CMakePackageConfigHelpers) +install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/nanovgConfig.cmake + DESTINATION share/nanovg) diff --git a/ports/nanovg/CONTROL b/ports/nanovg/CONTROL new file mode 100644 index 000000000..c074c1824 --- /dev/null +++ b/ports/nanovg/CONTROL @@ -0,0 +1,3 @@ +Source: nanovg +Version: master +Description: NanoVG is small antialiased vector graphics rendering library for OpenGL. diff --git a/ports/nanovg/nanovgConfig.cmake b/ports/nanovg/nanovgConfig.cmake new file mode 100644 index 000000000..e849dff11 --- /dev/null +++ b/ports/nanovg/nanovgConfig.cmake @@ -0,0 +1 @@ +include(${CMAKE_CURRENT_LIST_DIR}/nanovgTargets.cmake) diff --git a/ports/nanovg/portfile.cmake b/ports/nanovg/portfile.cmake new file mode 100644 index 000000000..39e36720e --- /dev/null +++ b/ports/nanovg/portfile.cmake @@ -0,0 +1,41 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/nanovg + REF f4069e6a1ad5da430fb0a9c57476d5ddc2ff89b2 + SHA512 5f2313be939478d40e52c74e3935cbae91277be5c0e466a6d303e8d80e7bf0781288cb319b2e8cec5c7d6fc991be16bec6e0f5228153895ff7fe3abdffe5320e + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/nanovgConfig.cmake DESTINATION ${SOURCE_PATH}) + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright + file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanovg RENAME copyright) -- cgit v1.2.3 From accde13dbbf5cf60faeace401470d946e4a031a3 Mon Sep 17 00:00:00 2001 From: Jayesh Badwaik Date: Fri, 9 Nov 2018 00:29:09 +0100 Subject: [pixel] v0.3 (#4685) * [pixel] v0.3 - installs debug library as `libpixeld.a` * [pixel] bump CONTROL version --- ports/pixel/CONTROL | 2 +- ports/pixel/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/pixel/CONTROL b/ports/pixel/CONTROL index a6445bea3..50b1bd0a8 100644 --- a/ports/pixel/CONTROL +++ b/ports/pixel/CONTROL @@ -1,4 +1,4 @@ Source: pixel -Version: 0.2 +Version: 0.3 Description: Simple 2D Graphics based on standard and portable OpenGL. Build-Depends: glew, opengl, sdl2 diff --git a/ports/pixel/portfile.cmake b/ports/pixel/portfile.cmake index a00dc88f6..4e2e9d7ac 100644 --- a/ports/pixel/portfile.cmake +++ b/ports/pixel/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dascandy/pixel - REF v0.2 - SHA512 53485d298e34f8fda6c14dc07687e21281e4ef9d0567a654e5ded0589e1ac8e6bd84adbef922f0a12806f508c887299a6fc99c2415313029b8f7a6efc1cc3f59 + REF v0.3 + SHA512 d7d622679195d0eb30c8ed411333711369b108e2171d1e4b0a93c7ae3bd1fb36a25fbe1f5771c858615c07ee139412e5353b8cb5489cb409dd94829253c18a7b HEAD_REF master ) -- cgit v1.2.3 From f7f06c516d5c7b6e5ff48db3452bdf2c744f02a4 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 8 Nov 2018 19:03:39 -0800 Subject: [vcpkg_from_git] Use tar.gz because .zip has different hash in different timezones --- ports/fdlibm/portfile.cmake | 2 +- scripts/cmake/vcpkg_from_git.cmake | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake index fb616db7b..6e528f368 100644 --- a/ports/fdlibm/portfile.cmake +++ b/ports/fdlibm/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://android.googlesource.com/platform/external/fdlibm REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac - SHA512 08c16ff7cc6f24d962090bf5ab192d3c8ab33d9f60390ca510898c918cefa1b19572ad6bbf49c327bb09d8a9ab52d8341ec14c44abe169d2d319523567f1300f + SHA512 bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 5f6930412..2fc66b279 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -65,9 +65,10 @@ function(vcpkg_from_git) message(FATAL_ERROR "vcpkg_from_git requires a SHA512 argument. If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") endif() + # using .tar.gz instead of .zip because the hash of the latter is affected by timezone. string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}") - set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.zip") - set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.zip") + 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}") function(test_hash FILE_PATH FILE_KIND CUSTOM_ERROR_ADVICE) -- cgit v1.2.3 From 3f5835d5c4ddc65444cb5973021601f04f30d45e Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Fri, 9 Nov 2018 16:46:54 +0900 Subject: [bzip2] Fix tools install directory (#4682) * [bzip2] Fix tools install directory Change to install tools in port name directory. (vcpkg/installed//tools/bzip2) * [bzip2] Modernize and bump control version --- ports/bzip2/CMakeLists.txt | 2 +- ports/bzip2/CONTROL | 2 +- ports/bzip2/portfile.cmake | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt index d79c28818..2f70c5404 100644 --- a/ports/bzip2/CMakeLists.txt +++ b/ports/bzip2/CMakeLists.txt @@ -36,7 +36,7 @@ install(TARGETS libbz2 if(NOT BZIP2_SKIP_TOOLS) add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES}) add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES}) - install(TARGETS bzip2 bzip2recover DESTINATION tools) + install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2) endif() if(NOT BZIP2_SKIP_HEADERS) diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index 613d3f251..fad303399 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,3 +1,3 @@ Source: bzip2 -Version: 1.0.6-2 +Version: 1.0.6-3 Description: High-quality data compressor. diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 00d92c90a..25e3df10f 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -1,26 +1,27 @@ - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bzip2-1.0.6) +set(BZIP2_VERSION 1.0.6) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/past-due/bzip2-mirror/releases/download/v1.0.6/bzip2-1.0.6.tar.gz" - FILENAME "bzip2-1.0.6.tar.gz" + URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz" + FILENAME "bzip2-${BZIP2_VERSION}.tar.gz" SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${BZIP2_VERSION} + PATCHES + fix-import-export-macros.patch +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-import-export-macros.patch) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS_DEBUG -DBZIP2_SKIP_HEADERS=ON - -DBZIP2_SKIP_TOOLS=ON) + -DBZIP2_SKIP_TOOLS=ON +) vcpkg_install_cmake() vcpkg_copy_pdbs() @@ -33,7 +34,6 @@ else() endif() file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}") - file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2) file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright) -- cgit v1.2.3 -- cgit v1.2.3 From 4f7d4dc66f242a2b86ce38673c7dd9c32110257f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 9 Nov 2018 08:48:09 +0100 Subject: Temp fix for #4359 (#4573) * make user wide integration not burn everything if LLVM is used as a toolset. (e.g. cmake -G "VS" -TLLVM fails to even find compiler due to linker issues) fixes #4359 but might have side effects for that toolset. (e.g. not automatically adding dependencies) * remove whitespaces * [vcpkg-integrate] Conform to MSBuild conventions for comparisons --- scripts/buildsystems/msbuild/vcpkg.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 456783f4d..8807befd8 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -55,6 +55,9 @@ Release $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\ true + + false -- cgit v1.2.3 From 8dc8d0e0c97550a95b764287adbad90b7df7d11d Mon Sep 17 00:00:00 2001 From: jdellar <44727671+jdellar@users.noreply.github.com> Date: Fri, 9 Nov 2018 17:49:24 +1000 Subject: [sdl2] Update to SDL2 2.0.9 (#4648) * [sdl2] Update to SDL2 2.0.9 * [sdl2] Fix x86-windows and fix uwp patch --- ports/sdl2/CONTROL | 2 +- ports/sdl2/enable-winrt-cmake.patch | 381 +++++++++++++++++------------------- ports/sdl2/fix-x86-windows.patch | 15 ++ ports/sdl2/portfile.cmake | 7 +- 4 files changed, 195 insertions(+), 210 deletions(-) create mode 100644 ports/sdl2/fix-x86-windows.patch diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL index 397b81ed5..18e867b7c 100644 --- a/ports/sdl2/CONTROL +++ b/ports/sdl2/CONTROL @@ -1,3 +1,3 @@ Source: sdl2 -Version: 2.0.8-3 +Version: 2.0.9-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. diff --git a/ports/sdl2/enable-winrt-cmake.patch b/ports/sdl2/enable-winrt-cmake.patch index dcd2afa67..858c7d460 100644 --- a/ports/sdl2/enable-winrt-cmake.patch +++ b/ports/sdl2/enable-winrt-cmake.patch @@ -1,206 +1,175 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73d9407..082fbc5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,11 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - endif() - - cmake_minimum_required(VERSION 2.8.11) --project(SDL2 C) -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ project(SDL2 C CXX) -+else() -+ project(SDL2 C) -+endif() - - # !!! FIXME: this should probably do "MACOSX_RPATH ON" as a target property - # !!! FIXME: for the SDL2 shared library (so you get an -@@ -358,7 +362,6 @@ file(GLOB SOURCE_FILES - ${SDL2_SOURCE_DIR}/src/timer/*.c - ${SDL2_SOURCE_DIR}/src/video/*.c) - -- - if(ASSERTIONS STREQUAL "auto") - # Do nada - use optimization settings to determine the assertion level - elseif(ASSERTIONS STREQUAL "disabled") -@@ -1132,6 +1135,22 @@ elseif(WINDOWS) - file(GLOB CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/windows/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES}) - -+ if(WINDOWS_STORE) -+ cmake_minimum_required(VERSION 3.0) -+ add_definitions(-DSDL_BUILDING_WINRT=1 -ZW) -+ link_libraries( -+ -nodefaultlib:vccorlib$<$:d> -+ -nodefaultlib:msvcrt$<$:d> -+ vccorlib$<$:d>.lib -+ msvcrt$<$:d>.lib -+ ) -+ endif() -+ -+ if(WINDOWS_STORE) -+ file(GLOB WINRT_SOURCE_FILES ${SDL2_SOURCE_DIR}/src/core/winrt/*.c ${SDL2_SOURCE_DIR}/src/core/winrt/*.cpp) -+ set(SOURCE_FILES ${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-") -@@ -1176,7 +1195,11 @@ elseif(WINDOWS) - check_include_file(d3d11_1.h HAVE_D3D11_H) - 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) -+ set(HAVE_DINPUT_H 0) -+ else() -+ check_include_file(dinput.h HAVE_DINPUT_H) -+ endif() - check_include_file(xaudio2.h HAVE_XAUDIO2_H) - check_include_file(mmdeviceapi.h HAVE_MMDEVICEAPI_H) - check_include_file(audioclient.h HAVE_AUDIOCLIENT_H) -@@ -1193,12 +1216,14 @@ elseif(WINDOWS) - endif() - - if(SDL_AUDIO) -- 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}) -- set(HAVE_SDL_AUDIO TRUE) -+ 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}) -+ set(HAVE_SDL_AUDIO TRUE) -+ endif() - -- 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}) -@@ -1208,9 +1233,10 @@ elseif(WINDOWS) - set(SDL_AUDIO_DRIVER_XAUDIO2 1) - file(GLOB XAUDIO2_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/xaudio2/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${XAUDIO2_AUDIO_SOURCES}) -+ set(HAVE_SDL_AUDIO TRUE) - endif() - -- if(HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H) -+ if(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}) -@@ -1222,11 +1248,20 @@ elseif(WINDOWS) - if(NOT SDL_LOADSO) - message_error("SDL_VIDEO requires SDL_LOADSO, which is not enabled") - endif() -- set(SDL_VIDEO_DRIVER_WINDOWS 1) -- file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c) -+ 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() -@@ -1249,20 +1284,31 @@ elseif(WINDOWS) - endif() - - if(SDL_POWER) -- set(SDL_POWER_WINDOWS 1) -- set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/windows/SDL_syspower.c) -+ 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) -- file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/windows/*.c) -+ 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 -- list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid) -+ if(NOT WINDOWS_STORE) -+ list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid) -+ endif() - - # TODO: in configure.in the check for timers is set on - # cygwin | mingw32* - does this include mingw32CE? -@@ -1284,7 +1330,7 @@ elseif(WINDOWS) - 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) -@@ -1688,9 +1734,11 @@ endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") - - # Always build SDLmain --add_library(SDL2main STATIC ${SDLMAIN_SOURCES}) --target_include_directories(SDL2main PUBLIC $) --set(_INSTALL_LIBS "SDL2main") -+if(NOT WINDOWS_STORE) -+ add_library(SDL2main STATIC ${SDLMAIN_SOURCES}) -+ target_include_directories(SDL2main PUBLIC $) -+ set(_INSTALL_LIBS "SDL2main") -+endif() - - if(SDL_SHARED) - add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES}) -diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake -index 9b20398..7ae6e35 100644 ---- a/include/SDL_config.h.cmake -+++ b/include/SDL_config.h.cmake -@@ -298,6 +298,7 @@ - #cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@ - #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@ - #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@ -@@ -365,6 +366,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_HAIKU @SDL_POWER_HAIKU@ - #cmakedefine SDL_POWER_EMSCRIPTEN @SDL_POWER_EMSCRIPTEN@ -@@ -387,7 +389,7 @@ - #cmakedefine SDL_LIBSAMPLERATE_DYNAMIC @SDL_LIBSAMPLERATE_DYNAMIC@ - - /* Platform specific definitions */ --#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/CMakeLists.txt b/CMakeLists.txt +index 0128c7a..bd534e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,18 @@ endif() + cmake_minimum_required(VERSION 2.8.11) + project(SDL2 C) + ++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" +@@ -1166,6 +1178,11 @@ elseif(WINDOWS) + 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-") +@@ -1211,6 +1228,9 @@ elseif(WINDOWS) + 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) ++ 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) +@@ -1229,18 +1249,20 @@ elseif(WINDOWS) + check_include_file(endpointvolume.h HAVE_ENDPOINTVOLUME_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}) +@@ -1252,11 +1274,20 @@ elseif(WINDOWS) + 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() +@@ -1279,20 +1310,31 @@ elseif(WINDOWS) + 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 shell32) ++ endif() + + # TODO: in configure.in the check for timers is set on + # cygwin | mingw32* - does this include mingw32CE? +@@ -1314,7 +1356,7 @@ elseif(WINDOWS) + 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) +@@ -1731,12 +1773,14 @@ endif() + 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(SDL_SHARED) + add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES}) +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 +@@ -324,6 +324,7 @@ + #cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@ + #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@ + #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@ +@@ -392,6 +393,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_HAIKU @SDL_POWER_HAIKU@ + #cmakedefine SDL_POWER_EMSCRIPTEN @SDL_POWER_EMSCRIPTEN@ +@@ -414,7 +416,7 @@ + #cmakedefine SDL_LIBSAMPLERATE_DYNAMIC @SDL_LIBSAMPLERATE_DYNAMIC@ + + /* Platform specific definitions */ +-#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/fix-x86-windows.patch b/ports/sdl2/fix-x86-windows.patch new file mode 100644 index 000000000..853b68722 --- /dev/null +++ b/ports/sdl2/fix-x86-windows.patch @@ -0,0 +1,15 @@ +diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c +index ff23c5e..fc90bba 100644 +--- a/src/events/SDL_mouse.c ++++ b/src/events/SDL_mouse.c +@@ -20,6 +20,10 @@ + */ + #include "../SDL_internal.h" + ++#ifdef __WIN32__ ++#include "../core/windows/SDL_windows.h" ++#endif ++ + /* General mouse handling code for SDL */ + + #include "SDL_assert.h" diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 69d788fb0..4bcfa5a9a 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -3,11 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SDL-Mirror/SDL - REF release-2.0.8 - SHA512 5922dbeb14bb22991160251664b417d3f846867c18b5ecc1bd19c328ffd69b16252b7d45b9a317bafd1207fdb66d93a022dfb239e02447db9babd941956b6b37 + REF release-2.0.9 + SHA512 444c906c0baa720c86ca72d1b4cd66fdf6f516d5d2a9836169081a2997a5aebaaf9caa687ec060fa02292d79cfa4a62442333e00f90a0239edd1601529f6b056 HEAD_REF master PATCHES export-symbols-only-in-shared-build.patch + fix-x86-windows.patch enable-winrt-cmake.patch ) @@ -72,5 +73,5 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2 RENAME copyright) +configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2/copyright COPYONLY) vcpkg_copy_pdbs() -- cgit v1.2.3 From ff64535c7a3799e3617c8dd6507e91387a3b392e Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Fri, 9 Nov 2018 15:45:33 +0000 Subject: [tl-optional] Add port --- ports/tl-optional/CONTROL | 3 +++ ports/tl-optional/portfile.cmake | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/tl-optional/CONTROL create mode 100644 ports/tl-optional/portfile.cmake diff --git a/ports/tl-optional/CONTROL b/ports/tl-optional/CONTROL new file mode 100644 index 000000000..3be044dbe --- /dev/null +++ b/ports/tl-optional/CONTROL @@ -0,0 +1,3 @@ +Source: tl-optional +Version: 0.5-1 +Description: C++11/14/17 std::optional implementation with functional-style extensions diff --git a/ports/tl-optional/portfile.cmake b/ports/tl-optional/portfile.cmake new file mode 100644 index 000000000..b6d98b9e0 --- /dev/null +++ b/ports/tl-optional/portfile.cmake @@ -0,0 +1,15 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/optional + REF v0.5 + SHA512 f4f72c1ba431737fb7b1b6468b7dbbb025f299775e0a3401993490a60d5999d31ccf1e48c0cd57836293a5534ea4749b9f1c8f65f896144204af3389a5e512f9 + HEAD_REF master +) + +# Install header file +file(INSTALL ${SOURCE_PATH}/tl DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-optional RENAME copyright) -- cgit v1.2.3 From caa3f2c36f2cdff6aedec25136415afc61771821 Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Fri, 9 Nov 2018 23:31:40 +0000 Subject: [cub] Initial port --- ports/cub/CONTROL | 4 ++++ ports/cub/portfile.cmake | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 ports/cub/CONTROL create mode 100644 ports/cub/portfile.cmake diff --git a/ports/cub/CONTROL b/ports/cub/CONTROL new file mode 100644 index 000000000..7c62c25a2 --- /dev/null +++ b/ports/cub/CONTROL @@ -0,0 +1,4 @@ +Source: cub +Version: 1.8.0 +Description: CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming +Build-Depends: cuda diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake new file mode 100644 index 000000000..302bfb706 --- /dev/null +++ b/ports/cub/portfile.cmake @@ -0,0 +1,12 @@ +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NVlabs/cub + REF v1.8.0 + SHA512 c4ba51ca4e369c8ef87bc411aa011470478fcc2526b667f088e9ac8c62e6532dc2368e869f5147b56f22b3e8718c7276434c3294d9d67cb3a92c700d163e8fa7 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/cub/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cub) + +configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/cub/copyright COPYONLY) -- cgit v1.2.3 From 82d65261da9e01572ccb5e19044d03da5b69c8ff Mon Sep 17 00:00:00 2001 From: TsukasaSugiura Date: Sun, 11 Nov 2018 23:16:11 +0900 Subject: [freeimage] Update to FreeImage 3.18.0 Update FreeImage port to FreeImage 3.18.0. --- ports/freeimage/CMakeLists.txt | 5 ++--- ports/freeimage/CONTROL | 2 +- ports/freeimage/portfile.cmake | 6 +++--- ports/freeimage/use-external-webp.patch | 5 ++--- ports/freeimage/use-freeimage-config-include.patch | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 9f4f1677b..2d3e3cb57 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -36,9 +36,8 @@ set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h ${REAL_SOURCE_DIR}/Plugin.h ${REAL_SOURCE_DIR}/Quantizers.h ${REAL_SOURCE_DIR}/ToneMapping.h - ${REAL_SOURCE_DIR}/Utilities.h - ${REAL_SOURCE_DIR}/DeprecationManager/DeprecationMgr.h) - + ${REAL_SOURCE_DIR}/Utilities.h) + file(GLOB FREEIMAGE_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImage/*.h) file(GLOB FREEIMAGE_TOOLKIT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImageToolkit/*.h) file(GLOB METADATA_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/Metadata/*.h) diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 6e8de82fc..844e13ae2 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,4 +1,4 @@ Source: freeimage -Version: 3.17.0-4 +Version: 3.18.0-1 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr Description: Support library for graphics image formats diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index db8d2537a..8713f5ba5 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -2,9 +2,9 @@ include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeImage) vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.sourceforge.net/freeimage/FreeImage3170.zip" - FILENAME "FreeImage3170.zip" - SHA512 703c2626c0bcfe73eb40d720f45745208ca9650a7730759680a2b38ad3f6c719a43008477032bc70b76a95761f7d4b6f901b961359d36b54ace906dd78fb391b + URLS "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip" + FILENAME "FreeImage3180.zip" + SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/freeimage/use-external-webp.patch b/ports/freeimage/use-external-webp.patch index ae6328431..4d1757c39 100644 --- a/ports/freeimage/use-external-webp.patch +++ b/ports/freeimage/use-external-webp.patch @@ -1,14 +1,13 @@ diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp -index 9fb0b69..c401447 100644 +index 7c9f62f..c401447 100644 --- a/Source/FreeImage/PluginWebP.cpp +++ b/Source/FreeImage/PluginWebP.cpp -@@ -24,10 +24,9 @@ +@@ -24,9 +24,9 @@ #include "../Metadata/FreeImageTag.h" -#include "../LibWebP/src/webp/decode.h" -#include "../LibWebP/src/webp/encode.h" --#include "../LibWebP/src/enc/vp8enci.h" -#include "../LibWebP/src/webp/mux.h" +#include +#include diff --git a/ports/freeimage/use-freeimage-config-include.patch b/ports/freeimage/use-freeimage-config-include.patch index 4927aff5b..579f08845 100644 --- a/ports/freeimage/use-freeimage-config-include.patch +++ b/ports/freeimage/use-freeimage-config-include.patch @@ -1,9 +1,9 @@ diff --git a/Source/FreeImage.h b/Source/FreeImage.h -index cc66b7d..cc66812 100644 +index 12182cd..86a1e68 100644 --- a/Source/FreeImage.h +++ b/Source/FreeImage.h @@ -32,6 +32,11 @@ - #define FREEIMAGE_MINOR_VERSION 17 + #define FREEIMAGE_MINOR_VERSION 18 #define FREEIMAGE_RELEASE_SERIAL 0 +// vcpkg specific includes -------------------------------------------------- -- cgit v1.2.3 From ad65638eb3c015aa20743ca4140b1a274cef6659 Mon Sep 17 00:00:00 2001 From: TsukasaSugiura Date: Sun, 11 Nov 2018 23:19:42 +0900 Subject: [freeimage] Fix function overload with libjpeg-turbo 2.0.0 Fix function overload with libjpeg-turbo 2.0.0 (jpeg_read_icc_profile and jpeg_write_icc_profile). --- ports/freeimage/CMakeLists.txt | 3 +++ ports/freeimage/CONTROL | 2 +- ports/freeimage/fix-function-overload.patch | 40 +++++++++++++++++++++++++++++ ports/freeimage/portfile.cmake | 1 + 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 ports/freeimage/fix-function-overload.patch diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 2d3e3cb57..997fba37a 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -7,6 +7,9 @@ project(FreeImage C CXX) find_package(zlib REQUIRED) find_package(PNG REQUIRED) find_package(JPEG REQUIRED) +if(NOT JPEG_LIBRARY_DEBUG) + set(JPEG_LIBRARY_DEBUG ${JPEG_LIBRARY_RELEASE}) +endif() find_package(TIFF REQUIRED) find_package(OPENJPEG REQUIRED) diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 844e13ae2..d8bd820e6 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,4 +1,4 @@ Source: freeimage -Version: 3.18.0-1 +Version: 3.18.0-2 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr Description: Support library for graphics image formats diff --git a/ports/freeimage/fix-function-overload.patch b/ports/freeimage/fix-function-overload.patch new file mode 100644 index 000000000..adb1164f6 --- /dev/null +++ b/ports/freeimage/fix-function-overload.patch @@ -0,0 +1,40 @@ +diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp +index 8db177d..efa2c4e 100644 +--- a/Source/FreeImage/PluginJPEG.cpp ++++ b/Source/FreeImage/PluginJPEG.cpp +@@ -503,7 +503,7 @@ marker_is_icc(jpeg_saved_marker_ptr marker) { + return FALSE. You might want to issue an error message instead. + */ + static BOOL +-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { ++jpeg_read_icc_profile_(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { + jpeg_saved_marker_ptr marker; + int num_markers = 0; + int seq_no; +@@ -745,7 +745,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) { + BYTE *icc_profile = NULL; + unsigned icc_length = 0; + +- if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) { ++ if( jpeg_read_icc_profile_(cinfo, &icc_profile, &icc_length) ) { + // copy ICC profile data + FreeImage_CreateICCProfile(dib, icc_profile, icc_length); + // clean up +@@ -785,7 +785,7 @@ jpeg_write_comment(j_compress_ptr cinfo, FIBITMAP *dib) { + Write JPEG_APP2 marker (ICC profile) + */ + static BOOL +-jpeg_write_icc_profile(j_compress_ptr cinfo, FIBITMAP *dib) { ++jpeg_write_icc_profile_(j_compress_ptr cinfo, FIBITMAP *dib) { + // marker identifying string "ICC_PROFILE" (null-terminated) + BYTE icc_signature[12] = { 0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00 }; + +@@ -1038,7 +1038,7 @@ write_markers(j_compress_ptr cinfo, FIBITMAP *dib) { + jpeg_write_comment(cinfo, dib); + + // write ICC profile +- jpeg_write_icc_profile(cinfo, dib); ++ jpeg_write_icc_profile_(cinfo, dib); + + // write IPTC profile + jpeg_write_iptc_profile(cinfo, dib); diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index 8713f5ba5..6f3cfaebe 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch" "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch" "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch" ) vcpkg_configure_cmake( -- cgit v1.2.3 From 36f75be5a55cd7a1daa69623fbf19ee92dcebc4d Mon Sep 17 00:00:00 2001 From: crackedmind Date: Mon, 12 Nov 2018 10:54:36 +0300 Subject: [cli11] Initial port --- ports/cli11/CONTROL | 3 +++ ports/cli11/portfile.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/cli11/CONTROL create mode 100644 ports/cli11/portfile.cmake diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL new file mode 100644 index 000000000..5174d7037 --- /dev/null +++ b/ports/cli11/CONTROL @@ -0,0 +1,3 @@ +Source: cli11 +Version: 1.6.1 +Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake new file mode 100644 index 000000000..bda9fa2b3 --- /dev/null +++ b/ports/cli11/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CLIUtils/CLI11 + REF v1.6.1 + SHA512 df12510bb78823908535a68af65fb8ea0b8b33b362e0b5f2cfa91223db7ebd9e71a55dfe31902c5d10e29c02a9bb59be58f8c69da7a9b4ab456ace64f200ac93 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCLI11_TESTING=OFF + -DCLI11_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CLI11) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli11 RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME cli11) -- cgit v1.2.3 From 62a2530385517147049ba41cc80affa905c8bdb5 Mon Sep 17 00:00:00 2001 From: TsukasaSugiura Date: Mon, 12 Nov 2018 19:55:47 +0900 Subject: [vxl] Update to VXL v1.18.0 Update vxl port to VXL v1.18.0. --- ports/vxl/CONTROL | 5 +++-- ports/vxl/portfile.cmake | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL index 52d725f45..bb187ed71 100644 --- a/ports/vxl/CONTROL +++ b/ports/vxl/CONTROL @@ -1,4 +1,5 @@ Source: vxl -Version: 20180414-7a130cf-1 -Build-Depends: zlib, tiff, expat, libpng, bzip2, libjpeg-turbo, shapelib, libgeotiff +Version: v1.18.0-1 +Build-Depends: bzip2, libgeotiff, libjpeg-turbo, libpng, tiff, zlib, expat, shapelib +# Build-Depends: bzip2, dcmtk, libgeotiff, libjpeg-turbo, openjpeg, libpng, tiff, zlib Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding. diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 7e27591e5..89a82219c 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -1,29 +1,45 @@ include(vcpkg_common_functions) +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h") + message(FATAL_ERROR "Can't build VXL with non built-in OpenJpeg in current version. Please remove OpenJpeg, and try install VXL again.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vxl/vxl - REF 7a130cf05e907a6500e3e717297082c46e77f524 - SHA512 b9f7e48e37b44469031c6de1bf2a3d0aa0ecf4d3c2f4dd0d1a84c273ca8a778b48f3caf7ec6ef0f2dea1dc534ebfdb6b2cde47a56d81aa4f0685114c0bda157c + REF v1.18.0 + SHA512 6666d647b2e7010b91cb0b05016b5f49ae46d198f6bd160fe13fc09bc674eff5b937331fa11d81a8496473968b63452d950eee4fc2512152af57304a14bed63f HEAD_REF master ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) + +set(USE_WIN_WCHAR_T OFF) +if(WIN32) + set(USE_WIN_WCHAR_T ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DVXL_USING_NATIVE_ZLIB=ON - -DVXL_USING_NATIVE_BZLIB2=ON - -DVXL_USING_NATIVE_JPEG=ON - -DVXL_USING_NATIVE_TIFF=ON - -DVXL_USING_NATIVE_EXPAT=ON - -DVXL_USING_NATIVE_PNG=ON - -DVXL_USING_NATIVE_SHAPELIB=ON - -DVXL_USING_NATIVE_GEOTIFF=ON - -DVXL_FORCE_V3P_OPENJPEG2=ON - -DVXL_FORCE_V3P_J2K=ON - -DBUILD_TESTING=OFF + -DBUILD_SHARED_LIBS=${VXL_SHARED_LIBS} -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DVXL_FORCE_V3P_BZLIB2=OFF + -DVXL_USING_NATIVE_BZLIB2=TRUE # for disable build built-in bzip2 (v3p/bzlib/CMakeLists.txt#L10-L26) + -DVXL_FORCE_V3P_CLIPPER=ON # TODO : need add clipper port to turn off + -DVXL_FORCE_V3P_DCMTK=OFF + -DVXL_FORCE_V3P_GEOTIFF=OFF + -DVXL_FORCE_V3P_J2K=OFF + -DVXL_FORCE_V3P_JPEG=OFF + -DVXL_FORCE_V3P_OPENJPEG2=ON # TODO : need fix compile error when using openjpeg port to turn off + -DVXL_FORCE_V3P_PNG=OFF + -DVXL_FORCE_V3P_TIFF=OFF + -DVXL_FORCE_V3P_ZLIB=OFF + -DVXL_USE_DCMTK=OFF # TODO : need fix dcmtk support to turn on + -DXVL_USE_GEOTIFF=ON + -DVXL_USE_WIN_WCHAR_T=${USE_WIN_WCHAR_T} ) vcpkg_install_cmake() -- cgit v1.2.3 From 3470a05a6d6ad8384283099465d29bf4f4d29f63 Mon Sep 17 00:00:00 2001 From: eao197 Date: Mon, 12 Nov 2018 16:20:20 +0300 Subject: Port for so_5_extra (at v.1.2.1) --- ports/so5extra/CONTROL | 4 ++++ ports/so5extra/portfile.cmake | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/so5extra/CONTROL create mode 100644 ports/so5extra/portfile.cmake diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL new file mode 100644 index 000000000..41bed72c8 --- /dev/null +++ b/ports/so5extra/CONTROL @@ -0,0 +1,4 @@ +Source: so5extra +Version: 1.2.1 +Description: A set of additional tools for SObjectizer framework. +Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake new file mode 100644 index 000000000..3d21def42 --- /dev/null +++ b/ports/so5extra/portfile.cmake @@ -0,0 +1,28 @@ +include(vcpkg_common_functions) + +set(VERSION 1.2.1) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so_5_extra-${VERSION}/dev/so_5_extra) + +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/so_5_extra/so_5_extra-${VERSION}.zip/download" + FILENAME "so_5_extra-${VERSION}.zip" + SHA512 84294839c800571e98e5599a16609c955296bb10ad90261c5600d3eb13fd1dfc08a7a895e89ad48b3547c9ebe28cd49c944158849a4f1d8e693d8d2259e94100 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DSO5EXTRA_INSTALL=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/so5extra") + +# Remove unnecessary stuff. +# These paths are empty and should be removed too. +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/../../LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/so5extra RENAME copyright) -- cgit v1.2.3 From 27a6b6bbee07a0b425c2f77bdf17cdbfd230a867 Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Fri, 9 Nov 2018 13:41:16 +0000 Subject: [glad] inital commit --- ports/glad/CONTROL | 3 +++ ports/glad/portfile.cmake | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 ports/glad/CONTROL create mode 100644 ports/glad/portfile.cmake diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL new file mode 100644 index 000000000..099da1cdf --- /dev/null +++ b/ports/glad/CONTROL @@ -0,0 +1,3 @@ +Source: glad +Version: 0.1.28 +Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs. diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake new file mode 100644 index 000000000..d2fc4246e --- /dev/null +++ b/ports/glad/portfile.cmake @@ -0,0 +1,32 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Dav1dde/glad + REF v0.1.28 + SHA512 5895e25bffab4ead346f65011cbb52a434779fed1dad619ffde27f68b52994cd0b048a45b4533b22b54971dfdba935d93fcf6bee5789061d0057af869b95998c + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGLAD_NO_LOADER=OFF + -DGLAD_EXPORT=OFF + -DGLAD_INSTALL=ON + -DGLAD_REPRODUCIBLE=ON + -DGLAD_SPEC="gl" # {gl,egl,glx,wgl} + -DGLAD_PROFILE="compatibility" # {core,compatibility} + OPTIONS_DEBUG + -DGLAD_GENERATOR="c-debug" +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glad) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/glad/copyright COPYONLY) -- cgit v1.2.3 From 90f4901b23e6f75213637cb1f755d93eb3598566 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 13 Nov 2018 15:50:45 -0500 Subject: fixed setversion.exe so patch is not necessary --- ports/ecsutil/disable-setversion.patch | 36 ---------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 ports/ecsutil/disable-setversion.patch diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch deleted file mode 100644 index 2899a0108..000000000 --- a/ports/ecsutil/disable-setversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj -index 05c5726..f8ac64e 100644 ---- a/ECSUtil/ECSUtil.vcxproj -+++ b/ECSUtil/ECSUtil.vcxproj -@@ -274,7 +274,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -361,7 +360,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -445,7 +443,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -541,7 +538,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -- cgit v1.2.3 From 54095ce882d70d111b6219709656ff2192fd53c5 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 13 Nov 2018 15:02:29 -0800 Subject: [glad] fix python2 dependancy --- ports/glad/CONTROL | 2 +- ports/glad/portfile.cmake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL index 099da1cdf..e8354c205 100644 --- a/ports/glad/CONTROL +++ b/ports/glad/CONTROL @@ -1,3 +1,3 @@ Source: glad -Version: 0.1.28 +Version: 0.1.28-2 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs. diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index d2fc4246e..432c14503 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -10,6 +10,10 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +set(ENV{PATH} "$ENV{PATH};${PYTHON2_DIR}") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA -- cgit v1.2.3 From 1ffc1b569dc27ef7b70c1861d5913516722947de Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 14 Nov 2018 22:05:11 +0300 Subject: [gtest] Update to version 1.8.1 (#4220) * [gtest] Update to version 1.8.1 * [gtest] Fix typo in cmake adjustment code. Revert usage to follow CMake official guidelines. --- ...-11-features-for-VS2015-fix-appveyor-fail.patch | 180 --------------------- ports/gtest/CONTROL | 2 +- ports/gtest/portfile.cmake | 59 +++---- ports/gtest/usage | 2 +- 4 files changed, 28 insertions(+), 215 deletions(-) delete mode 100644 ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch diff --git a/ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch b/ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch deleted file mode 100644 index b5082a1b2..000000000 --- a/ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/.gitignore b/.gitignore -index ce310bc..08a67cd 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,2 +1,15 @@ - # Ignore CI build directory - build/ -+_build/ -+ -+# Visual Studio files -+*.sdf -+*.opensdf -+*.VC.opendb -+*.suo -+*.user -+_ReSharper.Caches/ -+Win32-Debug/ -+Win32-Release/ -+x64-Debug/ -+x64-Release/ -diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc -index 9f62c3d..eaba362 100644 ---- a/googlemock/test/gmock-matchers_test.cc -+++ b/googlemock/test/gmock-matchers_test.cc -@@ -58,6 +58,11 @@ - # include // NOLINT - #endif - -+// Disable MSVC warning: "decorated name length exceeded, name was truncated". -+#ifdef _MSC_VER -+# pragma warning(disable:4503) -+#endif -+ - namespace testing { - - namespace internal { -diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h -index 0094ed5..09779fa 100644 ---- a/googletest/include/gtest/internal/gtest-port.h -+++ b/googletest/include/gtest/internal/gtest-port.h -@@ -323,7 +323,7 @@ - // -std={c,gnu}++{0x,11} is passed. The C++11 standard specifies a - // value for __cplusplus, and recent versions of clang, gcc, and - // probably other compilers set that too in C++11 mode. --# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L -+# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L || _MSC_VER >= 1900 - // Compiling in at least C++11 mode. - # define GTEST_LANG_CXX11 1 - # else -@@ -355,12 +355,16 @@ - #if GTEST_STDLIB_CXX11 - # define GTEST_HAS_STD_BEGIN_AND_END_ 1 - # define GTEST_HAS_STD_FORWARD_LIST_ 1 --# define GTEST_HAS_STD_FUNCTION_ 1 -+# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) // works only with VS2015U2 and better -+# define GTEST_HAS_STD_FUNCTION_ 1 -+# endif - # define GTEST_HAS_STD_INITIALIZER_LIST_ 1 - # define GTEST_HAS_STD_MOVE_ 1 - # define GTEST_HAS_STD_SHARED_PTR_ 1 - # define GTEST_HAS_STD_TYPE_TRAITS_ 1 - # define GTEST_HAS_STD_UNIQUE_PTR_ 1 -+# define GTEST_HAS_UNORDERED_MAP_ 1 -+# define GTEST_HAS_UNORDERED_SET_ 1 - #endif - - // C++11 specifies that provides std::tuple. -@@ -616,7 +620,7 @@ struct _RTL_CRITICAL_SECTION; - // Determines if hash_map/hash_set are available. - // Only used for testing against those containers. - #if !defined(GTEST_HAS_HASH_MAP_) --# if _MSC_VER -+# if defined(_MSC_VER) && (_MSC_VER < 1900) - # define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available. - # define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available. - # endif // _MSC_VER -@@ -629,6 +633,9 @@ struct _RTL_CRITICAL_SECTION; - # if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) - // STLport, provided with the Android NDK, has neither or . - # define GTEST_HAS_TR1_TUPLE 0 -+# elif defined(_MSC_VER) && (_MSC_VER >= 1910) -+// Prevent `warning C4996: 'std::tr1': warning STL4002: The non-Standard std::tr1 namespace and TR1-only machinery are deprecated and will be REMOVED.` -+# define GTEST_HAS_TR1_TUPLE 0 - # else - // The user didn't tell us not to do it, so we assume it's OK. - # define GTEST_HAS_TR1_TUPLE 1 -@@ -813,7 +820,7 @@ using ::std::tuple_size; - // value-parameterized tests are enabled. The implementation doesn't - // work on Sun Studio since it doesn't understand templated conversion - // operators. --#if GTEST_HAS_PARAM_TEST && GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC) -+#if GTEST_HAS_PARAM_TEST && (GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_) && !defined(__SUNPRO_CC) - # define GTEST_HAS_COMBINE 1 - #endif - -diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc -index 3e97cc2..6320563 100644 ---- a/googletest/test/gtest-printers_test.cc -+++ b/googletest/test/gtest-printers_test.cc -@@ -51,10 +51,15 @@ - #include "gtest/gtest.h" - - // hash_map and hash_set are available under Visual C++, or on Linux. --#if GTEST_HAS_HASH_MAP_ -+#if GTEST_HAS_UNORDERED_MAP_ -+# include // NOLINT -+#elif GTEST_HAS_HASH_MAP_ - # include // NOLINT - #endif // GTEST_HAS_HASH_MAP_ --#if GTEST_HAS_HASH_SET_ -+ -+#if GTEST_HAS_UNORDERED_SET_ -+# include // NOLINT -+#elif GTEST_HAS_HASH_SET_ - # include // NOLINT - #endif // GTEST_HAS_HASH_SET_ - -@@ -217,18 +222,46 @@ using ::testing::internal::string; - // The hash_* classes are not part of the C++ standard. STLport - // defines them in namespace std. MSVC defines them in ::stdext. GCC - // defines them in ::. -+#if GTEST_HAS_UNORDERED_MAP_ -+ -+#define GTEST_HAS_HASH_MAP_ 1 -+template -+using hash_map = ::std::unordered_map; -+template -+using hash_multimap = ::std::unordered_multimap; -+ -+#elif GTEST_HAS_HASH_MAP_ -+ - #ifdef _STLP_HASH_MAP // We got from STLport. - using ::std::hash_map; --using ::std::hash_set; - using ::std::hash_multimap; --using ::std::hash_multiset; - #elif _MSC_VER - using ::stdext::hash_map; --using ::stdext::hash_set; - using ::stdext::hash_multimap; -+#endif -+ -+#endif -+ -+#if GTEST_HAS_UNORDERED_SET_ -+ -+#define GTEST_HAS_HASH_SET_ 1 -+template -+using hash_set = ::std::unordered_set; -+template -+using hash_multiset = ::std::unordered_multiset; -+ -+#elif GTEST_HAS_HASH_SET_ -+ -+#ifdef _STLP_HASH_MAP // We got from STLport. -+using ::std::hash_set; -+using ::std::hash_multiset; -+#elif _MSC_VER -+using ::stdext::hash_set; - using ::stdext::hash_multiset; - #endif - -+#endif -+ - // Prints a value to a string using the universal value printer. This - // is a helper for testing UniversalPrinter::Print() for various types. - template -diff --git a/googletest/test/gtest_catch_exceptions_test_.cc b/googletest/test/gtest_catch_exceptions_test_.cc -index d0fc82c..c6d953c 100644 ---- a/googletest/test/gtest_catch_exceptions_test_.cc -+++ b/googletest/test/gtest_catch_exceptions_test_.cc -@@ -138,7 +138,7 @@ TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) { - } - - // Exceptions in destructors are not supported in C++11. --#if !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L -+#if !GTEST_LANG_CXX11 - class CxxExceptionInDestructorTest : public Test { - public: - static void TearDownTestCase() { diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index fbb19eaf6..5b3a7c465 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,3 +1,3 @@ Source: gtest -Version: 1.8.0-9 +Version: 1.8.1-1 Description: GoogleTest and GoogleMock testing frameworks. diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 87b3ce907..4b0857de4 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -7,12 +7,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest - REF ba96d0b1161f540656efdaed035b3c062b60e006 - SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600 + REF release-1.8.1 + SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 HEAD_REF master - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch - ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-z7-override.patch + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-z7-override.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) @@ -20,16 +19,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS -DBUILD_GMOCK=ON -DBUILD_GTEST=ON -DCMAKE_DEBUG_POSTFIX=d -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT} ) -set(ENV{_CL_} "/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") - vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/GTest) file( INSTALL @@ -50,35 +48,30 @@ file( file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtest RENAME copyright) -# This block will be unnecessary in googletest 1.9.0 (or later). -# These dll files are installed in ../bin directory by default settings. -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest.dll ${CURRENT_PACKAGES_DIR}/bin/gtest.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest_main.dll ${CURRENT_PACKAGES_DIR}/bin/gtest_main.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/bin/gmock.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/bin/gmock_main.dll) -endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin/) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtestd.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest_maind.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmockd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmockd.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock_maind.dll) +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib) + + file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake DEBUG_CONFIG) + string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gtest_maind.lib" + "\${_IMPORT_PREFIX}/debug/lib/manual-link/gtest_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}") + string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gmock_maind.lib" + "\${_IMPORT_PREFIX}/debug/lib/manual-link/gmock_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake "${DEBUG_CONFIG}") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.lib) + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gtest.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gtest_main.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock_main.lib) -endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtestd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmockd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmockd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib) + + file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake RELEASE_CONFIG) + string(REPLACE "\${_IMPORT_PREFIX}/lib/gtest_main.lib" + "\${_IMPORT_PREFIX}/lib/manual-link/gtest_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}") + string(REPLACE "\${_IMPORT_PREFIX}/lib/gmock_main.lib" + "\${_IMPORT_PREFIX}/lib/manual-link/gmock_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake "${RELEASE_CONFIG}") endif() vcpkg_copy_pdbs() diff --git a/ports/gtest/usage b/ports/gtest/usage index fa226ceed..d40782e0e 100644 --- a/ports/gtest/usage +++ b/ports/gtest/usage @@ -1,6 +1,6 @@ The package gtest is compatible with built-in CMake targets: enable_testing() - find_package(GTest REQUIRED) + find_package(GTest MODULE REQUIRED) target_link_libraries(main PRIVATE GTest::GTest GTest::Main) add_test(AllTestsInMain main) -- cgit v1.2.3 From 075d0d4ecd95c3567580411087a1d7f2cda3c6bd Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Thu, 15 Nov 2018 04:12:36 +0900 Subject: [qhull] Remove tools of debug configuration (#4681) Remove tools of debug configuration. (/debug/tools/qhull) It is unnecessary. --- ports/qhull/CONTROL | 2 +- ports/qhull/portfile.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL index 8eb3f8772..411b3ee7c 100644 --- a/ports/qhull/CONTROL +++ b/ports/qhull/CONTROL @@ -1,3 +1,3 @@ Source: qhull -Version: 2015.2-2 +Version: 2015.2-3 Description: computes the convex hull, Delaunay triangulation, Voronoi diagram diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake index 25ee8f0d1..c13287b0f 100644 --- a/ports/qhull/portfile.cmake +++ b/ports/qhull/portfile.cmake @@ -31,7 +31,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qhull) -file(COPY ${EXEFILES_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/qhull) file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") -- cgit v1.2.3 From 74360420458e01b72e519830cb2bc4017a986a90 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Wed, 14 Nov 2018 20:16:07 +0100 Subject: Add prometheus-cpp (and civetweb) (#4694) * [prometheus-cpp] Initial port Closes: jupp0r/prometheus-cpp#130 * [civetweb] Initial port * [prometheus-cpp][civetweb] Cleanup. Update to 0.6.0. --- ports/civetweb/CONTROL | 3 +++ ports/civetweb/portfile.cmake | 36 +++++++++++++++++++++++++++++++ ports/prometheus-cpp/CONTROL | 16 ++++++++++++++ ports/prometheus-cpp/portfile.cmake | 43 +++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 ports/civetweb/CONTROL create mode 100644 ports/civetweb/portfile.cmake create mode 100644 ports/prometheus-cpp/CONTROL create mode 100644 ports/prometheus-cpp/portfile.cmake diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL new file mode 100644 index 000000000..a8b0832e0 --- /dev/null +++ b/ports/civetweb/CONTROL @@ -0,0 +1,3 @@ +Source: civetweb +Version: 1.11-1 +Description: Easy to use, powerful, C/C++ embeddable web server. diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake new file mode 100644 index 000000000..8ad7af538 --- /dev/null +++ b/ports/civetweb/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +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 civetweb/civetweb + REF v1.11 + SHA512 e1520fd2f4a54b6ab4838f4da2ce3f0956e9884059467d196078935a3fce61dad619f3bb1bc2b4c6a757e1a8abfed0e83cba38957c7c52fff235676e9dd1d428 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCIVETWEB_BUILD_TESTING=OFF + -DCIVETWEB_ENABLE_ASAN=OFF + -DCIVETWEB_ENABLE_CXX=ON + -DCIVETWEB_ENABLE_IPV6=ON + -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF + -DCIVETWEB_ENABLE_SSL=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/civetweb/copyright COPYONLY) diff --git a/ports/prometheus-cpp/CONTROL b/ports/prometheus-cpp/CONTROL new file mode 100644 index 000000000..e89b84cb2 --- /dev/null +++ b/ports/prometheus-cpp/CONTROL @@ -0,0 +1,16 @@ +Source: prometheus-cpp +Version: 0.6.0 +Description: Prometheus Client Library for Modern C++ +Default-Features: compression, pull + +Feature: compression +Build-Depends: zlib +Description: Enable zlib compression + +Feature: pull +Build-Depends: civetweb +Description: Support for regular pull mode + +Feature: push +Build-Depends: curl +Description: Support push gateway diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake new file mode 100644 index 000000000..388623d48 --- /dev/null +++ b/ports/prometheus-cpp/portfile.cmake @@ -0,0 +1,43 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jupp0r/prometheus-cpp + REF v0.6.0 + SHA512 a7e6f902f3007007ec68add5ac63e833c6f383ed0ce103e238b7248497f495e664446df7801000e36021adcb7cfb1d461bbb45e1b4fba9ffa4edfcaf5b5957dd + HEAD_REF master +) + +macro(feature FEATURENAME OPTIONNAME) + if("${FEATURENAME}" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -D${OPTIONNAME}=TRUE) + else() + list(APPEND FEATURE_OPTIONS -D${OPTIONNAME}=FALSE) + endif() +endmacro() + +feature(compression ENABLE_COMPRESSION) +feature(pull ENABLE_PULL) +feature(push ENABLE_PUSH) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSE_THIRDPARTY_LIBRARIES=OFF # use vcpkg packages + -DENABLE_TESTING=FALSE # need gtest 1.8.1 + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/prometheus-cpp) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/prometheus-cpp/copyright COPYONLY) -- cgit v1.2.3 From 802bc881f5725e4946329f51163747c880b7c267 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 14 Nov 2018 11:28:02 -0800 Subject: [vxl] Slight cleanup -- use VCPKG_CMAKE_SYSTEM_NAME to determine target instead of WIN32 --- ports/vxl/CONTROL | 2 +- ports/vxl/portfile.cmake | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL index bb187ed71..d9340d9f3 100644 --- a/ports/vxl/CONTROL +++ b/ports/vxl/CONTROL @@ -1,5 +1,5 @@ Source: vxl -Version: v1.18.0-1 +Version: v1.18.0-2 Build-Depends: bzip2, libgeotiff, libjpeg-turbo, libpng, tiff, zlib, expat, shapelib # Build-Depends: bzip2, dcmtk, libgeotiff, libjpeg-turbo, openjpeg, libpng, tiff, zlib Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding. diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 89a82219c..75d89ee2d 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -12,10 +12,8 @@ vcpkg_from_github( HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) - set(USE_WIN_WCHAR_T OFF) -if(WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(USE_WIN_WCHAR_T ON) endif() @@ -23,7 +21,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=${VXL_SHARED_LIBS} -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DVXL_FORCE_V3P_BZLIB2=OFF -- cgit v1.2.3 From df35c1f7d7babef240e85bb809cf03990a735b0b Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 14 Nov 2018 18:20:54 -0500 Subject: Update google-cloud-cpp to 0.3.0. (#4719) * Update google-cloud-cpp to 0.3.0. A new release of google-cloud-cpp, with some improvements in packaging that simplified the port files. * [google-cloud-cpp] Fix OSX builds --- ports/google-cloud-cpp/CONTROL | 4 +-- ports/google-cloud-cpp/include-protobuf.patch | 37 ++++++++++----------------- ports/google-cloud-cpp/portfile.cmake | 21 +++++++-------- 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 663e2de3a..7a64d2e14 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.1.0-1 -Build-Depends: grpc, gtest +Version: 0.3.0-1 +Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch index 63602ad72..d0e3529c7 100644 --- a/ports/google-cloud-cpp/include-protobuf.patch +++ b/ports/google-cloud-cpp/include-protobuf.patch @@ -1,24 +1,13 @@ -diff --git a/bigtable/CMakeLists.txt b/bigtable/CMakeLists.txt -index 1b8089f..771e1ec 100644 ---- a/bigtable/CMakeLists.txt -+++ b/bigtable/CMakeLists.txt -@@ -69,6 +69,10 @@ set(PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" "${PROJECT_SOUR - if(GRPC_ROOT_DIR) - list(INSERT PROTOBUF_IMPORT_DIRS 0 "${GRPC_ROOT_DIR}/third_party/protobuf/src") - endif(GRPC_ROOT_DIR) -+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto) -+if(PROTO_INCLUDE_DIR) -+ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}") -+endif() - - # Get the destination directories based on the GNU recommendations. - include(GNUInstallDirs) -@@ -110,7 +114,7 @@ enable_testing() - - # Capture the compiler version and the git revision into variables, then - # generate a config file with the values. --if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git) -+if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git AND 0) - execute_process(COMMAND git rev-parse --short HEAD - OUTPUT_VARIABLE GIT_HEAD_LOG ERROR_VARIABLE GIT_HEAD_LOG) - else () +--- a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:56:34.029389338 -0500 ++++ a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:57:18.461259917 -0500 +@@ -53,6 +53,10 @@ + # Configure the location of proto files, particulary the googleapis protos. + list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" + "${PROJECT_SOURCE_DIR}") ++find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto) ++if(PROTO_INCLUDE_DIR) ++ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}") ++endif() + + # Include the functions to compile proto files. + include(CompileProtos) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 8ba1fffe5..2081b20f7 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -8,18 +8,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.1.0 - SHA512 3947cc24ca1ed97309f055f17945afe2d6b22ae8f54f86d3395f8c491b7409d4b7bb12206889d04d07f51236e9fd5afd65b904c8c80521a3313588d8069545c2 + REF v0.3.0 + SHA512 90f876ebf4bea40c5bc12d2bd20d27b48202f951d57a68b657c07b7d468b2ac5a00e39a3a6fca48f92030d89ba7d9706eb52b3c8e734b392aee63632af042b5d HEAD_REF master - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/include-protobuf.patch" + PATCHES include-protobuf.patch ) -set(GOOGLEAPIS_VERSION 92f10d7033c6fa36e1a5a369ab5aa8bafd564009) +set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97) vcpkg_download_distfile(GOOGLEAPIS - URLS "https://github.com/google/googleapis/archive/92f10d7033c6fa36e1a5a369ab5aa8bafd564009.zip" + URLS "https://github.com/google/googleapis/archive/${GOOGLEAPIS_VERSION}.zip" FILENAME "googleapis-${GOOGLEAPIS_VERSION}.zip" - SHA512 4280ece965a231f6a0bb3ea38a961d15babd9eac517f9b0d57e12f186481bbab6a27e4f0ee03ba3c587c9aa93d3c2e6c95f67f50365c65bb10594f0229279287 + SHA512 809b7cf0429df9867c8ab558857785e9d7d70aea033c6d588b60d29d2754001e9aea5fcdd8cae22fad8145226375bedbd1516d86af7d1e9731fffea331995ad9 ) file(REMOVE_RECURSE ${SOURCE_PATH}/third_party) @@ -30,16 +29,14 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=vcpkg - -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=vcpkg + -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=vcpkg + -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bigtable/client/testing) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake TARGET_PATH share/bigtable_client) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/google-cloud-cpp RENAME copyright) -- cgit v1.2.3 From 3b40d323e92866222f6dd15b00c7a79abde9aedb Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Wed, 14 Nov 2018 21:23:06 -0200 Subject: New package: cutelyst2 (#4693) * New package: cutelyst2 A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework. * [cutelyst2] Rearrange files; prefer ninja. --- ports/cutelyst2/CONTROL | 4 ++++ ports/cutelyst2/portfile.cmake | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 ports/cutelyst2/CONTROL create mode 100644 ports/cutelyst2/portfile.cmake diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL new file mode 100644 index 000000000..888883a44 --- /dev/null +++ b/ports/cutelyst2/CONTROL @@ -0,0 +1,4 @@ +Source: cutelyst2 +Version: 2.5.2-1 +Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework +Build-Depends: qt5-base diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake new file mode 100644 index 000000000..118129e27 --- /dev/null +++ b/ports/cutelyst2/portfile.cmake @@ -0,0 +1,48 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cutelyst/cutelyst + REF 7f594d2b2d227e9e6a0474a55906db7d1ee1cd7e + SHA512 de04efd7bd9b07f7b0dd2b014eed93e26f0760ef8e458f8c56dc655977235f237bbc71cfe1c05d6791c2237073497ca4566548327ad01b99b4dbec7c491542c7 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS:BOOL=OFF +) + +vcpkg_install_cmake() + +# Move CMake config files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Cutelyst2Qt5 TARGET_PATH share/cutelyst2qt5) + +file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/cutelyst2 ${CURRENT_PACKAGES_DIR}/bin/cutelyst2-wsgi ${CURRENT_PACKAGES_DIR}/bin/cutelyst2.exe ${CURRENT_PACKAGES_DIR}/bin/cutelyst-wsgi2.exe) +file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2 ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-wsgi ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst-wsgi2.exe) +if(EXES OR DEBUG_EXES) + file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cutelyst2) + file(REMOVE ${EXES} ${DEBUG_EXES}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cutelyst2) +endif() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins/ActionREST.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins ${CURRENT_PACKAGES_DIR}/bin/cutelyst2-plugins) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins/ActionREST.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-plugins) +endif() + +file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/* ${CURRENT_PACKAGES_DIR}/debug/bin/*) +if(NOT BINS) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/cutelyst2/copyright COPYONLY) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From f1eb3aa4b95540a8fb4a8e8d341e4c08136bd756 Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Wed, 14 Nov 2018 23:25:50 +0000 Subject: Vulkan port (#4664) * [Vulkan] Add a vulkan port based on the cuda port * Add VULKAN_SDK env variable to whitelist * * Added some additional diagnostic information * Corrected if NOT exists statement --- ports/vulkan/CONTROL | 3 +++ ports/vulkan/portfile.cmake | 37 +++++++++++++++++++++++++++++++++++++ toolsrc/src/vcpkg/base/system.cpp | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 ports/vulkan/CONTROL create mode 100644 ports/vulkan/portfile.cmake diff --git a/ports/vulkan/CONTROL b/ports/vulkan/CONTROL new file mode 100644 index 000000000..77f99641d --- /dev/null +++ b/ports/vulkan/CONTROL @@ -0,0 +1,3 @@ +Source: vulkan +Version: 1.1.82.1 +Description: A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices. \ No newline at end of file diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake new file mode 100644 index 000000000..31eb802b4 --- /dev/null +++ b/ports/vulkan/portfile.cmake @@ -0,0 +1,37 @@ +# Due to the complexity involved, this package doesn't install the Vulkan SDK. +# It instead verifies that Vulkan is installed. +# Other packages can depend on this package to declare a dependency on Vulkan. +include(vcpkg_common_functions) + +message(STATUS "Querying VULKAN_SDK Enviroment variable") +file(TO_CMAKE_PATH "$ENV{VULKAN_SDK}" VULKAN_DIR) +set(VULKAN_INCLUDE "${VULKAN_DIR}/Include/vulkan/") +set(VULKAN_ERROR_DL "Before continuing, please download and install Vulkan from:\n https://vulkan.lunarg.com/sdk/home\n") + +if(NOT DEFINED ENV{VULKAN_SDK}) + message(FATAL_ERROR "Could not find Vulkan SDK. ${VULKAN_ERROR_DL}") +endif() + +message(STATUS "Searching " ${VULKAN_INCLUDE} " for vulkan.h") +if(NOT EXISTS "${VULKAN_INCLUDE}/vulkan.h") + message(FATAL_ERROR "Could not find vulkan.h. ${VULKAN_ERROR_DL}") +endif() +message(STATUS "Found vulkan.h") + +# Check if the user left the version in the installation directory e.g. c:/vulkanSDK/1.1.82.1/ +if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))") + set(VULKAN_VERSION "${CMAKE_MATCH_1}") + set(VULKAN_MAJOR "${CMAKE_MATCH_2}") + set(VULKAN_MINOR "${CMAKE_MATCH_3}") + set(VULKAN_PATCH "${CMAKE_MATCH_4}") + message(STATUS "Found Vulkan SDK version ${VULKAN_VERSION}") + + set(VULKAN_REQUIRED_VERSION "1.1.82.1") + if (VULKAN_MAJOR LESS 1 OR VULKAN_MINOR LESS 1 OR VULKAN_PATCH LESS 82) + message(FATAL_ERROR "Vulkan ${VULKAN_VERSION} but ${VULKAN_REQUIRED_VERSION} is required. Please download and install a more recent version from:" + "\n https://vulkan.lunarg.com/sdk/home\n") + endif() +endif() + +configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index 6797111c2..9c72f8401 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -168,6 +168,8 @@ namespace vcpkg::System L"CUDA_PATH", // Environmental variable generated automatically by CUDA after installation L"NVCUDASAMPLES_ROOT", + // Enables find_package(Vulkan) in CMake. Environmental variable generated by Vulkan SDK installer + L"VULKAN_SDK", }; std::wstring env_cstr; -- cgit v1.2.3 From 9f3601f1689829d8b10f66f3b5c26c1763fd3322 Mon Sep 17 00:00:00 2001 From: Ivy Snow Date: Thu, 15 Nov 2018 11:46:33 +0800 Subject: [libuv] Update to version 1.24.0 and fix build on Linux/FreeBSD. --- ports/libuv/CMakeLists.txt | 20 ++++++++++++++++---- ports/libuv/CONTROL | 2 +- ports/libuv/portfile.cmake | 4 ++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt index 33878471c..c4b7c3882 100644 --- a/ports/libuv/CMakeLists.txt +++ b/ports/libuv/CMakeLists.txt @@ -19,22 +19,32 @@ file(GLOB UV_SOURCES_UNIX src/unix/stream.c src/unix/tcp.c src/unix/thread.c - src/unix/timer.c src/unix/tty.c src/unix/udp.c - src/unix/proctitle.c ) file(GLOB UV_SOURCES_LINUX + src/unix/proctitle.c src/unix/linux-core.c src/unix/linux-inotify.c src/unix/linux-syscalls.c + src/unix/procfs-exepath.c + src/unix/sysinfo-loadavg.c + src/unix/sysinfo-memory.c ) file(GLOB UV_SOURCES_DARWIN - src/unix/kqueue.c + src/unix/proctitle.c src/unix/darwin.c src/unix/fsevents.c - src/unix/pthread-barrier.c src/unix/darwin-proctitle.c + src/unix/bsd-ifaddrs.c + src/unix/kqueue.c +) +file(GLOB UV_SOURCES_FREEBSD + src/unix/freebsd.c + src/unix/posix-hrtime.c + src/unix/bsd-proctitle.c + src/unix/bsd-ifaddrs.c + src/unix/kqueue.c ) file(GLOB UV_SOURCES_WIN src/win/*.c) @@ -44,6 +54,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsSt target_link_libraries(libuv iphlpapi psapi shell32 userenv ws2_32) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN}) +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD}) else() # Assume some Linux variant add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX}) endif() diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index a2bee52b5..e90eaa545 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.23.2 +Version: 1.24.0 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index c8c7daf88..782d946c3 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.23.2 - SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5 + REF v1.24.0 + SHA512 b75dac19e99497b059b9b8ce646266c4fa10f1259f5fd74554f7f614f7b70f4b62b9c756316d9a3eed6cf6b9d61f5acde9f6eedb88d30431f6a5c87169487ec6 HEAD_REF v1.x ) -- cgit v1.2.3 From 6b5767fafbc50c5d401ed00157215f3f79f947b0 Mon Sep 17 00:00:00 2001 From: Ivy Snow Date: Thu, 15 Nov 2018 11:55:30 +0800 Subject: [cxxopts] Update to version 2.1.1. --- ports/cxxopts/CONTROL | 2 +- ports/cxxopts/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cxxopts/CONTROL b/ports/cxxopts/CONTROL index 915124fb9..6b3928ce1 100644 --- a/ports/cxxopts/CONTROL +++ b/ports/cxxopts/CONTROL @@ -1,3 +1,3 @@ Source: cxxopts -Version: 2.1.0-1 +Version: 2.1.1 Description: This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options diff --git a/ports/cxxopts/portfile.cmake b/ports/cxxopts/portfile.cmake index 40d240b37..0710eb09b 100644 --- a/ports/cxxopts/portfile.cmake +++ b/ports/cxxopts/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jarro2783/cxxopts - REF v2.1.0 - SHA512 b3549bb36fd3cb27b30a7164992ce19ddf129e7ee071956d58047101e4181cd9f08c8dd4c5e2d5499628deeb52a40bbc2fecfe68e9875c07396e6b7434161603 + REF v2.1.1 + SHA512 1da6ed65c3e0ee3e0beb39a5d0bccf6e32f44bbb37f8e849ada1421f03630981e4ede6d9966284bb642af6e75c71a1c9f7c9262ba9578d183d4514c011cbfa8e HEAD_REF master ) -- cgit v1.2.3 From b79ad151244b6c11c3b2926b8e3881a5aec47c4d Mon Sep 17 00:00:00 2001 From: Ivy Snow Date: Thu, 15 Nov 2018 11:59:24 +0800 Subject: [gflags] Update to version 2.2.2. --- ports/gflags/CONTROL | 2 +- ports/gflags/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index 0a8d83aee..bf0800eec 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,3 +1,3 @@ Source: gflags -Version: 2.2.1-3 +Version: 2.2.2 Description: A C++ library that implements commandline flags processing diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 31ffeafa5..11ef0cd93 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gflags/gflags - REF v2.2.1 - SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9 + REF v2.2.2 + SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 HEAD_REF master ) -- cgit v1.2.3 From 6cacd43852a9f0d65285914ff8578d7d25b9d733 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 11 Nov 2018 18:14:34 +0000 Subject: tiff: Version 4.0.10 --- ports/tiff/CONTROL | 2 +- ports/tiff/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index cb40597b4..866437737 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.9-6 +Version: 4.0.10 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 7062c1ce1..13d8ac7bc 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(LIBTIFF_VERSION 4.0.9) +set(LIBTIFF_VERSION 4.0.10) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz" FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz" - SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd + SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH -- cgit v1.2.3 From 12151fbce62e90b9a76db42d4cc9e276528d8fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ma=C5=82ek?= Date: Thu, 15 Nov 2018 09:28:43 +0100 Subject: [miniupnpc] initial port of miniupnpc --- ports/miniupnpc/CONTROL | 3 +++ ports/miniupnpc/cmakelists.diff | 11 +++++++++++ ports/miniupnpc/portfile.cmake | 31 +++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 ports/miniupnpc/CONTROL create mode 100644 ports/miniupnpc/cmakelists.diff create mode 100644 ports/miniupnpc/portfile.cmake diff --git a/ports/miniupnpc/CONTROL b/ports/miniupnpc/CONTROL new file mode 100644 index 000000000..8238e64f7 --- /dev/null +++ b/ports/miniupnpc/CONTROL @@ -0,0 +1,3 @@ +Source: miniupnpc +Version: 2.1 +Description: UPnP client library/tool to access Internet Gateway Devices diff --git a/ports/miniupnpc/cmakelists.diff b/ports/miniupnpc/cmakelists.diff new file mode 100644 index 000000000..4df7ef74d --- /dev/null +++ b/ports/miniupnpc/cmakelists.diff @@ -0,0 +1,11 @@ +--- a/miniupnpc/CMakeLists.txt 2018-05-07 13:12:58.000000000 +0200 ++++ b/miniupnpc/CMakeLists.txt 2018-11-13 11:51:57.897598000 +0100 +@@ -124,7 +124,7 @@ + target_link_libraries (libminiupnpc-shared PRIVATE miniupnpc-private) + target_compile_definitions(libminiupnpc-shared PRIVATE MINIUPNP_EXPORTS) + +- target_include_directories(libminiupnpc-static INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR}) ++ target_include_directories(libminiupnpc-shared INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR}) + if (WIN32) + target_link_libraries(libminiupnpc-shared INTERFACE ws2_32 iphlpapi) + endif() diff --git a/ports/miniupnpc/portfile.cmake b/ports/miniupnpc/portfile.cmake new file mode 100644 index 000000000..2c9aa9ec6 --- /dev/null +++ b/ports/miniupnpc/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO miniupnp/miniupnp + REF miniupnpc_2_1 + SHA512 f2ab5116c094982f7838ccab460d3db07a99de1094448277fc45841e0e64ea1b4216d75a7e5dd471c79ff9b0132b89e4d801c3ad1b60d55631c12c916df658f5 + HEAD_REF master +) + +vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmakelists.diff) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" MINIUPNPC_BUILD_SHARED) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" MINIUPNPC_BUILD_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/miniupnpc + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DUPNPC_BUILD_STATIC=${MINIUPNPC_BUILD_STATIC} + -DUPNPC_BUILD_SHARED=${MINIUPNPC_BUILD_SHARED} + -DUPNPC_BUILD_TESTS=OFF + -DUPNPC_BUILD_SAMPLE=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/miniupnpc RENAME copyright) + -- cgit v1.2.3 From 691ed09c3fc98f36aa405807b6774c866b080e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ma=C5=82ek?= Date: Thu, 15 Nov 2018 09:30:30 +0100 Subject: [berkeleydb] fix exporting DLL symbols on Windows Set preprocessor definitions correctly for static & shared library. Previously DLL was unusable on Windows - the symbols were not exported --- ports/berkeleydb/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/berkeleydb/CMakeLists.txt b/ports/berkeleydb/CMakeLists.txt index eada8360a..9297aacef 100644 --- a/ports/berkeleydb/CMakeLists.txt +++ b/ports/berkeleydb/CMakeLists.txt @@ -15,12 +15,12 @@ add_definitions( if (BUILD_SHARED_LIBS) add_definitions( - -D_LIB + -DDB_CREATE_DLL + -D_USRDLL ) else() add_definitions( - -DDB_CREATE_DLL - -D_USRDLL + -D_LIB ) endif() -- cgit v1.2.3 From 56c94a81027dae14ea8adabcbda800d0f7c10d0b Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Thu, 15 Nov 2018 11:18:48 +0000 Subject: Rename example documents The current names and titles of the examples put too much emphasis on the package which is being demonstrated rather than the concept. This can be jarring for newcomers. This patch renames them to put the emphasis on the concept instead. --- README.md | 4 +- docs/about/faq.md | 4 +- docs/examples/installing-and-using-packages.md | 177 +++++++++++++++++++++ docs/examples/packaging-zipfiles.md | 79 ++++++++++ docs/examples/packaging-zlib.md | 79 ---------- docs/examples/patching-libpng.md | 204 ------------------------- docs/examples/patching.md | 204 +++++++++++++++++++++++++ docs/examples/using-sqlite.md | 177 --------------------- docs/index.md | 8 +- docs/users/integration.md | 2 +- 10 files changed, 469 insertions(+), 469 deletions(-) create mode 100644 docs/examples/installing-and-using-packages.md create mode 100644 docs/examples/packaging-zipfiles.md delete mode 100644 docs/examples/packaging-zlib.md delete mode 100644 docs/examples/patching-libpng.md create mode 100644 docs/examples/patching.md delete mode 100644 docs/examples/using-sqlite.md diff --git a/README.md b/README.md index 23cb4e5f4..e0267bce4 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The best way to use installed libraries with CMake is via the toolchain file `sc In Visual Studio, you can create a New Project (or open an existing one). All installed libraries are immediately ready to be `#include`'d and used in your project without additional configuration. -For more information, see our [using a package](docs/examples/using-sqlite.md) example for the specifics. +For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics. Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/). @@ -50,7 +50,7 @@ and restart Powershell. ## Examples -See the [documentation](docs/index.md) for specific walkthroughs, including [using a package](docs/examples/using-sqlite.md) and [adding a new package](docs/examples/packaging-zlib.md). +See the [documentation](docs/index.md) for specific walkthroughs, including [installing and using a package](docs/examples/installing-and-using-packages.md) and [adding a new package](docs/examples/packaging-zipfiles.md). Our docs are now also available online at ReadTheDocs: ! diff --git a/docs/about/faq.md b/docs/about/faq.md index 0178e051a..57b908f48 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -10,12 +10,12 @@ Yes! See [the `export` command](../users/integration.md#export). The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. ## How do I get more libraries? -The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see [Example #2](../examples/packaging-zlib.md). +The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see our [packaging example](../examples/packaging-zipfiles.md). We recommend cloning directly from [GitHub](https://github.com/microsoft/vcpkg) and using `git pull` to update the list of portfiles. Once you've updated your portfiles, `vcpkg update` will indicate any installed libraries that are now out of date. ## Can I build a private library with this tool? -Yes. Follow [our Packaging zlib Example](../examples/packaging-zlib.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code. +Yes. Follow [our packaging zlib Example](../examples/packaging-zipfiles.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code. ## Can I use a prebuilt private library with this tool? Yes. The `portfile.cmake` for a library is fundamentally a script that places the headers and binaries into the correct arrangement in the `${CURRENT_PACKAGES_DIR}`, so to pull in prebuilt binaries you can write a portfile which directly downloads and arranges the files. diff --git a/docs/examples/installing-and-using-packages.md b/docs/examples/installing-and-using-packages.md new file mode 100644 index 000000000..50200c877 --- /dev/null +++ b/docs/examples/installing-and-using-packages.md @@ -0,0 +1,177 @@ +## Installing and Using Packages Example: SQLite + + - [Step 1: Install](#install) + - [Step 2: Use](#use) + - [VS/MSBuild Project (User-wide integration)](#msbuild) + - [CMake (Toolchain file)](#cmake) + - [Other integration options](../users/integration.md) + +--- + +## Step 1: Install + +First, we need to know what name [SQLite](https://sqlite.org) goes by in the ports tree. To do that, we'll run the `search` command and inspect the output: +```no-highlight +PS D:\src\vcpkg> .\vcpkg search sqlite +libodb-sqlite 2.4.0 Sqlite support for the ODB ORM library +sqlite3 3.15.0 SQLite is a software library that implements a se... + +If your library is not listed, please open an issue at: + https://github.com/Microsoft/vcpkg/issues +``` +Looking at the list, we can see that the port is named "sqlite3". You can also run the `search` command without arguments to see the full list of packages. + +Installing is then as simple as using the `install` command. +```no-highlight +PS D:\src\vcpkg> .\vcpkg install sqlite3 +-- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-windows +-- DOWNLOADS=D:/src/vcpkg/downloads +-- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/sqlite3_x86-windows +-- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/sqlite3 +-- CURRENT_PORT_DIR=D:/src/vcpkg/ports/sqlite3/. +-- Downloading https://sqlite.org/2016/sqlite-amalgamation-3150000.zip... +-- Downloading https://sqlite.org/2016/sqlite-amalgamation-3150000.zip... OK +-- Testing integrity of downloaded file... +-- Testing integrity of downloaded file... OK +-- Extracting source D:/src/vcpkg/downloads/sqlite-amalgamation-3150000.zip +-- Extracting done +-- Configuring x86-windows-rel +-- Configuring x86-windows-rel done +-- Configuring x86-windows-dbg +-- Configuring x86-windows-dbg done +-- Build x86-windows-rel +-- Build x86-windows-rel done +-- Build x86-windows-dbg +-- Build x86-windows-dbg done +-- Package x86-windows-rel +-- Package x86-windows-rel done +-- Package x86-windows-dbg +-- Package x86-windows-dbg done +-- Performing post-build validation +-- Performing post-build validation done +Package sqlite3:x86-windows is installed +``` + +We can check that sqlite3 was successfully installed for x86 windows desktop by running the `list` command. +```no-highlight +PS D:\src\vcpkg> .\vcpkg list +sqlite3:x86-windows 3.15.0 SQLite is a software library that implements a se... +``` + +To install for other architectures and platforms such as Universal Windows Platform or x64 Desktop, you can suffix the package name with `:`. +```no-highlight +PS D:\src\vcpkg> .\vcpkg install sqlite3:x86-uwp zlib:x64-windows +``` + +See `.\vcpkg help triplet` for all supported targets. + +--- + +## Step 2: Use + +#### VS/MSBuild Project (User-wide integration) + +The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwards is no longer required and the integration is configured on a per-user basis. +```no-highlight +PS D:\src\vcpkg> .\vcpkg integrate install +Applied user-wide integration for this vcpkg root. + +All C++ projects can now #include any installed libraries. +Linking will be handled automatically. +Installing new libraries will make them instantly available. +``` +*Note: You will need to restart Visual Studio or perform a Build to update intellisense with the changes.* + +You can now simply use File -> New Project in Visual Studio 2015 or Visual Studio 2017 and the library will be automatically available. For SQLite, you can try out their [C/C++ sample](https://sqlite.org/quickstart.html). + +To remove the integration for your user, you can use `.\vcpkg integrate remove`. + + +#### CMake (Toolchain File) + +The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. + +If you are using CMake through Open Folder with Visual Studio 2017 you can define `CMAKE_TOOLCHAIN_FILE` by adding a "variables" section to each of your `CMakeSettings.json` configurations: + +```json +{ + "configurations": [{ + "name": "x86-Debug", + "generator": "Visual Studio 15 2017", + "configurationType" : "Debug", + "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-m -v:minimal", + "variables": [{ + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "D:\\src\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" + }] + }] +} +``` + +Now let's make a simple CMake project with a main file. +```cmake +# CMakeLists.txt +cmake_minimum_required(VERSION 3.0) +project(test) + +find_package(Sqlite3 REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main sqlite3) +``` +```cpp +// main.cpp +#include +#include + +int main() +{ + printf("%s\n", sqlite3_libversion()); + return 0; +} +``` + +Then, we build our project in the normal CMake way: +```no-highlight +PS D:\src\cmake-test> mkdir build +PS D:\src\cmake-test> cd build +PS D:\src\cmake-test\build> cmake .. "-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake" + // omitted CMake output here // +-- Build files have been written to: D:/src/cmake-test/build +PS D:\src\cmake-test\build> cmake --build . + // omitted MSBuild output here // +Build succeeded. + 0 Warning(s) + 0 Error(s) + +Time Elapsed 00:00:02.38 +PS D:\src\cmake-test\build> .\Debug\main.exe +3.15.0 +``` + +*Note: The correct sqlite3.dll is automatically copied to the output folder when building for x86-windows. You will need to distribute this along with your application.* + +##### Handling libraries without native cmake support + +Unlike other platforms, we do not automatically add the `include\` directory to your compilation line by default. If you're using a library that does not provide CMake integration, you will need to explicitly search for the files and add them yourself using [`find_path()`][1] and [`find_library()`][2]. + +```cmake +# To find and use catch +find_path(CATCH_INCLUDE_DIR catch.hpp) +include_directories(${CATCH_INCLUDE_DIR}) + +# To find and use azure-storage-cpp +find_path(WASTORAGE_INCLUDE_DIR was/blob.h) +find_library(WASTORAGE_LIBRARY wastorage) +include_directories(${WASTORAGE_INCLUDE_DIR}) +link_libraries(${WASTORAGE_LIBRARY}) + +# Note that we recommend using the target-specific directives for a cleaner cmake: +# target_include_directories(main ${LIBRARY}) +# target_link_libraries(main PRIVATE ${LIBRARY}) +``` + +[1]: https://cmake.org/cmake/help/latest/command/find_path.html +[2]: https://cmake.org/cmake/help/latest/command/find_library.html diff --git a/docs/examples/packaging-zipfiles.md b/docs/examples/packaging-zipfiles.md new file mode 100644 index 000000000..ed63637fd --- /dev/null +++ b/docs/examples/packaging-zipfiles.md @@ -0,0 +1,79 @@ +## Packaging Zipfiles Example: zlib + +### Bootstrap with `create` +First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors. + +*Looking at zlib's website, the URL http://zlib.net/zlib1211.zip looks appropriate.* + +Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name. + +*Since zlib is already packaged as zlib, we will use the name zlib2 for this example.* + +Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `-.zip`. + +*`zlib1211.zip` is a fine name, so no change needed.* + +All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports\`. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg create zlib2 http://zlib.net/zlib-1.2.11.tar.gz zlib-1.2.11.zip +-- Generated portfile: D:/src/vcpkg/ports/zlib2/portfile.cmake +``` + +### Create the CONTROL file +In addition to the generated `ports\\portfile.cmake`, we also need a `ports\\CONTROL` file. This file is a simple set of fields describing the package's metadata. + +*For zlib2, we'll create the file `ports\zlib2\CONTROL` with the following contents:* +```no-highlight +Source: zlib2 +Version: 1.2.11 +Description: A Massively Spiffy Yet Delicately Unobtrusive Compression Library +``` + +### Tweak the generated portfile +The generated `portfile.cmake` will need some editing to correctly package most libraries in the wild, however we can start by trying out the build. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg build zlib2 +-- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-windows +-- DOWNLOADS=D:/src/vcpkg/downloads +-- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/zlib2_x86-windows +-- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/zlib2 +-- CURRENT_PORT_DIR=D:/src/vcpkg/ports/zlib2/. +-- Using cached D:/src/vcpkg/downloads/zlib-1.2.11.tar.gz +-- Testing integrity of cached file... +-- Testing integrity of cached file... OK +-- Extracting source D:/src/vcpkg/downloads/zlib-1.2.11.tar.gz +-- Extracting done +-- Configuring x86-windows-rel +-- Configuring x86-windows-rel done +-- Configuring x86-windows-dbg +-- Configuring x86-windows-dbg done +-- Build x86-windows-rel +-- Build x86-windows-rel done +-- Build x86-windows-dbg +-- Build x86-windows-dbg done +-- Performing post-build validation +Include files should not be duplicated into the /debug/include directory. If this cannot be disabled in the project cmake, use + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +/debug/share should not exist. Please reorganize any important files, then use + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +The software license must be available at ${CURRENT_PACKAGES_DIR}/share/zlib2/copyright +Found 3 error(s). Please correct the portfile: + D:\src\vcpkg\ports\zlib2\portfile.cmake +``` + +At this point, it is a matter of reading the error messages and log files while steadily improving the quality of the portfile. Zlib required providing a discrete copy of the LICENSE to copy into the package, suppressing the build and installation of executables and headers, and removing the static libraries after they were installed. + +### Suggested example portfiles +In the `ports\` directory are many libraries that can be used as examples, including many that are not based on CMake. + +- Header only libraries + - rapidjson + - range-v3 +- MSBuild-based + - cppunit + - mpg123 +- Non-CMake, custom buildsystem + - openssl + - ffmpeg diff --git a/docs/examples/packaging-zlib.md b/docs/examples/packaging-zlib.md deleted file mode 100644 index 1d61cfee1..000000000 --- a/docs/examples/packaging-zlib.md +++ /dev/null @@ -1,79 +0,0 @@ -## Example 2: Packaging zlib - -### Bootstrap with `create` -First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors. - -*Looking at zlib's website, the URL http://zlib.net/zlib1211.zip looks appropriate.* - -Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name. - -*Since zlib is already packaged as zlib, we will use the name zlib2 for this example.* - -Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `-.zip`. - -*`zlib1211.zip` is a fine name, so no change needed.* - -All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports\`. - -```no-highlight -PS D:\src\vcpkg> .\vcpkg create zlib2 http://zlib.net/zlib-1.2.11.tar.gz zlib-1.2.11.zip --- Generated portfile: D:/src/vcpkg/ports/zlib2/portfile.cmake -``` - -### Create the CONTROL file -In addition to the generated `ports\\portfile.cmake`, we also need a `ports\\CONTROL` file. This file is a simple set of fields describing the package's metadata. - -*For zlib2, we'll create the file `ports\zlib2\CONTROL` with the following contents:* -```no-highlight -Source: zlib2 -Version: 1.2.11 -Description: A Massively Spiffy Yet Delicately Unobtrusive Compression Library -``` - -### Tweak the generated portfile -The generated `portfile.cmake` will need some editing to correctly package most libraries in the wild, however we can start by trying out the build. - -```no-highlight -PS D:\src\vcpkg> .\vcpkg build zlib2 --- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-windows --- DOWNLOADS=D:/src/vcpkg/downloads --- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/zlib2_x86-windows --- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/zlib2 --- CURRENT_PORT_DIR=D:/src/vcpkg/ports/zlib2/. --- Using cached D:/src/vcpkg/downloads/zlib-1.2.11.tar.gz --- Testing integrity of cached file... --- Testing integrity of cached file... OK --- Extracting source D:/src/vcpkg/downloads/zlib-1.2.11.tar.gz --- Extracting done --- Configuring x86-windows-rel --- Configuring x86-windows-rel done --- Configuring x86-windows-dbg --- Configuring x86-windows-dbg done --- Build x86-windows-rel --- Build x86-windows-rel done --- Build x86-windows-dbg --- Build x86-windows-dbg done --- Performing post-build validation -Include files should not be duplicated into the /debug/include directory. If this cannot be disabled in the project cmake, use - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -/debug/share should not exist. Please reorganize any important files, then use - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -The software license must be available at ${CURRENT_PACKAGES_DIR}/share/zlib2/copyright -Found 3 error(s). Please correct the portfile: - D:\src\vcpkg\ports\zlib2\portfile.cmake -``` - -At this point, it is a matter of reading the error messages and log files while steadily improving the quality of the portfile. Zlib required providing a discrete copy of the LICENSE to copy into the package, suppressing the build and installation of executables and headers, and removing the static libraries after they were installed. - -### Suggested example portfiles -In the `ports\` directory are many libraries that can be used as examples, including many that are not based on CMake. - -- Header only libraries - - rapidjson - - range-v3 -- MSBuild-based - - cppunit - - mpg123 -- Non-CMake, custom buildsystem - - openssl - - ffmpeg diff --git a/docs/examples/patching-libpng.md b/docs/examples/patching-libpng.md deleted file mode 100644 index 2337b73da..000000000 --- a/docs/examples/patching-libpng.md +++ /dev/null @@ -1,204 +0,0 @@ -## Example 3: Patching libpng to work for x86-uwp - -### Initial error logs -First, try building: - -```no-highlight -PS D:\src\vcpkg> vcpkg install libpng:x86-uwp --- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-uwp --- DOWNLOADS=D:/src/vcpkg/downloads --- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/libpng_x86-uwp --- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/libpng --- CURRENT_PORT_DIR=D:/src/vcpkg/ports/libpng/. --- Using cached D:/src/vcpkg/downloads/libpng-1.6.24.tar.xz --- Extracting done --- Configuring x86-uwp-rel --- Configuring x86-uwp-rel done --- Configuring x86-uwp-dbg --- Configuring x86-uwp-dbg done --- Build x86-uwp-rel -CMake Error at scripts/cmake/execute_required_process.cmake:14 (message): - Command failed: C:/Program - Files/CMake/bin/cmake.exe;--build;.;--config;Release - - Working Directory: D:/src/vcpkg/buildtrees/libpng/x86-uwp-rel - - See logs for more information: - - D:\src\vcpkg\buildtrees\libpng\build-x86-uwp-rel-out.log - D:\src\vcpkg\buildtrees\libpng\build-x86-uwp-rel-err.log - -Call Stack (most recent call first): - scripts/cmake/vcpkg_build_cmake.cmake:3 (execute_required_process) - ports/libpng/portfile.cmake:22 (vcpkg_build_cmake) - scripts/ports.cmake:84 (include) - - -Error: build command failed -``` - -Next, looking at the above logs (build-...-out.log and build-...-err.log). - -```no-highlight -// build-x86-uwp-rel-out.log -... -"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\ALL_BUILD.vcxproj" (default target) (1) -> -"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj" (default target) (3) -> -(ClCompile target) -> - D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24\pngerror.c(775): warning C4013: 'ExitProcess' undefined; assuming extern returning int [D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj] - - -"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\ALL_BUILD.vcxproj" (default target) (1) -> -"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj" (default target) (3) -> -(Link target) -> - pngerror.obj : error LNK2019: unresolved external symbol _ExitProcess referenced in function _png_longjmp [D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj] - D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\Release\libpng16.dll : fatal error LNK1120: 1 unresolved externals [D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj] - - 1 Warning(s) - 2 Error(s) - -Time Elapsed 00:00:04.19 -``` - -### Identify the problematic code - -Taking a look at [MSDN](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682658(v=vs.85).aspx) shows that `ExitProcess` is only available for desktop apps. Additionally, it's useful to see the surrounding context: - -```c -/* buildtrees\libpng\src\libpng-1.6.24\pngerror.c:769 */ - /* If control reaches this point, png_longjmp() must not return. The only - * choice is to terminate the whole process (or maybe the thread); to do - * this the ANSI-C abort() function is used unless a different method is - * implemented by overriding the default configuration setting for - * PNG_ABORT(). - */ - PNG_ABORT(); -``` - -A recursive search for `PNG_ABORT` reveals the definition: -```no-highlight -PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> findstr /snipl "PNG_ABORT" * -CHANGES:701: Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros -libpng-manual.txt:432:errors will result in a call to PNG_ABORT() which defaults to abort(). -libpng-manual.txt:434:You can #define PNG_ABORT() to a function that does something -libpng-manual.txt:2753:errors will result in a call to PNG_ABORT() which defaults to abort(). -libpng-manual.txt:2755:You can #define PNG_ABORT() to a function that does something -libpng-manual.txt:4226:PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()), -libpng.3:942:errors will result in a call to PNG_ABORT() which defaults to abort(). -libpng.3:944:You can #define PNG_ABORT() to a function that does something -libpng.3:3263:errors will result in a call to PNG_ABORT() which defaults to abort(). -libpng.3:3265:You can #define PNG_ABORT() to a function that does something -libpng.3:4736:PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()), -png.h:994: * will use it; otherwise it will call PNG_ABORT(). This function was -pngerror.c:773: * PNG_ABORT(). -pngerror.c:775: PNG_ABORT(); -pngpriv.h:459:#ifndef PNG_ABORT -pngpriv.h:461:# define PNG_ABORT() ExitProcess(0) -pngpriv.h:463:# define PNG_ABORT() abort() -``` - -This already gives us some great clues, but the full definition tells the complete story. - -```c -/* buildtrees\libpng\src\libpng-1.6.24\pngpriv.h:459 */ -#ifndef PNG_ABORT -# ifdef _WINDOWS_ -# define PNG_ABORT() ExitProcess(0) -# else -# define PNG_ABORT() abort() -# endif -#endif -``` - -`abort()` is a standard CRT call and certainly available in UWP, so we just need to convince libpng to be more platform agnostic. The easiest and most reliable way to achieve this is to patch the code; while in this particular case we could pass in a compiler flag to override `PNG_ABORT` because this is a private header, in general it is more reliable to avoid adding more required compiler switches when possible (especially when it isn't already exposed as a CMake option). - -### Patching the code to improve compatibility - -We recommend using git to create the patch file, since you'll already have it installed. -```no-highlight -PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> git init . -Initialized empty Git repository in D:/src/vcpkg/buildtrees/libpng/src/libpng-1.6.24/.git/ - -PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> git add . -warning: LF will be replaced by CRLF in ANNOUNCE. -The file will have its original line endings in your working directory. -... - -PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> git commit -m "temp" -[master (root-commit) 68f253f] temp - 422 files changed, 167717 insertions(+) -... -``` - -Now we can modify `pngpriv.h` to use `abort()` everywhere. -```c -/* buildtrees\libpng\src\libpng-1.6.24\pngpriv.h:459 */ -#ifndef PNG_ABORT -# define PNG_ABORT() abort() -#endif -``` - -The output of `git diff` is already in patch format, so we just need to save the patch into the `ports/libpng` directory. -```no-highlight -PS buildtrees\libpng\src\libpng-1.6.24> git diff | out-file -enc ascii ..\..\..\..\ports\libpng\use-abort-on-all-platforms.patch -``` - -Finally, we need to apply the patch after extracting the source. -```cmake -# ports\libpng\portfile.cmake -... -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" -) - -vcpkg_configure_cmake( -... -``` - -### Verification - -To be completely sure this works from scratch, we need to remove the package and rebuild it: - -```no-highlight -PS D:\src\vcpkg> vcpkg remove libpng:x86-uwp -Package libpng:x86-uwp was successfully removed -``` -and complete delete the building directory: D:\src\vcpkg\buildtrees\libpng - -Now we try a fresh, from scratch install. -```no-highlight -PS D:\src\vcpkg> vcpkg install libpng:x86-uwp --- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-uwp --- DOWNLOADS=D:/src/vcpkg/downloads --- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/libpng_x86-uwp --- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/libpng --- CURRENT_PORT_DIR=D:/src/vcpkg/ports/libpng/. --- Using cached D:/src/vcpkg/downloads/libpng-1.6.24.tar.xz --- Extracting source D:/src/vcpkg/downloads/libpng-1.6.24.tar.xz --- Extracting done --- Configuring x86-uwp-rel --- Configuring x86-uwp-rel done --- Configuring x86-uwp-dbg --- Configuring x86-uwp-dbg done --- Build x86-uwp-rel --- Build x86-uwp-rel done --- Build x86-uwp-dbg --- Build x86-uwp-dbg done --- Package x86-uwp-rel --- Package x86-uwp-rel done --- Package x86-uwp-dbg --- Package x86-uwp-dbg done -Package libpng:x86-uwp is installed -``` - -Finally, to fully commit and publish the changes, we need to bump the internal release number and add the patch file to source control, then make a Pull Request! - -```no-highlight -# ports\libpng\CONTROL -Source: libpng -Version: 1.6.24-1 -Build-Depends: zlib -``` diff --git a/docs/examples/patching.md b/docs/examples/patching.md new file mode 100644 index 000000000..98115400e --- /dev/null +++ b/docs/examples/patching.md @@ -0,0 +1,204 @@ +## Patching Example: Patching libpng to work for x86-uwp + +### Initial error logs +First, try building: + +```no-highlight +PS D:\src\vcpkg> vcpkg install libpng:x86-uwp +-- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-uwp +-- DOWNLOADS=D:/src/vcpkg/downloads +-- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/libpng_x86-uwp +-- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/libpng +-- CURRENT_PORT_DIR=D:/src/vcpkg/ports/libpng/. +-- Using cached D:/src/vcpkg/downloads/libpng-1.6.24.tar.xz +-- Extracting done +-- Configuring x86-uwp-rel +-- Configuring x86-uwp-rel done +-- Configuring x86-uwp-dbg +-- Configuring x86-uwp-dbg done +-- Build x86-uwp-rel +CMake Error at scripts/cmake/execute_required_process.cmake:14 (message): + Command failed: C:/Program + Files/CMake/bin/cmake.exe;--build;.;--config;Release + + Working Directory: D:/src/vcpkg/buildtrees/libpng/x86-uwp-rel + + See logs for more information: + + D:\src\vcpkg\buildtrees\libpng\build-x86-uwp-rel-out.log + D:\src\vcpkg\buildtrees\libpng\build-x86-uwp-rel-err.log + +Call Stack (most recent call first): + scripts/cmake/vcpkg_build_cmake.cmake:3 (execute_required_process) + ports/libpng/portfile.cmake:22 (vcpkg_build_cmake) + scripts/ports.cmake:84 (include) + + +Error: build command failed +``` + +Next, looking at the above logs (build-...-out.log and build-...-err.log). + +```no-highlight +// build-x86-uwp-rel-out.log +... +"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\ALL_BUILD.vcxproj" (default target) (1) -> +"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj" (default target) (3) -> +(ClCompile target) -> + D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24\pngerror.c(775): warning C4013: 'ExitProcess' undefined; assuming extern returning int [D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj] + + +"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\ALL_BUILD.vcxproj" (default target) (1) -> +"D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj" (default target) (3) -> +(Link target) -> + pngerror.obj : error LNK2019: unresolved external symbol _ExitProcess referenced in function _png_longjmp [D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj] + D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\Release\libpng16.dll : fatal error LNK1120: 1 unresolved externals [D:\src\vcpkg\buildtrees\libpng\x86-uwp-rel\png.vcxproj] + + 1 Warning(s) + 2 Error(s) + +Time Elapsed 00:00:04.19 +``` + +### Identify the problematic code + +Taking a look at [MSDN](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682658(v=vs.85).aspx) shows that `ExitProcess` is only available for desktop apps. Additionally, it's useful to see the surrounding context: + +```c +/* buildtrees\libpng\src\libpng-1.6.24\pngerror.c:769 */ + /* If control reaches this point, png_longjmp() must not return. The only + * choice is to terminate the whole process (or maybe the thread); to do + * this the ANSI-C abort() function is used unless a different method is + * implemented by overriding the default configuration setting for + * PNG_ABORT(). + */ + PNG_ABORT(); +``` + +A recursive search for `PNG_ABORT` reveals the definition: +```no-highlight +PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> findstr /snipl "PNG_ABORT" * +CHANGES:701: Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros +libpng-manual.txt:432:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng-manual.txt:434:You can #define PNG_ABORT() to a function that does something +libpng-manual.txt:2753:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng-manual.txt:2755:You can #define PNG_ABORT() to a function that does something +libpng-manual.txt:4226:PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()), +libpng.3:942:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng.3:944:You can #define PNG_ABORT() to a function that does something +libpng.3:3263:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng.3:3265:You can #define PNG_ABORT() to a function that does something +libpng.3:4736:PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()), +png.h:994: * will use it; otherwise it will call PNG_ABORT(). This function was +pngerror.c:773: * PNG_ABORT(). +pngerror.c:775: PNG_ABORT(); +pngpriv.h:459:#ifndef PNG_ABORT +pngpriv.h:461:# define PNG_ABORT() ExitProcess(0) +pngpriv.h:463:# define PNG_ABORT() abort() +``` + +This already gives us some great clues, but the full definition tells the complete story. + +```c +/* buildtrees\libpng\src\libpng-1.6.24\pngpriv.h:459 */ +#ifndef PNG_ABORT +# ifdef _WINDOWS_ +# define PNG_ABORT() ExitProcess(0) +# else +# define PNG_ABORT() abort() +# endif +#endif +``` + +`abort()` is a standard CRT call and certainly available in UWP, so we just need to convince libpng to be more platform agnostic. The easiest and most reliable way to achieve this is to patch the code; while in this particular case we could pass in a compiler flag to override `PNG_ABORT` because this is a private header, in general it is more reliable to avoid adding more required compiler switches when possible (especially when it isn't already exposed as a CMake option). + +### Patching the code to improve compatibility + +We recommend using git to create the patch file, since you'll already have it installed. +```no-highlight +PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> git init . +Initialized empty Git repository in D:/src/vcpkg/buildtrees/libpng/src/libpng-1.6.24/.git/ + +PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> git add . +warning: LF will be replaced by CRLF in ANNOUNCE. +The file will have its original line endings in your working directory. +... + +PS D:\src\vcpkg\buildtrees\libpng\src\libpng-1.6.24> git commit -m "temp" +[master (root-commit) 68f253f] temp + 422 files changed, 167717 insertions(+) +... +``` + +Now we can modify `pngpriv.h` to use `abort()` everywhere. +```c +/* buildtrees\libpng\src\libpng-1.6.24\pngpriv.h:459 */ +#ifndef PNG_ABORT +# define PNG_ABORT() abort() +#endif +``` + +The output of `git diff` is already in patch format, so we just need to save the patch into the `ports/libpng` directory. +```no-highlight +PS buildtrees\libpng\src\libpng-1.6.24> git diff | out-file -enc ascii ..\..\..\..\ports\libpng\use-abort-on-all-platforms.patch +``` + +Finally, we need to apply the patch after extracting the source. +```cmake +# ports\libpng\portfile.cmake +... +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_apply_patches( + SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 + PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" +) + +vcpkg_configure_cmake( +... +``` + +### Verification + +To be completely sure this works from scratch, we need to remove the package and rebuild it: + +```no-highlight +PS D:\src\vcpkg> vcpkg remove libpng:x86-uwp +Package libpng:x86-uwp was successfully removed +``` +and complete delete the building directory: D:\src\vcpkg\buildtrees\libpng + +Now we try a fresh, from scratch install. +```no-highlight +PS D:\src\vcpkg> vcpkg install libpng:x86-uwp +-- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-uwp +-- DOWNLOADS=D:/src/vcpkg/downloads +-- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/libpng_x86-uwp +-- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/libpng +-- CURRENT_PORT_DIR=D:/src/vcpkg/ports/libpng/. +-- Using cached D:/src/vcpkg/downloads/libpng-1.6.24.tar.xz +-- Extracting source D:/src/vcpkg/downloads/libpng-1.6.24.tar.xz +-- Extracting done +-- Configuring x86-uwp-rel +-- Configuring x86-uwp-rel done +-- Configuring x86-uwp-dbg +-- Configuring x86-uwp-dbg done +-- Build x86-uwp-rel +-- Build x86-uwp-rel done +-- Build x86-uwp-dbg +-- Build x86-uwp-dbg done +-- Package x86-uwp-rel +-- Package x86-uwp-rel done +-- Package x86-uwp-dbg +-- Package x86-uwp-dbg done +Package libpng:x86-uwp is installed +``` + +Finally, to fully commit and publish the changes, we need to bump the internal release number and add the patch file to source control, then make a Pull Request! + +```no-highlight +# ports\libpng\CONTROL +Source: libpng +Version: 1.6.24-1 +Build-Depends: zlib +``` diff --git a/docs/examples/using-sqlite.md b/docs/examples/using-sqlite.md deleted file mode 100644 index 35da141d0..000000000 --- a/docs/examples/using-sqlite.md +++ /dev/null @@ -1,177 +0,0 @@ -# Example: Using Sqlite - - - [Step 1: Install](#install) - - [Step 2: Use](#use) - - [VS/MSBuild Project (User-wide integration)](#msbuild) - - [CMake (Toolchain file)](#cmake) - - [Other integration options](../users/integration.md) - ---- - -## Step 1: Install - -First, we need to know what name [Sqlite](https://sqlite.org) goes by in the ports tree. To do that, we'll run the `search` command and inspect the output: -```no-highlight -PS D:\src\vcpkg> .\vcpkg search sqlite -libodb-sqlite 2.4.0 Sqlite support for the ODB ORM library -sqlite3 3.15.0 SQLite is a software library that implements a se... - -If your library is not listed, please open an issue at: - https://github.com/Microsoft/vcpkg/issues -``` -Looking at the list, we can see that the port is named "sqlite3". You can also run the `search` command without arguments to see the full list of packages. - -Installing is then as simple as using the `install` command. -```no-highlight -PS D:\src\vcpkg> .\vcpkg install sqlite3 --- CURRENT_INSTALLED_DIR=D:/src/vcpkg/installed/x86-windows --- DOWNLOADS=D:/src/vcpkg/downloads --- CURRENT_PACKAGES_DIR=D:/src/vcpkg/packages/sqlite3_x86-windows --- CURRENT_BUILDTREES_DIR=D:/src/vcpkg/buildtrees/sqlite3 --- CURRENT_PORT_DIR=D:/src/vcpkg/ports/sqlite3/. --- Downloading https://sqlite.org/2016/sqlite-amalgamation-3150000.zip... --- Downloading https://sqlite.org/2016/sqlite-amalgamation-3150000.zip... OK --- Testing integrity of downloaded file... --- Testing integrity of downloaded file... OK --- Extracting source D:/src/vcpkg/downloads/sqlite-amalgamation-3150000.zip --- Extracting done --- Configuring x86-windows-rel --- Configuring x86-windows-rel done --- Configuring x86-windows-dbg --- Configuring x86-windows-dbg done --- Build x86-windows-rel --- Build x86-windows-rel done --- Build x86-windows-dbg --- Build x86-windows-dbg done --- Package x86-windows-rel --- Package x86-windows-rel done --- Package x86-windows-dbg --- Package x86-windows-dbg done --- Performing post-build validation --- Performing post-build validation done -Package sqlite3:x86-windows is installed -``` - -We can check that sqlite3 was successfully installed for x86 windows desktop by running the `list` command. -```no-highlight -PS D:\src\vcpkg> .\vcpkg list -sqlite3:x86-windows 3.15.0 SQLite is a software library that implements a se... -``` - -To install for other architectures and platforms such as Universal Windows Platform or x64 Desktop, you can suffix the package name with `:`. -```no-highlight -PS D:\src\vcpkg> .\vcpkg install sqlite3:x86-uwp zlib:x64-windows -``` - -See `.\vcpkg help triplet` for all supported targets. - ---- - -## Step 2: Use - -#### VS/MSBuild Project (User-wide integration) - -The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwards is no longer required and the integration is configured on a per-user basis. -```no-highlight -PS D:\src\vcpkg> .\vcpkg integrate install -Applied user-wide integration for this vcpkg root. - -All C++ projects can now #include any installed libraries. -Linking will be handled automatically. -Installing new libraries will make them instantly available. -``` -*Note: You will need to restart Visual Studio or perform a Build to update intellisense with the changes.* - -You can now simply use File -> New Project in Visual Studio 2015 or Visual Studio 2017 and the library will be automatically available. For Sqlite, you can try out their [C/C++ sample](https://sqlite.org/quickstart.html). - -To remove the integration for your user, you can use `.\vcpkg integrate remove`. - - -#### CMake (Toolchain File) - -The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. - -If you are using CMake through Open Folder with Visual Studio 2017 you can define `CMAKE_TOOLCHAIN_FILE` by adding a "variables" section to each of your `CMakeSettings.json` configurations: - -```json -{ - "configurations": [{ - "name": "x86-Debug", - "generator": "Visual Studio 15 2017", - "configurationType" : "Debug", - "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "-m -v:minimal", - "variables": [{ - "name": "CMAKE_TOOLCHAIN_FILE", - "value": "D:\\src\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" - }] - }] -} -``` - -Now let's make a simple CMake project with a main file. -```cmake -# CMakeLists.txt -cmake_minimum_required(VERSION 3.0) -project(test) - -find_package(Sqlite3 REQUIRED) - -add_executable(main main.cpp) -target_link_libraries(main sqlite3) -``` -```cpp -// main.cpp -#include -#include - -int main() -{ - printf("%s\n", sqlite3_libversion()); - return 0; -} -``` - -Then, we build our project in the normal CMake way: -```no-highlight -PS D:\src\cmake-test> mkdir build -PS D:\src\cmake-test> cd build -PS D:\src\cmake-test\build> cmake .. "-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake" - // omitted CMake output here // --- Build files have been written to: D:/src/cmake-test/build -PS D:\src\cmake-test\build> cmake --build . - // omitted MSBuild output here // -Build succeeded. - 0 Warning(s) - 0 Error(s) - -Time Elapsed 00:00:02.38 -PS D:\src\cmake-test\build> .\Debug\main.exe -3.15.0 -``` - -*Note: The correct sqlite3.dll is automatically copied to the output folder when building for x86-windows. You will need to distribute this along with your application.* - -##### Handling libraries without native cmake support - -Unlike other platforms, we do not automatically add the `include\` directory to your compilation line by default. If you're using a library that does not provide CMake integration, you will need to explicitly search for the files and add them yourself using [`find_path()`][1] and [`find_library()`][2]. - -```cmake -# To find and use catch -find_path(CATCH_INCLUDE_DIR catch.hpp) -include_directories(${CATCH_INCLUDE_DIR}) - -# To find and use azure-storage-cpp -find_path(WASTORAGE_INCLUDE_DIR was/blob.h) -find_library(WASTORAGE_LIBRARY wastorage) -include_directories(${WASTORAGE_INCLUDE_DIR}) -link_libraries(${WASTORAGE_LIBRARY}) - -# Note that we recommend using the target-specific directives for a cleaner cmake: -# target_include_directories(main ${LIBRARY}) -# target_link_libraries(main PRIVATE ${LIBRARY}) -``` - -[1]: https://cmake.org/cmake/help/latest/command/find_path.html -[2]: https://cmake.org/cmake/help/latest/command/find_library.html diff --git a/docs/index.md b/docs/index.md index 90245d36a..d7b104ebc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -2,13 +2,13 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are constantly evolving; your involvement are vital to its success! -- [How to use Sqlite in your application](examples/using-sqlite.md) +- [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md) ### Examples -- [Example 1: Using Sqlite](examples/using-sqlite.md) -- [Example 2: Packaging zlib](examples/packaging-zlib.md) -- [Example 3: Patching libpng for x86-uwp](examples/patching-libpng.md) +- [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md) +- [Packaging Zipfiles Example: zlib](examples/packaging-zipfiles.md) +- [Patching Example: Patching libpng to work for x86-uwp](examples/patching.md) ### User Help diff --git a/docs/users/integration.md b/docs/users/integration.md index ce52abe23..fbaea41d9 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -35,7 +35,7 @@ cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.c ``` Projects configured with the Vcpkg toolchain file will have the appropriate Vcpkg folders added to the cmake search paths. This makes all libraries available to be found through `find_package()`, `find_path()`, and `find_library()`. -See [Example: Using Sqlite](../examples/using-sqlite.md) for a fully worked example using our CMake toolchain. +See [Installing and Using Packages Example: sqlite](../examples/installing-and-using-packages.md) for a fully worked example using our CMake toolchain. Note that we do not automatically add ourselves to your compiler include paths. To use a header-only library, simply use `find_path()`, which will correctly work on all platforms: ```cmake -- cgit v1.2.3 From 02839ae4a83d505bae17d5856ce851af29c89c65 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Thu, 15 Nov 2018 11:24:24 -0800 Subject: vcpkg was going out of its way to use partition before calling the container erase function which is slower than just using remove_if. remove_if is already stable, so separate stable and unstable versions are unnecessary. https://iterator.wordpress.com/2016/01/31/algorithms_0/ Unstable remove_if algorithms are possible that might win, as indicated in that article; but plain remove_if provides the most consistent behavior. --- toolsrc/include/vcpkg/base/util.h | 12 ------- toolsrc/src/vcpkg/build.cpp | 36 ++++++++++---------- toolsrc/src/vcpkg/commands.autocomplete.cpp | 52 ++++++++++++++--------------- toolsrc/src/vcpkg/postbuildlint.cpp | 33 +++++++++--------- toolsrc/src/vcpkg/statusparagraph.cpp | 2 +- toolsrc/src/vcpkg/vcpkgpaths.cpp | 10 +++--- toolsrc/src/vcpkg/visualstudio.cpp | 30 ++++++++--------- 7 files changed, 82 insertions(+), 93 deletions(-) diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h index 7266fbbc6..65ce02b99 100644 --- a/toolsrc/include/vcpkg/base/util.h +++ b/toolsrc/include/vcpkg/base/util.h @@ -71,18 +71,6 @@ namespace vcpkg::Util return ret; } - template - void stable_keep_if(Container& cont, Pred pred) - { - cont.erase(std::stable_partition(cont.begin(), cont.end(), pred), cont.end()); - } - - template - void unstable_keep_if(Container& cont, Pred pred) - { - cont.erase(std::partition(cont.begin(), cont.end(), pred), cont.end()); - } - template void erase_remove_if(Container& cont, Pred pred) { diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 9b97701ef..0e60fd50e 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -63,7 +63,7 @@ namespace vcpkg::Build::Command spec.name()); const StatusParagraphs status_db = database_load_check(paths); - const Build::BuildPackageOptions build_package_options { + const Build::BuildPackageOptions build_package_options{ Build::UseHeadVersion::NO, Build::AllowDownloads::YES, Build::CleanBuildtrees::NO, @@ -76,8 +76,8 @@ namespace vcpkg::Build::Command std::set features_as_set(full_spec.features.begin(), full_spec.features.end()); features_as_set.emplace("core"); - const Build::BuildPackageConfig build_config { - *scf, spec.triplet(), fs::path {port_dir}, build_package_options, features_as_set}; + const Build::BuildPackageConfig build_config{ + *scf, spec.triplet(), fs::path{port_dir}, build_package_options, features_as_set}; const auto build_timer = Chrono::ElapsedTimer::create_started(); const auto result = Build::build_package(paths, build_config, status_db); @@ -470,22 +470,22 @@ namespace vcpkg::Build std::vector abi_tag_entries(dependency_abis.begin(), dependency_abis.end()); - abi_tag_entries.emplace_back(AbiEntry {"cmake", paths.get_tool_version(Tools::CMAKE)}); + abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)}); abi_tag_entries.emplace_back( - AbiEntry {"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")}); + AbiEntry{"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")}); abi_tag_entries.emplace_back( - AbiEntry {"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")}); + AbiEntry{"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")}); abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"}); abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag}); const std::string features = Strings::join(";", config.feature_list); - abi_tag_entries.emplace_back(AbiEntry {"features", features}); + abi_tag_entries.emplace_back(AbiEntry{"features", features}); if (config.build_package_options.use_head_version == UseHeadVersion::YES) - abi_tag_entries.emplace_back(AbiEntry {"head", ""}); + abi_tag_entries.emplace_back(AbiEntry{"head", ""}); Util::sort(abi_tag_entries); @@ -503,7 +503,7 @@ namespace vcpkg::Build } auto abi_tag_entries_missing = abi_tag_entries; - Util::stable_keep_if(abi_tag_entries_missing, [](const AbiEntry& p) { return p.value.empty(); }); + Util::erase_remove_if(abi_tag_entries_missing, [](const AbiEntry& p) { return !p.value.empty(); }); if (abi_tag_entries_missing.empty()) { @@ -512,7 +512,7 @@ namespace vcpkg::Build const auto abi_file_path = paths.buildtrees / name / (triplet.canonical_name() + ".vcpkg_abi_info.txt"); fs.write_contents(abi_file_path, full_abi_info); - return AbiTagAndFile {Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path}; + return AbiTagAndFile{Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path}; } System::println( @@ -581,8 +581,8 @@ namespace vcpkg::Build Util::sort_unique_erase(dep_pspecs); // Find all features that aren't installed. This mutates required_fspecs. - Util::unstable_keep_if(required_fspecs, [&](FeatureSpec const& fspec) { - return !status_db.is_installed(fspec) && fspec.name() != name; + Util::erase_remove_if(required_fspecs, [&](FeatureSpec const& fspec) { + return status_db.is_installed(fspec) || fspec.name() == name; }); if (!required_fspecs.empty()) @@ -602,7 +602,7 @@ namespace vcpkg::Build const auto status_it = status_db.find_installed(pspec); Checks::check_exit(VCPKG_LINE_INFO, status_it != status_db.end()); dependency_abis.emplace_back( - AbiEntry {status_it->get()->package.spec.name(), status_it->get()->package.abi}); + AbiEntry{status_it->get()->package.spec.name(), status_it->get()->package.abi}); } const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet); @@ -648,7 +648,7 @@ namespace vcpkg::Build System::println("Could not locate cached archive: %s", archive_path.u8string()); ExtendedBuildResult result = do_build_package_and_clean_buildtrees( - paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile {}).tag, config); + paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config); std::error_code ec; fs.create_directories(paths.package_dir(spec) / "share" / spec.name(), ec); @@ -685,7 +685,7 @@ namespace vcpkg::Build } return do_build_package_and_clean_buildtrees( - paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile {}).tag, config); + paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config); } const std::string& to_string(const BuildResult build_result) @@ -850,21 +850,21 @@ namespace vcpkg::Build if (variable_name == "VCPKG_PLATFORM_TOOLSET") { pre_build_info.platform_toolset = - variable_value.empty() ? nullopt : Optional {variable_value}; + variable_value.empty() ? nullopt : Optional{variable_value}; continue; } if (variable_name == "VCPKG_VISUAL_STUDIO_PATH") { pre_build_info.visual_studio_path = - variable_value.empty() ? nullopt : Optional {variable_value}; + variable_value.empty() ? nullopt : Optional{variable_value}; continue; } if (variable_name == "VCPKG_CHAINLOAD_TOOLCHAIN_FILE") { pre_build_info.external_toolchain_file = - variable_value.empty() ? nullopt : Optional {variable_value}; + variable_value.empty() ? nullopt : Optional{variable_value}; continue; } diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index bded1ee39..3b353feec 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -40,27 +40,25 @@ namespace vcpkg::Commands::Autocomplete const std::string requested_command = match[1].str(); // First try public commands - std::vector public_commands = { - "install", - "search", - "remove", - "list", - "update", - "hash", - "help", - "integrate", - "export", - "edit", - "create", - "owns", - "cache", - "version", - "contact", - "upgrade" - }; - - Util::unstable_keep_if(public_commands, [&](const std::string& s) { - return Strings::case_insensitive_ascii_starts_with(s, requested_command); + std::vector public_commands = {"install", + "search", + "remove", + "list", + "update", + "hash", + "help", + "integrate", + "export", + "edit", + "create", + "owns", + "cache", + "version", + "contact", + "upgrade"}; + + Util::erase_remove_if(public_commands, [&](const std::string& s) { + return !Strings::case_insensitive_ascii_starts_with(s, requested_command); }); if (!public_commands.empty()) @@ -79,8 +77,8 @@ namespace vcpkg::Commands::Autocomplete "portsdiff", }; - Util::unstable_keep_if(private_commands, [&](const std::string& s) { - return Strings::case_insensitive_ascii_starts_with(s, requested_command); + Util::erase_remove_if(private_commands, [&](const std::string& s) { + return !Strings::case_insensitive_ascii_starts_with(s, requested_command); }); output_sorted_results_and_exit(VCPKG_LINE_INFO, std::move(private_commands)); @@ -99,8 +97,8 @@ namespace vcpkg::Commands::Autocomplete } std::vector triplets = paths.get_available_triplets(); - Util::unstable_keep_if(triplets, [&](const std::string& s) { - return Strings::case_insensitive_ascii_starts_with(s, triplet_prefix); + Util::erase_remove_if(triplets, [&](const std::string& s) { + return !Strings::case_insensitive_ascii_starts_with(s, triplet_prefix); }); auto result = combine_port_with_triplets(port_name, triplets); @@ -152,8 +150,8 @@ namespace vcpkg::Commands::Autocomplete } } - Util::unstable_keep_if(results, [&](const std::string& s) { - return Strings::case_insensitive_ascii_starts_with(s, prefix); + Util::erase_remove_if(results, [&](const std::string& s) { + return !Strings::case_insensitive_ascii_starts_with(s, prefix); }); if (command.name == "install" && results.size() == 1 && !is_option) diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index 90dcb7d64..650b6e3c9 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -16,9 +16,9 @@ using vcpkg::Build::PreBuildInfo; namespace vcpkg::PostBuildLint { - static auto has_extension_pred(const Files::Filesystem& fs, const std::string& ext) + static auto not_extension_pred(const Files::Filesystem& fs, const std::string& ext) { - return [&fs, ext](const fs::path& path) { return !fs.is_directory(path) && path.extension() == ext; }; + return [&fs, ext](const fs::path& path) { return fs.is_directory(path) || path.extension() != ext; }; } enum class LintStatus @@ -104,8 +104,8 @@ namespace vcpkg::PostBuildLint std::vector files_found = fs.get_files_recursive(debug_include_dir); - Util::unstable_keep_if( - files_found, [&fs](const fs::path& path) { return !fs.is_directory(path) && path.extension() != ".ifc"; }); + Util::erase_remove_if( + files_found, [&fs](const fs::path& path) { return fs.is_directory(path) || path.extension() == ".ifc"; }); if (!files_found.empty()) { @@ -206,7 +206,7 @@ namespace vcpkg::PostBuildLint static LintStatus check_for_dlls_in_lib_dir(const Files::Filesystem& fs, const fs::path& package_dir) { std::vector dlls = fs.get_files_recursive(package_dir / "lib"); - Util::unstable_keep_if(dlls, has_extension_pred(fs, ".dll")); + Util::erase_remove_if(dlls, not_extension_pred(fs, ".dll")); if (!dlls.empty()) { @@ -280,7 +280,7 @@ namespace vcpkg::PostBuildLint static LintStatus check_for_exes(const Files::Filesystem& fs, const fs::path& package_dir) { std::vector exes = fs.get_files_recursive(package_dir / "bin"); - Util::unstable_keep_if(exes, has_extension_pred(fs, ".exe")); + Util::erase_remove_if(exes, not_extension_pred(fs, ".exe")); if (!exes.empty()) { @@ -572,8 +572,8 @@ namespace vcpkg::PostBuildLint { std::vector empty_directories = fs.get_files_recursive(dir); - Util::unstable_keep_if(empty_directories, [&fs](const fs::path& current) { - return fs.is_directory(current) && fs.is_empty(current); + Util::erase_remove_if(empty_directories, [&fs](const fs::path& current) { + return !fs.is_directory(current) || !fs.is_empty(current); }); if (!empty_directories.empty()) @@ -707,12 +707,15 @@ namespace vcpkg::PostBuildLint static LintStatus check_no_files_in_dir(const Files::Filesystem& fs, const fs::path& dir) { std::vector misplaced_files = fs.get_files_non_recursive(dir); - Util::unstable_keep_if(misplaced_files, [&fs](const fs::path& path) { + Util::erase_remove_if(misplaced_files, [&fs](const fs::path& path) { const std::string filename = path.filename().generic_string(); if (Strings::case_insensitive_ascii_equals(filename.c_str(), "CONTROL") || Strings::case_insensitive_ascii_equals(filename.c_str(), "BUILD_INFO")) - return false; - return !fs.is_directory(path); + { + return true; + } + + return fs.is_directory(path); }); if (!misplaced_files.empty()) @@ -764,9 +767,9 @@ namespace vcpkg::PostBuildLint const fs::path release_bin_dir = package_dir / "bin"; std::vector debug_libs = fs.get_files_recursive(debug_lib_dir); - Util::unstable_keep_if(debug_libs, has_extension_pred(fs, ".lib")); + Util::erase_remove_if(debug_libs, not_extension_pred(fs, ".lib")); std::vector release_libs = fs.get_files_recursive(release_lib_dir); - Util::unstable_keep_if(release_libs, has_extension_pred(fs, ".lib")); + Util::erase_remove_if(release_libs, not_extension_pred(fs, ".lib")); if (!pre_build_info.build_type) error_count += check_matching_debug_and_release_binaries(debug_libs, release_libs); @@ -780,9 +783,9 @@ namespace vcpkg::PostBuildLint } std::vector debug_dlls = fs.get_files_recursive(debug_bin_dir); - Util::unstable_keep_if(debug_dlls, has_extension_pred(fs, ".dll")); + Util::erase_remove_if(debug_dlls, not_extension_pred(fs, ".dll")); std::vector release_dlls = fs.get_files_recursive(release_bin_dir); - Util::unstable_keep_if(release_dlls, has_extension_pred(fs, ".dll")); + Util::erase_remove_if(release_dlls, not_extension_pred(fs, ".dll")); switch (build_info.library_linkage) { diff --git a/toolsrc/src/vcpkg/statusparagraph.cpp b/toolsrc/src/vcpkg/statusparagraph.cpp index 462d8d8ed..86946a31a 100644 --- a/toolsrc/src/vcpkg/statusparagraph.cpp +++ b/toolsrc/src/vcpkg/statusparagraph.cpp @@ -105,7 +105,7 @@ namespace vcpkg { dep.erase(std::find(dep.begin(), dep.end(), '['), dep.end()); } - Util::unstable_keep_if(deps, [&](auto&& e) { return e != l_spec.name(); }); + Util::erase_remove_if(deps, [&](auto&& e) { return e == l_spec.name(); }); // Util::sort_unique_erase(deps); diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 748fd20e0..9a51818e8 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -137,8 +137,8 @@ namespace vcpkg if (tsv && vsp) { - Util::stable_keep_if( - candidates, [&](const Toolset* t) { return *tsv == t->version && *vsp == t->visual_studio_root_path; }); + Util::erase_remove_if( + candidates, [&](const Toolset* t) { return *tsv != t->version || *vsp != t->visual_studio_root_path; }); Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "Could not find Visual Studio instance at %s with %s toolset.", @@ -151,7 +151,7 @@ namespace vcpkg if (tsv) { - Util::stable_keep_if(candidates, [&](const Toolset* t) { return *tsv == t->version; }); + Util::erase_remove_if(candidates, [&](const Toolset* t) { return *tsv != t->version; }); Checks::check_exit( VCPKG_LINE_INFO, !candidates.empty(), "Could not find Visual Studio instance with %s toolset.", *tsv); } @@ -159,8 +159,8 @@ namespace vcpkg if (vsp) { const fs::path vs_root_path = *vsp; - Util::stable_keep_if(candidates, - [&](const Toolset* t) { return vs_root_path == t->visual_studio_root_path; }); + Util::erase_remove_if(candidates, + [&](const Toolset* t) { return vs_root_path != t->visual_studio_root_path; }); Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "Could not find Visual Studio instance at %s.", diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index e3656a7d2..51e6c22d1 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -130,9 +130,9 @@ namespace vcpkg::VisualStudio { // We want lexically_normal(), but it is not available // Correct root path might be 2 or 3 levels up, depending on if the path has trailing backslash. Try both. - auto common7_tools = fs::path {*path_as_string}; - append_if_has_cl(fs::path {*path_as_string}.parent_path().parent_path()); - append_if_has_cl(fs::path {*path_as_string}.parent_path().parent_path().parent_path()); + auto common7_tools = fs::path{*path_as_string}; + append_if_has_cl(fs::path{*path_as_string}.parent_path().parent_path()); + append_if_has_cl(fs::path{*path_as_string}.parent_path().parent_path().parent_path()); } // VS2015 instance from Program Files @@ -143,7 +143,7 @@ namespace vcpkg::VisualStudio std::vector get_visual_studio_instances(const VcpkgPaths& paths) { - std::vector sorted {get_visual_studio_instances_internal(paths)}; + std::vector sorted{get_visual_studio_instances_internal(paths)}; std::sort(sorted.begin(), sorted.end(), VisualStudioInstance::preferred_first_comparator); return Util::fmap(sorted, [](const VisualStudioInstance& instance) { return instance.to_string(); }); } @@ -160,8 +160,8 @@ namespace vcpkg::VisualStudio std::vector found_toolsets; std::vector excluded_toolsets; - const SortedVector sorted {get_visual_studio_instances_internal(paths), - VisualStudioInstance::preferred_first_comparator}; + const SortedVector sorted{get_visual_studio_instances_internal(paths), + VisualStudioInstance::preferred_first_comparator}; const bool v140_is_available = Util::find_if(sorted, [&](const VisualStudioInstance& vs_instance) { return vs_instance.major_version() == "14"; @@ -202,8 +202,8 @@ namespace vcpkg::VisualStudio // Locate the "best" MSVC toolchain version const fs::path msvc_path = vc_dir / "Tools" / "MSVC"; std::vector msvc_subdirectories = fs.get_files_non_recursive(msvc_path); - Util::unstable_keep_if(msvc_subdirectories, - [&fs](const fs::path& path) { return fs.is_directory(path); }); + Util::erase_remove_if(msvc_subdirectories, + [&fs](const fs::path& path) { return !fs.is_directory(path); }); // Sort them so that latest comes first std::sort( @@ -217,7 +217,7 @@ namespace vcpkg::VisualStudio paths_examined.push_back(dumpbin_path); if (fs.exists(dumpbin_path)) { - const Toolset v141_toolset { + const Toolset v141_toolset{ vs_instance.root_path, dumpbin_path, vcvarsall_bat, {}, V_141, supported_architectures}; const auto english_language_pack = dumpbin_path.parent_path() / "1033"; @@ -232,12 +232,12 @@ namespace vcpkg::VisualStudio if (v140_is_available) { - const Toolset v140_toolset {vs_instance.root_path, - dumpbin_path, - vcvarsall_bat, - {"-vcvars_ver=14.0"}, - V_140, - supported_architectures}; + const Toolset v140_toolset{vs_instance.root_path, + dumpbin_path, + vcvarsall_bat, + {"-vcvars_ver=14.0"}, + V_140, + supported_architectures}; found_toolsets.push_back(v140_toolset); } -- cgit v1.2.3 From f598d6c30f19f1442009efe592ca6fba2a65caca Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sat, 20 Oct 2018 16:01:02 -0700 Subject: [cmake] Update to 3.12.4 --- README.md | 2 +- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 23cb4e5f4..71a4091e0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Prerequisites: - Windows 10, 8.1, 7, Linux, or MacOS - Visual Studio 2017 or Visual Studio 2015 Update 3 (on Windows) - Git -- *Optional:* CMake 3.10.2 +- *Optional:* CMake 3.12.4 To get started: ``` diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 747963c07..4b8b18061 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,25 +1,25 @@ - 3.11.4 - cmake-3.11.4-win32-x86\bin\cmake.exe - https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip - 3d866ef3c41a9cf738427fccf4730ccf8fd86bb4d13e9a1671b156bbdb2bc6beeecc7e7e8190cea8297498cfd67366c71231e9e08b121d4cd6e5ceac04124c19 - cmake-3.11.4-win32-x86.zip + 3.12.4 + cmake-3.12.4-win32-x86\bin\cmake.exe + https://cmake.org/files/v3.12/cmake-3.12.4-win32-x86.zip + ca7097c5917101c39d5fa5325cd256ad3aa616a7e5811915cb2869c24961dc133726015b3576908fbd0666f89c8e31886bed9cf6b532a3fe44681d5245bc25c7 + cmake-3.12.4-win32-x86.zip - 3.11.4 - cmake-3.11.4-Darwin-x86_64/CMake.app/Contents/bin/cmake - https://cmake.org/files/v3.11/cmake-3.11.4-Darwin-x86_64.tar.gz - eeb967dc5b6e46e8dee06939b8b416d40f644baad79ffd90f86ad18e1e3b58b50dec0f064e60467125be9bedb7de8c48fbcb8a97ca731645939539f97645db54 - cmake-3.11.4-Darwin-x86_64.tar.gz + 3.12.4 + cmake-3.12.4-Darwin-x86_64/CMake.app/Contents/bin/cmake + https://cmake.org/files/v3.12/cmake-3.12.4-Darwin-x86_64.tar.gz + 67ce23394d9679818ab0f2792f5d585c8c6f385e18584d488a47d48b768d1ee20b58247d22945aeff1ff9f84b7e843457dac98a50801ac3068ab1fbcbe0b0f45 + cmake-3.12.4-Darwin-x86_64.tar.gz - 3.11.4 - cmake-3.11.4-Linux-x86_64/bin/cmake - https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz - 70d92eea972710684582154dc1b884536aba5abda130a431257750b54437c46397aea39c2cc31056ecf36ddadbc1cf5c22434794fb314ea67c15a9be3bd20092 - cmake-3.11.4-Linux-x86_64.tar.gz + 3.12.4 + cmake-3.12.4-Linux-x86_64/bin/cmake + https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.tar.gz + ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f + cmake-3.12.4-Linux-x86_64.tar.gz 2.17.1 -- cgit v1.2.3 From bcac1dc58194c09bc5b579cf6fcd95e54c97da0b Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Thu, 15 Nov 2018 14:30:24 -0800 Subject: Update range-v3 upstream commit (#4741) --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index 1ed4dc94c..1c5cb114d 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0-01ccd0e +Version: 0.4.0-87a6c31 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index f1d78711b..203ef211c 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 01ccd0e552860efe00e4e3e55bf823be445aabb4 - SHA512 5e6c3e597dc40128ae0642ca43340c88654c25d9239e6929edda44035f23b7dec3735baecd486ca3b161b453c8fe826f82124ced24da66e288e0e93fa5d51c54 + REF 87a6c31cdd9d13f0673da4f650b44c2171cb2744 + SHA512 8ddf91adf02599bdb87622d80a00fa02da060331572d4e614aec9e22bc6e1890a00da68fcf27d83f9c8de576ec043296e2a7c99a3676b6ddaec6d10d19387479 HEAD_REF master ) -- cgit v1.2.3 From 27ec00ff3dd445878f2816284239fe4ad02f8ac5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 15 Nov 2018 15:19:42 -0800 Subject: [git] Update to 2.19.1 --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 4b8b18061..eaf84caa3 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -22,11 +22,11 @@ cmake-3.12.4-Linux-x86_64.tar.gz - 2.17.1 + 2.19.1 cmd\git.exe - https://github.com/git-for-windows/git/releases/download/v2.17.1.windows.1/MinGit-2.17.1-32-bit.zip - 8bf93f6d3b6eb8a4ccbf840ff0b8b11a8b3a28fc5cd27aaa98dab5964acebbd17307e8ecec4e0cdd8b8ba095491d39bc9d55f4330284089cf3dadcab1d3fb7a4 - MinGit-2.17.1-32-bit.zip + https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/MinGit-2.19.1-32-bit.zip + 8a6d2caae2cbaacee073a641cda21465a749325c0af620dabd0e5521c84c92c8d747caa468b111d2ec52b99aee2ee3e6ec41a0a07a8fff582f4c8da568ea329e + MinGit-2.19.1-32-bit.zip 2.7.4 -- cgit v1.2.3 From 077b7f1378537478ec97a57af664ebba2efc0c86 Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Fri, 16 Nov 2018 11:24:19 +0000 Subject: Add packaging GitHub repo example --- README.md | 2 +- docs/about/faq.md | 2 +- docs/examples/packaging-github-repos.md | 59 +++++++++++++++++++++++++++++++++ docs/index.md | 1 + 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 docs/examples/packaging-github-repos.md diff --git a/README.md b/README.md index e0267bce4..0aef78d56 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ and restart Powershell. ## Examples -See the [documentation](docs/index.md) for specific walkthroughs, including [installing and using a package](docs/examples/installing-and-using-packages.md) and [adding a new package](docs/examples/packaging-zipfiles.md). +See the [documentation](docs/index.md) for specific walkthroughs, including [installing and using a package](docs/examples/installing-and-using-packages.md), [adding a new package from a zipfile](docs/examples/packaging-zipfiles.md), and [adding a new package from a GitHub repo](docl/examples/packaging-github-repos.md). Our docs are now also available online at ReadTheDocs: ! diff --git a/docs/about/faq.md b/docs/about/faq.md index 57b908f48..b7c9d67c8 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -10,7 +10,7 @@ Yes! See [the `export` command](../users/integration.md#export). The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. ## How do I get more libraries? -The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see our [packaging example](../examples/packaging-zipfiles.md). +The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see our examples on packaging [zipfiles](../examples/packaging-zipfiles.md) and [GitHub repos](../examples/packaging-github-repos.md). We recommend cloning directly from [GitHub](https://github.com/microsoft/vcpkg) and using `git pull` to update the list of portfiles. Once you've updated your portfiles, `vcpkg update` will indicate any installed libraries that are now out of date. diff --git a/docs/examples/packaging-github-repos.md b/docs/examples/packaging-github-repos.md new file mode 100644 index 000000000..af2e6141a --- /dev/null +++ b/docs/examples/packaging-github-repos.md @@ -0,0 +1,59 @@ +## Packaging Github Repos Example: libogg +### Create the CONTROL file +The `CONTROL` file is a simple set of fields describing the package's metadata. + +*For libogg, we'll create the file `ports\libogg\CONTROL` with the following contents:* +```no-highlight +Source: libogg +Version: 1.3.3 +Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. +``` + +### Create the portfile +`portfile.cmake` describes how to build and install the package. First we include `vcpkg_common_functions` to give us utilities for carrying this out: + +```no-highlight +include(vcpkg_common_functions) +``` + +Now we download the project from Github with [`vcpkg_from_github`](../maintainers/vcpkg_from_github.md): + +```no-highlight +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/ogg + REF v1.3.3 + SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b + HEAD_REF master +) +``` + +The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded zipfile (you can get this easily by setting it to `1`, trying to install the package, and copying the checksum). + +Finally, we configure the project with CMake, install the package, and copy over the license file: + +```no-highlight +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg RENAME copyright) +``` + +Check the documentation for [`vcpkg_configure_cmake`](../maintainers/vcpkg_configure_cmake.md) and [`vcpkg_install_cmake`](../maintainers/vcpkg_install_cmake.md) if your package needs additional options. + +Now you can run `vcpkg install libogg` to build and install the package. + +### Suggested example portfiles +In the `ports\` directory are many libraries that can be used as examples, including many that are not based on CMake. + +- Header only libraries + - rapidjson + - range-v3 +- MSBuild-based + - cppunit + - mpg123 +- Non-CMake, custom buildsystem + - openssl + - ffmpeg diff --git a/docs/index.md b/docs/index.md index d7b104ebc..69dbdcd1e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,6 +8,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md) - [Packaging Zipfiles Example: zlib](examples/packaging-zipfiles.md) +- [Packaging GitHub Repositories Example: libogg](examples/packaging-github-repos.md) - [Patching Example: Patching libpng to work for x86-uwp](examples/patching.md) ### User Help -- cgit v1.2.3 From dc8503bb02ba8afc7641f53fd25d1566d44a9f41 Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Fri, 16 Nov 2018 15:04:10 +0000 Subject: Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0aef78d56..eca2ea365 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ and restart Powershell. ## Examples -See the [documentation](docs/index.md) for specific walkthroughs, including [installing and using a package](docs/examples/installing-and-using-packages.md), [adding a new package from a zipfile](docs/examples/packaging-zipfiles.md), and [adding a new package from a GitHub repo](docl/examples/packaging-github-repos.md). +See the [documentation](docs/index.md) for specific walkthroughs, including [installing and using a package](docs/examples/installing-and-using-packages.md), [adding a new package from a zipfile](docs/examples/packaging-zipfiles.md), and [adding a new package from a GitHub repo](docs/examples/packaging-github-repos.md). Our docs are now also available online at ReadTheDocs: ! -- cgit v1.2.3 From 56c6d87c60d613c28a182f417acb1de624514d84 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 16 Nov 2018 12:03:07 -0800 Subject: bump version in CONTROL file --- ports/berkeleydb/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL index 18eaae5d9..e77e5793a 100644 --- a/ports/berkeleydb/CONTROL +++ b/ports/berkeleydb/CONTROL @@ -1,3 +1,3 @@ Source: berkeleydb -Version: 4.8.30-1 +Version: 4.8.30-2 Description: A high-performance embedded database for key/value data. -- cgit v1.2.3 From 13e7f60bcab978ba65a929ab2c8bbf1e1e92328c Mon Sep 17 00:00:00 2001 From: Rajeev Massand Date: Fri, 16 Nov 2018 15:45:32 -0800 Subject: [azure-iot-sdk-c] Update sdk to 1.2.10 and update dependencies (#4717) * new versions for azure-iot-sdk-c, azure-c-shared-utility, azure-uamqp-c, azure-umqtt-c, azure-uhttp-c * [azure-iot-sdk-c] Modernize & Cleanup * fix for x64-windows --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 17 +++------- ports/azure-iot-sdk-c/CONTROL | 2 +- .../azure-iot-sdk-c/improve-external-deps-2.patch | 20 ------------ ports/azure-iot-sdk-c/improve-external-deps.patch | 37 ++++++++++++++++++---- ports/azure-iot-sdk-c/portfile.cmake | 25 ++++----------- ports/azure-uamqp-c/CONTROL | 2 +- ports/azure-uamqp-c/glob-headers.patch | 14 -------- ports/azure-uamqp-c/portfile.cmake | 19 +++-------- ports/azure-uhttp-c/CONTROL | 2 +- ports/azure-uhttp-c/portfile.cmake | 17 +++------- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 17 +++------- 13 files changed, 61 insertions(+), 115 deletions(-) delete mode 100644 ports/azure-iot-sdk-c/improve-external-deps-2.patch delete mode 100644 ports/azure-uamqp-c/glob-headers.patch diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index d676552ce..7a19242e9 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,4 +1,4 @@ Source: azure-c-shared-utility -Version: 1.1.5 +Version: 1.1.10-1 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 48763bef2..0d2d8a493 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -1,20 +1,15 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message("azure-c-shared-utility only supports static linkage") - set(VCPKG_LIBRARY_LINKAGE "static") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF e7aef25f8012e9e9333c72433a1d21f90f3a28b4 - SHA512 73b644bc1ea3d87fcdc0916f969fd779a20ed5ae263643dd21cc600265f84cab443f6578ff30f364ddea9e91ca4488615b78898e9c06f15cbc5d0af725ebfa00 + REF 68ede5bbc58c7d976f3bd68325edec181c254e5e + SHA512 97253c081cab90c7c879da9ecfa076be43d19fd0d442d91fcab8ab3149e792b868c363c56b5afc3e3880a18b400e663661d257237d2f1ef97544522a1cabcd5a HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -22,7 +17,7 @@ vcpkg_configure_cmake( -Dskip_samples=ON -Duse_installed_dependencies=ON -Duse_default_uuid=ON - -Dbuild_as_dynamic=${BUILD_AS_DYNAMIC} + -Dbuild_as_dynamic=OFF ) vcpkg_install_cmake() @@ -33,8 +28,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility) -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility RENAME copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility/copyright COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index a706b195c..69c813f3c 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-iot-sdk-c -Version: 1.2.3 +Version: 1.2.10-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/improve-external-deps-2.patch b/ports/azure-iot-sdk-c/improve-external-deps-2.patch deleted file mode 100644 index 04795fa1f..000000000 --- a/ports/azure-iot-sdk-c/improve-external-deps-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aa2dfad..f1656ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -129,15 +129,6 @@ endif() - #Use solution folders. - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - --# build the parson library for json parsing --add_library(parson -- ./deps/parson/parson.c -- ./deps/parson/parson.h --) --if(MSVC) -- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") --endif() -- - if(IN_OPENWRT) - ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") - INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") diff --git a/ports/azure-iot-sdk-c/improve-external-deps.patch b/ports/azure-iot-sdk-c/improve-external-deps.patch index d96e0fe38..171964baf 100644 --- a/ports/azure-iot-sdk-c/improve-external-deps.patch +++ b/ports/azure-iot-sdk-c/improve-external-deps.patch @@ -1,3 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8011fb..9fc05c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,17 +155,6 @@ endif() + # Use solution folders. + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-# build the parson library for json parsing +-add_library(parson +- ./deps/parson/parson.c +- ./deps/parson/parson.h +-) +-if (MSVC) +- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") +-endif() +-set(parson_h_install_files ./deps/parson/parson.h) +-set(parson_install_libs parson) +- + if (IN_OPENWRT) + ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") + INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake index b9c62e8..edf5847 100644 --- a/configs/azure_iot_sdksConfig.cmake @@ -14,16 +36,17 @@ index b9c62e8..edf5847 100644 include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") diff --git a/dependencies.cmake b/dependencies.cmake -index 063733a..71bfc7d 100644 +index fd06df6..c0e06fa 100644 --- a/dependencies.cmake +++ b/dependencies.cmake -@@ -18,6 +18,8 @@ if(${use_installed_dependencies}) - endif() - endif() +@@ -18,6 +18,9 @@ if(${use_installed_dependencies}) + endif () + endif () + find_package(unofficial-parson REQUIRED) + link_libraries(unofficial::parson::parson) - else() ++ + else () add_subdirectory(c-utility) diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt @@ -78,10 +101,10 @@ index d05d654..5872c8d 100644 ) diff --git a/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt -index 11a9a9a..4097293 100644 +index e47473e..b073513 100644 --- a/iothub_service_client/CMakeLists.txt +++ b/iothub_service_client/CMakeLists.txt -@@ -72,9 +72,7 @@ endif() +@@ -81,9 +81,7 @@ endif() setSdkTargetBuildProperties(iothub_service_client) if(NOT ${nuget_e2e_tests}) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 0abffcb0f..17893f17e 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -1,29 +1,18 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message("azure-iot-sdk-c only supports static linkage") - set(VCPKG_LIBRARY_LINKAGE "static") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 1.2.3 - SHA512 6192d454bb2ecb01989f7636751acd6919021b55b772f4ea25a6d0ddd263e7f988275f7fb0b1c304d4ebd30418c9f870eb1c504a4a504f2faeb712ef8e669d5a + REF 0ca9b92d4ff7f7a44fe1687e81f919bd7dcaa944 + SHA512 a4d43d5615d3571fda29f3d47467b816745f939941da899df799a0c4cf09c920c20b924aa29e2e2d6f4a19b81ff83969e773b6cf333bec9e2170376fe07b42ec HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/improve-external-deps.patch - ${CMAKE_CURRENT_LIST_DIR}/improve-external-deps-2.patch + PATCHES improve-external-deps.patch ) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -31,7 +20,7 @@ vcpkg_configure_cmake( -Dskip_samples=ON -Duse_installed_dependencies=ON -Duse_default_uuid=ON - -Dbuild_as_dynamic=${BUILD_AS_DYNAMIC} + -Dbuild_as_dynamic=OFF ) vcpkg_install_cmake() @@ -40,8 +29,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_iot_sdks) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-iot-sdk-c RENAME copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-iot-sdk-c/copyright COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 098209ac9..f56ab20f3 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uamqp-c -Version: 1.2.3 +Version: 1.2.10-1 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/glob-headers.patch b/ports/azure-uamqp-c/glob-headers.patch deleted file mode 100644 index 245744f2b..000000000 --- a/ports/azure-uamqp-c/glob-headers.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dbf79e5..aec44e5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,8 @@ if(WIN32) - include_directories($ENV{OpenSSLDir}/include) - endif() - --set(uamqp_h_files -+file(GLOB uamqp_h_files -+ ./inc/azure_uamqp_c/* - ./inc/azure_uamqp_c/amqp_definitions.h - ./inc/azure_uamqp_c/amqp_frame_codec.h - ./inc/azure_uamqp_c/amqp_management.h diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index c037010f1..c2e08baf0 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -1,31 +1,24 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message("azure-uamqp-c only supports static linkage") - set(VCPKG_LIBRARY_LINKAGE "static") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 1.2.3 - SHA512 18fc978517371fcb19e1c078f07d06b3bf8ec046c5cba955dd3cfe0a364d8775542acc970d81fa42384942ea4db7fb60d8939e80e90baf582c9d9e6ff0b577b5 + REF ec107011716bc797d3d7a4a4a1141df4367038a3 + SHA512 db25018a6f93a29da4bae8426f6e021a0d823075375f69f617c6aba776f5ac6ed5107e055f0a436f22ede2057045d28fab15607a58703c6c43937abec87ab076 HEAD_REF master ) -vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/glob-headers.patch) - file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON - -Dbuild_as_dynamic=${BUILD_AS_DYNAMIC} + -Dbuild_as_dynamic=OFF ) vcpkg_install_cmake() @@ -34,8 +27,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uamqp) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-uamqp-c RENAME copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-uamqp-c/copyright COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index d5236d62a..be45af110 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uhttp-c -Version: LTS_01_2018_Ref01 +Version: 1.1.10-1 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 7a2c51545..a4bb1c67b 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -1,29 +1,24 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message("azure-uhttp-c only supports static linkage") - set(VCPKG_LIBRARY_LINKAGE "static") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF LTS_01_2018_Ref01 - SHA512 baf7366e499c32210d0227188044ea1f7f7a78e2bad83d52ca6a71a76a59118ab2cd08ae9e7c511b612b885dcd94fe7a24a619136d3ee03187f780a9bc862218 + REF 8ec55bb8596dae1154ae897b5064b8eba34c136c + SHA512 73b861409dede5c1936711ec04e76e8467dadc08acda6ac1b832046a4f9b2f6d35403c01acb818b5655c2c43f700d9f83edf11b8b00f7a565f260700a12c9f7c HEAD_REF master ) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON - -Dbuild_as_dynamic=${BUILD_AS_DYNAMIC} + -Dbuild_as_dynamic=OFF -DCMAKE_INSTALL_INCLUDEDIR=include ) @@ -33,8 +28,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uhttp) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-uhttp-c RENAME copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-uhttp-c/copyright COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index d819a2f53..3466cc49d 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.5 +Version: 1.1.10-1 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 396a06656..c2825a681 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -1,29 +1,24 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message("azure-umqtt-c only supports static linkage") - set(VCPKG_LIBRARY_LINKAGE "static") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 244f1478dbc426b62cc42f1ef24ba4b6c6333540 - SHA512 74381d35c0ab967f2d2addcba1ff796633b790b1a7ee173ceee91922c14402043fc5472131b9e486728d360ffe6adc4d3779db1698ef7a1dd7e85202f2d142f4 + REF e5ab6b66ccba5a7ff7ed7421ffe0fa13ecabe000 + SHA512 19878f798d73f98afdee6ac574e136f1b2f8ddd3a7537ee666a98d04cade6ecd2526714eb74335af2eff05165492933ec90cb79a9cb914093fa96cfe35a84cb4 HEAD_REF master ) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON - -Dbuild_as_dynamic=${BUILD_AS_DYNAMIC} + -Dbuild_as_dynamic=OFF ) vcpkg_install_cmake() @@ -32,8 +27,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umqtt) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-umqtt-c RENAME copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-umqtt-c/copyright COPYONLY) vcpkg_copy_pdbs() -- cgit v1.2.3 From 6633d421b7f53ba6faadb8ee85ef806718dfd64b Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 17 Nov 2018 09:42:31 +0800 Subject: [nng] Update to 1.1.0 (#4726) --- ports/nng/CONTROL | 2 +- ports/nng/fix-include-path.patch | 14 -------------- ports/nng/portfile.cmake | 19 ++++--------------- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 ports/nng/fix-include-path.patch diff --git a/ports/nng/CONTROL b/ports/nng/CONTROL index b70aaa5b0..de66fb2c6 100644 --- a/ports/nng/CONTROL +++ b/ports/nng/CONTROL @@ -1,5 +1,5 @@ Source: nng -Version: 1.0.1 +Version: 1.1.0 Description: NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems, such as publish/subscribe, RPC-style request/reply, or service discovery. Feature: mbedtls diff --git a/ports/nng/fix-include-path.patch b/ports/nng/fix-include-path.patch deleted file mode 100644 index 9c18b9933..000000000 --- a/ports/nng/fix-include-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e59ee5b..b5f6a0d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -238,6 +238,9 @@ set_target_properties (${PROJECT_NAME} ${PROJECT_NAME} - target_link_libraries (${PROJECT_NAME} PRIVATE ${NNG_REQUIRED_LIBRARIES}) - target_link_libraries (${PROJECT_NAME} PRIVATE Threads::Threads) - -+# See: https://github.com/nanomsg/nanomsg/pull/949/ -+target_include_directories(${PROJECT_NAME} PUBLIC $) -+ - install (TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}-target - FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake index d7465170a..b16632ff9 100644 --- a/ports/nng/portfile.cmake +++ b/ports/nng/portfile.cmake @@ -3,10 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng - REF ce9f0cb155ad0e97cfc7703d9d7c8e5bec3201bc - SHA512 e1fca685e3397398bd259d126560902e813d1e2fb5cdb04de9d3f2fd74961f53af53dbaf9a555113a5588f07a3859d16bdc64f0a0ff65a7b5cf89965e764e68d + REF v1.1.0 + SHA512 79f8d66cdf1d8f0f50f888edf59b46671ca7439d1da0f25e5f729bd1365b4bc2969c90a377bbd25c41f84eeb231d03fb0bc7c2d5435e3e55f4cf80ae62f9b934 HEAD_REF master - PATCHES fix-include-path.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" NNG_STATIC_LIB) @@ -31,21 +30,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Move CMake config files to the right place -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/nng) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng) -endif() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Put the licence file where vcpkg expects it -file(COPY - ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/nng) -file(RENAME - ${CURRENT_PACKAGES_DIR}/share/nng/LICENSE.txt - ${CURRENT_PACKAGES_DIR}/share/nng/copyright) +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/nng/copyright COPYONLY) vcpkg_copy_pdbs() -- cgit v1.2.3 From 787f40569c846c32018ac7c8df443efde5e34892 Mon Sep 17 00:00:00 2001 From: jasjuang Date: Sun, 18 Nov 2018 22:10:53 -0800 Subject: [tinyxml2] update to 7.0.1 --- ports/tinyxml2/CONTROL | 2 +- ports/tinyxml2/portfile.cmake | 13 ++----------- ports/tinyxml2/vcpkg-cmake-wrapper.cmake | 5 ----- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 ports/tinyxml2/vcpkg-cmake-wrapper.cmake diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL index 185fa749c..5c4fb87a2 100644 --- a/ports/tinyxml2/CONTROL +++ b/ports/tinyxml2/CONTROL @@ -1,3 +1,3 @@ Source: tinyxml2 -Version: 6.2.0 +Version: 7.0.1 Description: A simple, small, efficient, C++ XML parser diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index 8a28b424b..d1e7d4ce6 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -3,21 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO leethomason/tinyxml2 - REF 6.2.0 - SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1 + REF 7.0.1 + SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380 HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC_LIBS 1) -else() - set(BUILD_STATIC_LIBS 0) -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} ) vcpkg_install_cmake() @@ -31,7 +23,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/readme.md - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml2 ) file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyxml2/readme.md ${CURRENT_PACKAGES_DIR}/share/tinyxml2/copyright) diff --git a/ports/tinyxml2/vcpkg-cmake-wrapper.cmake b/ports/tinyxml2/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 867426f1e..000000000 --- a/ports/tinyxml2/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,5 +0,0 @@ -_find_package(${ARGS}) -if(TARGET tinyxml2_static AND NOT TARGET tinyxml2) - _add_library(tinyxml2 INTERFACE IMPORTED) - set_target_properties(tinyxml2 PROPERTIES INTERFACE_LINK_LIBRARIES "tinyxml2_static") -endif() -- cgit v1.2.3 From 4e9c75d2056489346dfa07c751e68cd050fea084 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 19 Nov 2018 11:31:49 +0100 Subject: [ace] 6.5.3 * ports/ace/CONTROL: * ports/ace/portfile.cmake: --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 8323188d9..ed08a12c2 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,3 +1,3 @@ Source: ace -Version: 6.5.2 +Version: 6.5.3 Description: The ADAPTIVE Communication Environment diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 3f5df8868..4ec2bc48c 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -9,9 +9,8 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_2/ACE.zip" - FILENAME "ACE-6.5.2.zip" - SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98 + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip" + SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 8bf211d52f747041740d8621399499e3a549d1bb Mon Sep 17 00:00:00 2001 From: kyp Date: Mon, 19 Nov 2018 17:51:30 +0100 Subject: new port: stlab (at v1.3.3) --- ports/stlab/CONTROL | 5 +++++ ports/stlab/portfile.cmake | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 ports/stlab/CONTROL create mode 100644 ports/stlab/portfile.cmake diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL new file mode 100644 index 000000000..c1a752a5e --- /dev/null +++ b/ports/stlab/CONTROL @@ -0,0 +1,5 @@ +Source: stlab +Version: 1.3.3 +Description: + stlab is the ongoing work of what was Adobe’s Software Technology Lab. + The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures. \ No newline at end of file diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake new file mode 100644 index 000000000..a2bd71e56 --- /dev/null +++ b/ports/stlab/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stlab/libraries + REF v1.3.3 + SHA512 2c0eec5638b40f8285cc3b0d756df619b53ba44421c47713aaf45196100765a31a6aea3c5bedba4fcc44494b74e3f0a919271601e717e7f274fe15beb93f8889 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +# cleanup +file(RENAME ${CURRENT_PACKAGES_DIR}/share/cmake/stlab ${CURRENT_PACKAGES_DIR}/share/stlab) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cmake) + +# handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stlab RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From 94ec7c46a51b7bb1fe5f3e64a2f90fb8b3a0ade1 Mon Sep 17 00:00:00 2001 From: Roelf-Jilling Date: Mon, 19 Nov 2018 19:35:00 +0100 Subject: Add note, to delete the CMake cache, after editing a configuration. --- docs/examples/using-sqlite.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/examples/using-sqlite.md b/docs/examples/using-sqlite.md index 35da141d0..e622b9039 100644 --- a/docs/examples/using-sqlite.md +++ b/docs/examples/using-sqlite.md @@ -109,6 +109,7 @@ If you are using CMake through Open Folder with Visual Studio 2017 you can defin }] } ``` +*Note: It might be necessary to delete the CMake cache folder of each modified configuration, to force a full regeneration. In the `CMake` menu, under `Cache ()` you'll find `Delete Cache Folders`.* Now let's make a simple CMake project with a main file. ```cmake -- cgit v1.2.3 From 381e4c94af038bd0ff364ddec918ea077c405ecf Mon Sep 17 00:00:00 2001 From: Roelf-Jilling Date: Mon, 19 Nov 2018 19:47:31 +0100 Subject: Move -DCMAKE_... to a new line to prevent the line-break after the dash. --- docs/examples/using-sqlite.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/examples/using-sqlite.md b/docs/examples/using-sqlite.md index e622b9039..eb03d57d2 100644 --- a/docs/examples/using-sqlite.md +++ b/docs/examples/using-sqlite.md @@ -89,7 +89,8 @@ To remove the integration for your user, you can use `.\vcpkg integrate remove`. #### CMake (Toolchain File) -The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. +The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as: +`-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. If you are using CMake through Open Folder with Visual Studio 2017 you can define `CMAKE_TOOLCHAIN_FILE` by adding a "variables" section to each of your `CMakeSettings.json` configurations: -- cgit v1.2.3 From 5f4af89cff6f32b8f754a6bf920632a898bc868c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 19 Nov 2018 17:16:29 -0800 Subject: [vcpkg] Improve error messages while installing --- toolsrc/src/vcpkg/dependencies.cpp | 60 +++++++++++++++++--------------------- toolsrc/src/vcpkg/tools.cpp | 2 -- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 8fb35b0da..8f2b4eaef 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -488,26 +488,24 @@ namespace vcpkg::Dependencies if (plus) return MarkPlusResult::SUCCESS; plus = true; + auto p_source = cluster.source.get(); + if (!p_source) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, "Error: Cannot find definition for package `%s`.", cluster.spec.name()); + } + if (feature.empty()) { // Add default features for this package. This is an exact reference, so ignore prevent_default_features. - if (auto p_source = cluster.source.get()) + for (auto&& default_feature : p_source->scf->core_paragraph.get()->default_features) { - for (auto&& default_feature : p_source->scf->core_paragraph.get()->default_features) + auto res = mark_plus(default_feature, cluster, graph, graph_plan, prevent_default_features); + if (res != MarkPlusResult::SUCCESS) { - auto res = mark_plus(default_feature, cluster, graph, graph_plan, prevent_default_features); - if (res != MarkPlusResult::SUCCESS) - { - return res; - } + return res; } } - else - { - Checks::exit_with_message(VCPKG_LINE_INFO, - "Error: Unable to install default features because can't find CONTROL for %s", - cluster.spec); - } // "core" is always required. return mark_plus("core", cluster, graph, graph_plan, prevent_default_features); @@ -515,28 +513,20 @@ namespace vcpkg::Dependencies if (feature == "*") { - if (auto p_source = cluster.source.get()) + for (auto&& fpgh : p_source->scf->feature_paragraphs) { - for (auto&& fpgh : p_source->scf->feature_paragraphs) - { - auto res = mark_plus(fpgh->name, cluster, graph, graph_plan, prevent_default_features); + auto res = mark_plus(fpgh->name, cluster, graph, graph_plan, prevent_default_features); - Checks::check_exit(VCPKG_LINE_INFO, - res == MarkPlusResult::SUCCESS, - "Error: Unable to locate feature %s in %s", - fpgh->name, - cluster.spec); - } + Checks::check_exit(VCPKG_LINE_INFO, + res == MarkPlusResult::SUCCESS, + "Error: Internal error while installing feature %s in %s", + fpgh->name, + cluster.spec); + } - auto res = mark_plus("core", cluster, graph, graph_plan, prevent_default_features); + auto res = mark_plus("core", cluster, graph, graph_plan, prevent_default_features); - Checks::check_exit(VCPKG_LINE_INFO, res == MarkPlusResult::SUCCESS); - } - else - { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: Unable to handle '*' because can't find CONTROL for %s", cluster.spec); - } + Checks::check_exit(VCPKG_LINE_INFO, res == MarkPlusResult::SUCCESS); return MarkPlusResult::SUCCESS; } @@ -643,7 +633,7 @@ namespace vcpkg::Dependencies } /// Figure out which actions are required to install features specifications in `specs`. - /// Map of all source files in the current environment. + /// Map of all source control files in the current environment. /// Feature specifications to resolve dependencies for. /// Status of installed packages in the current environment. std::vector create_feature_install_plan(const std::unordered_map& map, @@ -666,7 +656,11 @@ namespace vcpkg::Dependencies auto res = mark_plus(spec.feature(), spec_cluster, *m_graph, *m_graph_plan, prevent_default_features); - Checks::check_exit(VCPKG_LINE_INFO, res == MarkPlusResult::SUCCESS, "Error: Unable to locate feature %s", spec); + Checks::check_exit(VCPKG_LINE_INFO, + res == MarkPlusResult::SUCCESS, + "Error: `%s` is not a feature of package `%s`", + spec.feature(), + spec.name()); m_graph_plan->install_graph.add_vertex(ClusterPtr{&spec_cluster}); } diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index e28291428..f4ee2d653 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -193,7 +193,6 @@ namespace vcpkg System::println("Downloading %s...", tool_name); System::println(" %s -> %s", tool_data.url, tool_data.download_path.string()); Downloads::download_file(fs, tool_data.url, tool_data.download_path, tool_data.sha512); - System::println("Downloading %s... done.", tool_name); } else { @@ -204,7 +203,6 @@ namespace vcpkg { System::println("Extracting %s...", tool_name); Archives::extract_archive(paths, tool_data.download_path, tool_data.tool_dir_path); - System::println("Extracting %s... done.", tool_name); } else { -- cgit v1.2.3 From ab567d90b752098ea5caa2ab66a1d25cf9166b3e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 8 Nov 2018 09:39:50 -0800 Subject: Upgrades for 2018.11.08 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/asmjit/CONTROL | 2 +- ports/asmjit/portfile.cmake | 4 ++-- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 ++-- ports/eastl/CONTROL | 2 +- ports/eastl/portfile.cmake | 4 ++-- ports/exiv2/CONTROL | 2 +- ports/exiv2/portfile.cmake | 4 ++-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/ms-gsl/CONTROL | 2 +- ports/ms-gsl/portfile.cmake | 4 ++-- ports/wangle/CONTROL | 2 +- ports/wangle/portfile.cmake | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 867474e2e..f616b8608 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-11-01 +Version: 2018-11-08 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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index c77c7dfd2..cc70f7250 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF cc8dcd307b76a575d2e3e0958a4fe4c7193c2f68 - SHA512 7f558fc27cbbcd9cabc0630cf4683cf0f0a713ef71197211d5bc73dbc404d1e47a9d61555fddaa9f840a99ff0235256af38d34b3ed076967172824f35124f348 + REF 070f6e47b33a2909d039e620c873204f78809492 + SHA512 84bc7b17519d3cae471f0e2602ed32111e99d20abfdff26f1e36fd712ff9013b9768b3d37b9179dc40cb1b4a350da1b6955a881c5300ea9b608f97a3101c2762 HEAD_REF master ) diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index 37e16b63a..f4a9931f8 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,3 +1,3 @@ Source: asmjit -Version: 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a +Version: 2018-11-08 Description: Complete x86/x64 JIT and Remote Assembler for C++ diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index 3efe1e025..5d2e7b230 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a - SHA512 f3cf4b603424ec0bf7e00463ad94e157bd549265730be66e5e29af31182ca3a6a318ff4c1b1d0fcd2595163df51ad6d34041583b8cbe73be1155562739c25555 + REF 771d66b301e60ebc3ffa69b11765622c547df6ab + SHA512 02ae822a33d50810fc0833b647bd6c29851b147ae4e388fd29d54567e6ed928173b961d3f3f323b243719092c2947bd6f374bc5d6051817e8153688868473830 HEAD_REF master ) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 3f045567a..18d0bbaa9 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.6.43 +Version: 1.6.47 Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index c48627c7b..a7b1b6a68 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 1.6.43 - SHA512 aeff9d6fa67b4c468c0d14b527ba64db2e4552e8dff9943a918430cbf8f787f3871c8138dc4d88eb829a4a1a5d0dace2a81eb7fcf607e48cc4e0f1bdf1499991 + REF 1.6.47 + SHA512 84d8ec8672f5de97735587aa25af410e77a4e827648379ab9683911133c2a05517e0a435fa1b8e0931cae8aa8f0e74500fa8ed8e75d493171919dfcc665bbf1c HEAD_REF master ) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index c45a2c740..5674e0345 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl -Version: 3.12.01 +Version: 3.12.04 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. diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index ddc5950b6..c090f0fa8 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 3.12.01 - SHA512 22053823299386337934abb473be5bad4766db571656ee8f93eb04f6079c1860fd598ae8b7a955ca5dcf26661370d558aaf35037c989ec5a976feae87a445aad + REF 3.12.04 + SHA512 99e8fdc5fb589410187f3538b6f491bc6f988babcb29b74be90a938ba6c94ad1b16d55ff62ddcf5ae539c67f473d43a6af581278b8b39d0d8686b0161dd0e5cf HEAD_REF master ) diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index afe77d9a1..35b2bce9d 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,4 +1,4 @@ Source: exiv2 -Version: 2018-11-01 +Version: 2018-11-08 Build-Depends: zlib, expat, libiconv Description: Image metadata library and tools http://www.exiv2.org diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index d884c4441..e046e0bde 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF c87749a5e22d0583fd2b876701dbf1c8052004dd - SHA512 5c17e6100a2ca12de92e1549c9d683e45692f846e8fec4277d18593a181d0d0b39b70b676f840c232b0c04adf5301df41cfc137e95cd8a40816bd993f752c78d + REF 274ef04f7ebbff567135e732434c9c8353265d6c + SHA512 8e8d32a4c51da2a61026a4541885da72df88c3e30452944c5e2d2d8e6d8d03dcdea72c4e3bfe9673554453ddc547651d160cfba2bfab1450a1770f4af2be740a HEAD_REF master PATCHES iconv.patch ) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 4f8007e70..f8842fec4 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.10.29.00 +Version: 2018.11.05.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index a71b39067..bb15bf859 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.10.29.00 - SHA512 82714564713224e1a8dcfa0d7722cf9396374da29daf6afdb7ea058d33eaedd9e41b2ed9033bc3c3cbb6a51fa0e5cd0a48fedecfa110a13a1ca308d2a7518d1b + REF v2018.11.05.00 + SHA512 08eee201c2b1179a4e52398cc65964fb299abfb95934687f4ce3d72df1ff70493964835d5e52c8821c63553e0be0d578e1130e50e353a7eab6b0334532e4df2e HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index 37285222e..8d6d02147 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-09-18 +Version: 2018-11-08 Description: Microsoft implementation of the Guidelines Support Library \ No newline at end of file diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index 22d6fc21e..a130f9a35 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF 1995e86d1ad70519465374fb4876c6ef7c9f8c61 - SHA512 00d512269f9f126c93882001704c2c1926556d72fd5e26f8ba223d92f09d9955194e7bf08b172483b5d649021b0b7b54eca3e3ea2337e16b4cd5a8313a85ba66 + REF c02ddae4bcff82b17826fe3127e835f5aa54b485 + SHA512 5fcb67d410a46a4e202c367bae59b1dd4f4220ac2b75a70bc34503612a616b2792e74a18b50901656d18a031cc32cf42da8673d3412ccfe8a236daa54eae44c7 HEAD_REF master ) diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index ba204005d..b7d4dcd17 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle -Version: 2018.10.29.00 +Version: 2018.11.05.00 Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion 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/portfile.cmake b/ports/wangle/portfile.cmake index 1ecec2f4f..5f17212c9 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2018.10.29.00 - SHA512 28363960b8437882eca67ed3a6de34dcce6323bc42bb12505334e79c5ea1004c1cc37565b88629531441024914253d8d2e6f0a0cb7eeee88b71d8ff35516abe3 + REF v2018.11.05.00 + SHA512 287fd19e352f04666d2d925eb6322aa5b74b1b8808142d37c1089b34df650bc56f0489ff4746b1ddfbec7544d99df71f9583d47ef5abef600e9bc5d434dceab6 HEAD_REF master PATCHES build.patch -- cgit v1.2.3 From 9eab773b8fe7ae7700d77b686836c093fdfdeb31 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Wed, 21 Nov 2018 02:19:09 +0300 Subject: [asio] Download from github (#4709) --- ports/asio/CONTROL | 2 +- ports/asio/portfile.cmake | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL index 34543b9cd..295b01db8 100644 --- a/ports/asio/CONTROL +++ b/ports/asio/CONTROL @@ -1,3 +1,3 @@ Source: asio -Version: 1.12.1 +Version: 1.12.1-1 Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach. diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 279f2c609..60d329ed8 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -1,25 +1,19 @@ #header-only library include(vcpkg_common_functions) -vcpkg_download_distfile( - ARCHIVE_FILE - URLS "https://sourceforge.net/projects/asio/files/asio/1.12.1%20%28Stable%29/asio-1.12.1.zip/download" - FILENAME "asio-1.12.1.zip" - SHA512 f35a519cde88824f65bde095c19d69449d0779e75da9e9ebb6a04f4847802213e8730715756a21632c4d27722cd5568ff7878d656ac79165a8bdf8652fbc1bd8 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chriskohlhoff/asio + REF asio-1-12-1 + SHA512 e335eea05c27a72faae95dd5d5ca997ac8bb144cd5fb68e5538129ea6afb3b4d88e2be1c31a1effdbbbe4c93e07ee274a7e5817453c29faf56abf9ab692b2dd6 + HEAD_REF master ) -vcpkg_extract_source_archive( - ${ARCHIVE_FILE} -) - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/asio-1.12.1) - # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) # Copy the asio header files -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp") +file(INSTALL ${SOURCE_PATH}/asio/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp") # Always use "ASIO_STANDALONE" to avoid boost dependency file(READ "${CURRENT_PACKAGES_DIR}/include/asio/detail/config.hpp" _contents) -- cgit v1.2.3 From 35ea46995b6a3b384b4a76d613ac29d7d001b51a Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 16 Nov 2018 18:19:03 -0800 Subject: [glad] Use registry ports instead of vendored copies --- ports/egl-registry/CONTROL | 2 +- ports/egl-registry/portfile.cmake | 6 ++++++ ports/glad/CONTROL | 3 ++- ports/glad/portfile.cmake | 13 +++++++++++-- ports/opengl-registry/CONTROL | 2 +- ports/opengl-registry/portfile.cmake | 6 ++++++ 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ports/egl-registry/CONTROL b/ports/egl-registry/CONTROL index c1187a6bf..dc7cdec79 100644 --- a/ports/egl-registry/CONTROL +++ b/ports/egl-registry/CONTROL @@ -1,3 +1,3 @@ Source: egl-registry -Version: 2018-06-30 +Version: 2018-06-30-1 Description: the EGL API and Extension Registry diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index 1278e2c92..ee6fc23dc 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -15,6 +15,12 @@ file( DESTINATION ${CURRENT_PACKAGES_DIR}/include ) +file( + COPY + ${SOURCE_PATH}/api/egl.xml + DESTINATION ${CURRENT_PACKAGES_DIR}/share/egl-registry +) + file( INSTALL ${SOURCE_PATH}/sdk/docs/man/copyright.xml DESTINATION ${CURRENT_PACKAGES_DIR}/share/egl-registry diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL index e8354c205..d74a35089 100644 --- a/ports/glad/CONTROL +++ b/ports/glad/CONTROL @@ -1,3 +1,4 @@ Source: glad -Version: 0.1.28-2 +Version: 0.1.28-3 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs. +Build-Depends: egl-registry, opengl-registry diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index 432c14503..cc73b1e39 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -12,7 +12,16 @@ vcpkg_from_github( 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}") + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h + ${CURRENT_INSTALLED_DIR}/share/egl-registry/egl.xml + ${CURRENT_INSTALLED_DIR}/share/opengl-registry/gl.xml + ${CURRENT_INSTALLED_DIR}/share/opengl-registry/glx.xml + ${CURRENT_INSTALLED_DIR}/share/opengl-registry/wgl.xml + DESTINATION ${SOURCE_PATH}/glad/files +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -32,5 +41,5 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glad) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/KHR) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/glad/copyright COPYONLY) diff --git a/ports/opengl-registry/CONTROL b/ports/opengl-registry/CONTROL index 0d9844ed7..1a3635c35 100644 --- a/ports/opengl-registry/CONTROL +++ b/ports/opengl-registry/CONTROL @@ -1,4 +1,4 @@ Source: opengl-registry -Version: 2018-06-30 +Version: 2018-06-30-1 Build-Depends: egl-registry Description: the API and Extension registries for the OpenGL family APIs diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index 5e997ac23..7b38b2c07 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -9,6 +9,12 @@ vcpkg_from_github( ) file(COPY ${SOURCE_PATH}/api/GL DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY + ${SOURCE_PATH}/xml/gl.xml + ${SOURCE_PATH}/xml/glx.xml + ${SOURCE_PATH}/xml/wgl.xml + DESTINATION ${CURRENT_PACKAGES_DIR}/share/opengl-registry +) # Using the Makefile because it is the smallest file with a complete copy of the license text file( -- cgit v1.2.3 From 83af530a42011130b20a5080bbd298abaa77be59 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Wed, 21 Nov 2018 08:51:32 +0900 Subject: WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets (#4688) * [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR Add CMAKE_SYSTEM_PROCESSOR setting under UWP, Linux, and Darwin. If explicitly specified VCPKG_CMAKE_SYSTEM_PROCESSOR in triplet files, CMAKE_SYSTEM_PROCESSOR is set to specified architecture. * [vcpkg-toolchains] Move logic out of vcpkg_configure_cmake and into the toolchains. --- scripts/cmake/vcpkg_configure_cmake.cmake | 8 +++++--- scripts/toolchains/linux.cmake | 5 +++++ scripts/toolchains/windows.cmake | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 617fe1a0f..b5dfb6d02 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -128,13 +128,15 @@ function(vcpkg_configure_cmake) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) - endif() endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() + if(DEFINED VCPKG_CMAKE_SYSTEM_PROCESSOR) + list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_PROCESSOR=${VCPKG_CMAKE_SYSTEM_PROCESSOR}") + endif() + + list(APPEND _csc_OPTIONS "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=ON) diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index ade9db90b..d740a5b8c 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -1,5 +1,10 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") + + # TODO: This should be replaced with a switch on VCPKG_TARGET_ARCHITECTURE once we know what linux systems "natively" define for each of the targets + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") +else() + set(CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "") endif() set(CMAKE_SYSTEM_NAME Linux CACHE STRING "") diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 266e023b1..bb52e0d19 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -1,3 +1,19 @@ +if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "") +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR X86 CACHE STRING "") +else() + message(FATAL_ERROR "Unknown target architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) -- cgit v1.2.3 From 3b01335e6161cb9195fcb8928225dcb11b52cd58 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 20 Nov 2018 16:28:12 -0800 Subject: Revert "WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets (#4688)" This reverts commit 83af530a42011130b20a5080bbd298abaa77be59. --- scripts/cmake/vcpkg_configure_cmake.cmake | 8 +++----- scripts/toolchains/linux.cmake | 5 ----- scripts/toolchains/windows.cmake | 16 ---------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index b5dfb6d02..617fe1a0f 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -128,15 +128,13 @@ function(vcpkg_configure_cmake) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + endif() endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() - if(DEFINED VCPKG_CMAKE_SYSTEM_PROCESSOR) - list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_PROCESSOR=${VCPKG_CMAKE_SYSTEM_PROCESSOR}") - endif() - - list(APPEND _csc_OPTIONS "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=ON) diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index d740a5b8c..ade9db90b 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -1,10 +1,5 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") - - # TODO: This should be replaced with a switch on VCPKG_TARGET_ARCHITECTURE once we know what linux systems "natively" define for each of the targets - set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") -else() - set(CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "") endif() set(CMAKE_SYSTEM_NAME Linux CACHE STRING "") diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index bb52e0d19..266e023b1 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -1,19 +1,3 @@ -if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "") -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(CMAKE_SYSTEM_PROCESSOR X86 CACHE STRING "") -else() - message(FATAL_ERROR "Unknown target architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) -- cgit v1.2.3 From 7a931c922fea21264596c3b790b21913933954fb Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 20 Nov 2018 19:11:50 -0800 Subject: Use Checks::check_exit() --- toolsrc/src/vcpkg/dependencies.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 8f2b4eaef..60c43e4a8 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -489,11 +489,10 @@ namespace vcpkg::Dependencies plus = true; auto p_source = cluster.source.get(); - if (!p_source) - { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Error: Cannot find definition for package `%s`.", cluster.spec.name()); - } + Checks::check_exit(VCPKG_LINE_INFO, + p_source != nullptr, + "Error: Cannot find definition for package `%s`.", + cluster.spec.name()); if (feature.empty()) { -- cgit v1.2.3 From eccae2adaa20c64a44034a6115c6c5f90be201be Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 21 Nov 2018 17:28:14 -0800 Subject: [vcpkg-tools] Update CMake links to GitHub --- scripts/vcpkgTools.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index eaf84caa3..650e46b03 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -3,21 +3,21 @@ 3.12.4 cmake-3.12.4-win32-x86\bin\cmake.exe - https://cmake.org/files/v3.12/cmake-3.12.4-win32-x86.zip + https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-win32-x86.zip ca7097c5917101c39d5fa5325cd256ad3aa616a7e5811915cb2869c24961dc133726015b3576908fbd0666f89c8e31886bed9cf6b532a3fe44681d5245bc25c7 cmake-3.12.4-win32-x86.zip 3.12.4 cmake-3.12.4-Darwin-x86_64/CMake.app/Contents/bin/cmake - https://cmake.org/files/v3.12/cmake-3.12.4-Darwin-x86_64.tar.gz + https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Darwin-x86_64.tar.gz 67ce23394d9679818ab0f2792f5d585c8c6f385e18584d488a47d48b768d1ee20b58247d22945aeff1ff9f84b7e843457dac98a50801ac3068ab1fbcbe0b0f45 cmake-3.12.4-Darwin-x86_64.tar.gz 3.12.4 cmake-3.12.4-Linux-x86_64/bin/cmake - https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.tar.gz + https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.tar.gz ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f cmake-3.12.4-Linux-x86_64.tar.gz -- cgit v1.2.3 From 05b2110ebc610f792a08f97467783c311fbd40cf Mon Sep 17 00:00:00 2001 From: Alenas Date: Thu, 22 Nov 2018 15:02:30 +0200 Subject: easyloggingpp port (#4780) * easyloggingpp port * [easyloggingpp] Tweak to always produce static library --- ports/easyloggingpp/CONTROL | 3 +++ ports/easyloggingpp/portfile.cmake | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 ports/easyloggingpp/CONTROL create mode 100644 ports/easyloggingpp/portfile.cmake diff --git a/ports/easyloggingpp/CONTROL b/ports/easyloggingpp/CONTROL new file mode 100644 index 000000000..3f462dfbd --- /dev/null +++ b/ports/easyloggingpp/CONTROL @@ -0,0 +1,3 @@ +Source: easyloggingpp +Version: 9.96.5-1 +Description: Easylogging++ is a single header efficient logging library for C++ applications. \ No newline at end of file diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake new file mode 100644 index 000000000..ecb678746 --- /dev/null +++ b/ports/easyloggingpp/portfile.cmake @@ -0,0 +1,23 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO muflihun/easyloggingpp + REF v9.96.5 + SHA512 51493693095df03f8772174a8ec4fc681832319bd723224a544539efdcf73c7653d3973ec0ae0cd004e496bf98c105c278e4a72694ebf34b207c658b3225a87b + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dbuild_static_lib=ON +) +vcpkg_install_cmake() + +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/easyloggingpp RENAME copyright) -- cgit v1.2.3 From 5daa7cac278b281e32128b7c70da6e0e5ee40637 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 22 Nov 2018 14:03:35 +0100 Subject: [OpenCV3] fix ffmpeg and ippicv prebuilt downloads (#4789) * [OpenCV3] fix ffmpeg prebuilt downloads fixes * [opencv] Bump control version. Modernize. --- ports/opencv/CONTROL | 2 +- ports/opencv/portfile.cmake | 36 +++++++++++++++--------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 458bbb25e..71bdea444 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-1 +Version: 3.4.3-2 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 19bd3e43e..6b98d2976 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -8,10 +8,6 @@ vcpkg_from_github( REF ${OPENCV_PORT_VERSION} SHA512 d653a58eb5e3939b9fdb7438ac35f77cf4385cf72d5d22bfd21722a109e1b3283dbb9407985061b7548114f0d05c9395aac9bb62b4d2bc1f68da770a49987fef HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-winrt-fixes.patch" "${CMAKE_CURRENT_LIST_DIR}/0002-install-options.patch" @@ -20,8 +16,6 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/0005-remove-protobuf-target.patch" ) -file(WRITE "${CURRENT_BUILDTREES_DIR}/src/opencv-${OPENCV_PORT_VERSION}/rework.stamp") - string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) set(CMAKE_MODULE_PATH) @@ -116,18 +110,18 @@ set(WITH_FFMPEG OFF) if("ffmpeg" IN_LIST FEATURES) set(WITH_FFMPEG ON) vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0a0e88972a7ea97708378d0488a65f83e7cc5e69/ffmpeg/opencv_ffmpeg.dll" - FILENAME "opencv-cache/ffmpeg/b8120c07962d591e2e9071a1bf566fd0-opencv_ffmpeg.dll" - SHA512 53325e3bb04de19273270475d7b7d9190c950b0d12e1179feef63c69ba66c9f8593d8ed9b030109dee8c104ab5babea69f18c7cae7366a57d48272d67c00d871 + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8041bd6f5ad37045c258904ba3030bb3442e3911/ffmpeg/opencv_ffmpeg.dll" + FILENAME "opencv-cache/ffmpeg/fa5a2a4e2f37defcb95bde8ed145c2b3-opencv_ffmpeg.dll" + SHA512 875f922e1d9fc2fe7c8e879ede35b1001b6ad8b3c4d71feb3823421ce861f580df3418c791315b23870fcb0378d297b01e0761d3f65277ff11ec2fef8c0b08b7 ) vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0a0e88972a7ea97708378d0488a65f83e7cc5e69/ffmpeg/opencv_ffmpeg_64.dll" - FILENAME "opencv-cache/ffmpeg/dc9c50e7b05482acc25d6ce0ac61bf1d-opencv_ffmpeg_64.dll" - SHA512 7d90df6f5d141f842a45e5678cf1349657612321250ece4ad5c6b5fb28a50140735d91ced0ce1a6e81962ef87236cbd1669c0b4410308f70fccee341a7a5c28b + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8041bd6f5ad37045c258904ba3030bb3442e3911/ffmpeg/opencv_ffmpeg_64.dll" + FILENAME "opencv-cache/ffmpeg/2cc08fc4fef8199fe80e0f126684834f-opencv_ffmpeg_64.dll" + SHA512 4e74aa4cb115f103b929f93bbc8dcf675de7d0c7916f8f0a80ac46761134b088634be95f959ce5827753ae9ecb2365ca40440dfbb9a9bf89f22ee11b6c8342b3 ) vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0a0e88972a7ea97708378d0488a65f83e7cc5e69/ffmpeg/ffmpeg_version.cmake" - FILENAME "opencv-cache/ffmpeg/3b90f67f4b429e77d3da36698cef700c-ffmpeg_version.cmake" + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8041bd6f5ad37045c258904ba3030bb3442e3911/ffmpeg/ffmpeg_version.cmake" + FILENAME "opencv-cache/ffmpeg/8041bd6f5ad37045c258904ba3030bb3442e3911-ffmpeg_version.cmake" SHA512 7d0142c30ac6f6260c1bcabc22753030fd25a708477fa28053e8df847c366967d3b93a8ac14af19a2b7b73d9f8241749a431458faf21a0c8efc7d6d99eecfdcf ) endif() @@ -137,16 +131,16 @@ if("ipp" IN_LIST FEATURES) set(WITH_IPP ON) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - vcpkg_download_distfile(IPPICV_ARCHIVE - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/dfe3162c237af211e98b8960018b564bc209261d/ippicv/ippicv_2017u3_win_intel64_general_20170822.zip" - FILENAME "opencv-cache/ippicv/0421e642bc7ad741a2236d3ec4190bdd-ippicv_2017u3_win_intel64_general_20170822.zip" - SHA512 1b2b66ac60e5b6ba2fc95a3839d09b7fcfb42628dc6e01648727ee5394f6405702f69f741371627a9e1690294147c730196f1c9872339301c92a1424f159df6c + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/bdb7bb85f34a8cb0d35e40a81f58da431aa1557a/ippicv/ippicv_2017u3_win_intel64_general_20180518.zip" + FILENAME "opencv-cache/ippicv/915ff92958089ede8ea532d3c4fe7187-ippicv_2017u3_win_intel64_general_20180518.zip" + SHA512 8aa08292d542d521c042864446e47a7a6bdbf3896d86fc7b43255459c24a2e9f34a4e9b177023d178fed7a2e82a9db410f89d81375a542d049785d263f46c64d ) else() vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/dfe3162c237af211e98b8960018b564bc209261d/ippicv/ippicv_2017u3_win_ia32_general_20170822.zip" - FILENAME "opencv-cache/ippicv/8a7680ae352c192de2e2e34936164bd0-ippicv_2017u3_win_ia32_general_20170822.zip" - SHA512 6bbe08264b56117d4a00118088d72274396964bb904fb0719fc48beeb458ac31bea3d4d2fa2e0449f55af42471758f2c090c82061c91985c8b7994ed3b71df81 + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/bdb7bb85f34a8cb0d35e40a81f58da431aa1557a/ippicv/ippicv_2017u3_win_ia32_general_20180518.zip" + FILENAME "opencv-cache/ippicv/928168c2d99ab284047dfcfb7a821d91-ippicv_2017u3_win_ia32_general_20180518.zip" + SHA512 b89b0fb739152303cafc9fb064fa8b24fd94850697137ccbb5c1e344e0f5094115603a5e3be3a25f85d0faefc5c53429a7d65da0142d012ada41e8db2bcdd6b7 ) endif() endif() -- cgit v1.2.3 From ea843854dfab4bd767c895bac3b6a02a1098cf4f Mon Sep 17 00:00:00 2001 From: angelmixu Date: Thu, 22 Nov 2018 22:56:06 +0100 Subject: fix minizip on non windows builds (#4787) * fix minizip on non windows builds * [minizip] Bump control version --- ports/minizip/CMakeLists.txt | 10 ++++++++-- ports/minizip/CONTROL | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 9ebb5d217..0b572b39c 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -15,21 +15,27 @@ include_directories(${MIN_SRC} ${ZLIB_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) set(SRC ${MIN_SRC}/ioapi.c - ${MIN_SRC}/iowin32.c ${MIN_SRC}/unzip.c ${MIN_SRC}/zip.c ${MIN_SRC}/unzip.c ${MIN_SRC}/mztools.c ) +if(WIN32) + list(APPEND SRC ${MIN_SRC}/iowin32.c) +endif() + set(HEADERS ${MIN_SRC}/crypt.h ${MIN_SRC}/ioapi.h - ${MIN_SRC}/iowin32.h ${MIN_SRC}/unzip.h ${MIN_SRC}/zip.h ${MIN_SRC}/unzip.h ${MIN_SRC}/mztools.h ) +if(WIN32) + list(APPEND HEADERS ${MIN_SRC}/iowin32.h) +endif() + if(BUILD_SHARED_LIBS) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL index cc37b5f8c..60398b039 100644 --- a/ports/minizip/CONTROL +++ b/ports/minizip/CONTROL @@ -1,4 +1,4 @@ Source: minizip -Version: 1.2.11-2 +Version: 1.2.11-3 Description: Zip compression library Build-Depends: bzip2, zlib -- cgit v1.2.3 From 105622619dcb11dc91c3fdf3a8cb9d4b4c87bbf9 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 22 Nov 2018 14:17:58 -0800 Subject: [vcpkg] Enable major version greater than 15 --- toolsrc/src/vcpkg/visualstudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index 51e6c22d1..83a530a10 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -170,7 +170,7 @@ namespace vcpkg::VisualStudio for (const VisualStudioInstance& vs_instance : sorted) { const std::string major_version = vs_instance.major_version(); - if (major_version == "15") + if (major_version >= "15") { const fs::path vc_dir = vs_instance.root_path / "VC"; -- cgit v1.2.3 From 2981bb2110d4ac1afb6aacc9f6e39f8e4a8eee5f Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Fri, 23 Nov 2018 07:24:36 +0900 Subject: [opencv] Fix install with ffmpeg (#4797) Fix install with ffmpeg by change download filename of ffmpeg_version.cmake. --- ports/opencv/CONTROL | 2 +- ports/opencv/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 71bdea444..e1d1248b0 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-2 +Version: 3.4.3-3 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 6b98d2976..966c914b0 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -121,7 +121,7 @@ if("ffmpeg" IN_LIST FEATURES) ) vcpkg_download_distfile(OCV_DOWNLOAD URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8041bd6f5ad37045c258904ba3030bb3442e3911/ffmpeg/ffmpeg_version.cmake" - FILENAME "opencv-cache/ffmpeg/8041bd6f5ad37045c258904ba3030bb3442e3911-ffmpeg_version.cmake" + FILENAME "opencv-cache/ffmpeg/3b90f67f4b429e77d3da36698cef700c-ffmpeg_version.cmake" SHA512 7d0142c30ac6f6260c1bcabc22753030fd25a708477fa28053e8df847c366967d3b93a8ac14af19a2b7b73d9f8241749a431458faf21a0c8efc7d6d99eecfdcf ) endif() -- cgit v1.2.3 From 380485194e9611241d3c9d6c93e92a6235d2b180 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 22 Nov 2018 14:48:18 -0800 Subject: [vcpkg_extract_source_archive_ex] Document vcpkg_extract_source_archive_ex --- docs/maintainers/portfile-functions.md | 1 + docs/maintainers/vcpkg_extract_source_archive.md | 2 +- .../maintainers/vcpkg_extract_source_archive_ex.md | 52 +++++++++ scripts/cmake/vcpkg_common_functions.cmake | 1 + scripts/cmake/vcpkg_extract_source_archive.cmake | 81 +------------ .../cmake/vcpkg_extract_source_archive_ex.cmake | 130 +++++++++++++++++++++ 6 files changed, 186 insertions(+), 81 deletions(-) create mode 100644 docs/maintainers/vcpkg_extract_source_archive_ex.md create mode 100644 scripts/cmake/vcpkg_extract_source_archive_ex.cmake diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 1aad301eb..f159f7f64 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -14,6 +14,7 @@ - [vcpkg\_download\_distfile](vcpkg_download_distfile.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\_find\_acquire\_program](vcpkg_find_acquire_program.md) - [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md) - [vcpkg\_from\_git](vcpkg_from_git.md) diff --git a/docs/maintainers/vcpkg_extract_source_archive.md b/docs/maintainers/vcpkg_extract_source_archive.md index 104032ffc..4971df960 100644 --- a/docs/maintainers/vcpkg_extract_source_archive.md +++ b/docs/maintainers/vcpkg_extract_source_archive.md @@ -1,6 +1,6 @@ # vcpkg_extract_source_archive -Extract an archive into the source directory. +Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md). ## Usage ```cmake diff --git a/docs/maintainers/vcpkg_extract_source_archive_ex.md b/docs/maintainers/vcpkg_extract_source_archive_ex.md new file mode 100644 index 000000000..92c90b296 --- /dev/null +++ b/docs/maintainers/vcpkg_extract_source_archive_ex.md @@ -0,0 +1,52 @@ +# 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( + OUT_SOURCE_PATH + ARCHIVE <${ARCHIVE}> + [REF <1.0.0>] + [NO_REMOVE_ONE_LEVEL] + [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] + [PATCHES ...] +) +``` +## Parameters +### 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. + +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) + +## Source +[scripts/cmake/vcpkg_extract_source_archive_ex.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_extract_source_archive_ex.cmake) diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index c8b8fa977..d66fc5eff 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -4,6 +4,7 @@ include(vcpkg_check_linkage) include(vcpkg_clean_msbuild) include(vcpkg_download_distfile) include(vcpkg_extract_source_archive) +include(vcpkg_extract_source_archive_ex) include(vcpkg_execute_required_process) include(vcpkg_execute_required_process_repeat) include(vcpkg_find_acquire_program) diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake index da0ac611a..a55419b19 100644 --- a/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -1,6 +1,6 @@ ## # vcpkg_extract_source_archive ## -## Extract an archive into the source directory. +## Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md). ## ## ## Usage ## ```cmake @@ -48,82 +48,3 @@ function(vcpkg_extract_source_archive ARCHIVE) file(WRITE ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted) endif() endfunction() - -function(vcpkg_extract_source_archive_ex) - cmake_parse_arguments(_vesae "NO_REMOVE_ONE_LEVEL" "OUT_SOURCE_PATH;ARCHIVE;REF;WORKING_DIRECTORY" "PATCHES" ${ARGN}) - - if(NOT _vesae_ARCHIVE) - message(FATAL_ERROR "Must specify ARCHIVE parameter to vcpkg_extract_source_archive_ex()") - endif() - - if(NOT DEFINED _vesae_OUT_SOURCE_PATH) - message(FATAL_ERROR "Must specify OUT_SOURCE_PATH parameter to vcpkg_extract_source_archive_ex()") - endif() - - if(NOT DEFINED _vesae_WORKING_DIRECTORY) - set(_vesae_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src) - endif() - - if(NOT DEFINED _vesae_REF) - get_filename_component(_vesae_REF ${_vesae_ARCHIVE} NAME_WE) - endif() - - string(REPLACE "/" "-" SANITIZED_REF "${_vesae_REF}") - - # Take the last 10 chars of the REF - set(REF_MAX_LENGTH 10) - string(LENGTH ${SANITIZED_REF} REF_LENGTH) - math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH}) - if(FROM_REF LESS 0) - set(FROM_REF 0) - endif() - string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF) - - # Hash the archive hash along with the patches. Take the first 10 chars of the hash - file(SHA512 ${_vesae_ARCHIVE} PATCHSET_HASH) - foreach(PATCH IN LISTS _vesae_PATCHES) - get_filename_component(ABSOLUTE_PATCH "${PATCH}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}") - file(SHA512 ${ABSOLUTE_PATCH} CURRENT_HASH) - string(APPEND PATCHSET_HASH ${CURRENT_HASH}) - endforeach() - - string(SHA512 PATCHSET_HASH ${PATCHSET_HASH}) - string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH) - set(SOURCE_PATH "${_vesae_WORKING_DIRECTORY}/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}") - - if(NOT EXISTS ${SOURCE_PATH}) - set(TEMP_DIR "${_vesae_WORKING_DIRECTORY}/TEMP") - file(REMOVE_RECURSE ${TEMP_DIR}) - vcpkg_extract_source_archive("${_vesae_ARCHIVE}" "${TEMP_DIR}") - - if(_vesae_NO_REMOVE_ONE_LEVEL) - set(TEMP_SOURCE_PATH ${TEMP_DIR}) - else() - file(GLOB _ARCHIVE_FILES "${TEMP_DIR}/*") - list(LENGTH _ARCHIVE_FILES _NUM_ARCHIVE_FILES) - set(TEMP_SOURCE_PATH) - foreach(dir IN LISTS _ARCHIVE_FILES) - if (IS_DIRECTORY ${dir}) - set(TEMP_SOURCE_PATH "${dir}") - break() - endif() - endforeach() - - if(NOT _NUM_ARCHIVE_FILES EQUAL 2 OR NOT TEMP_SOURCE_PATH) - message(FATAL_ERROR "Could not unwrap top level directory from archive. Pass NO_REMOVE_ONE_LEVEL to disable this.") - endif() - endif() - - vcpkg_apply_patches( - SOURCE_PATH ${TEMP_SOURCE_PATH} - PATCHES ${_vesae_PATCHES} - ) - - file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH}) - file(REMOVE_RECURSE ${TEMP_DIR}) - endif() - - set(${_vesae_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - message(STATUS "Using source at ${SOURCE_PATH}") - return() -endfunction() diff --git a/scripts/cmake/vcpkg_extract_source_archive_ex.cmake b/scripts/cmake/vcpkg_extract_source_archive_ex.cmake new file mode 100644 index 000000000..a70a5e4a3 --- /dev/null +++ b/scripts/cmake/vcpkg_extract_source_archive_ex.cmake @@ -0,0 +1,130 @@ +## # 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( +## OUT_SOURCE_PATH +## ARCHIVE <${ARCHIVE}> +## [REF <1.0.0>] +## [NO_REMOVE_ONE_LEVEL] +## [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] +## [PATCHES ...] +## ) +## ``` +## ## Parameters +## ### 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. +## +## 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) + +function(vcpkg_extract_source_archive_ex) + cmake_parse_arguments(_vesae "NO_REMOVE_ONE_LEVEL" "OUT_SOURCE_PATH;ARCHIVE;REF;WORKING_DIRECTORY" "PATCHES" ${ARGN}) + + if(NOT _vesae_ARCHIVE) + message(FATAL_ERROR "Must specify ARCHIVE parameter to vcpkg_extract_source_archive_ex()") + endif() + + if(NOT DEFINED _vesae_OUT_SOURCE_PATH) + message(FATAL_ERROR "Must specify OUT_SOURCE_PATH parameter to vcpkg_extract_source_archive_ex()") + endif() + + if(NOT DEFINED _vesae_WORKING_DIRECTORY) + set(_vesae_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src) + endif() + + if(NOT DEFINED _vesae_REF) + get_filename_component(_vesae_REF ${_vesae_ARCHIVE} NAME_WE) + endif() + + string(REPLACE "/" "-" SANITIZED_REF "${_vesae_REF}") + + # Take the last 10 chars of the REF + set(REF_MAX_LENGTH 10) + string(LENGTH ${SANITIZED_REF} REF_LENGTH) + math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH}) + if(FROM_REF LESS 0) + set(FROM_REF 0) + endif() + string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF) + + # Hash the archive hash along with the patches. Take the first 10 chars of the hash + file(SHA512 ${_vesae_ARCHIVE} PATCHSET_HASH) + foreach(PATCH IN LISTS _vesae_PATCHES) + get_filename_component(ABSOLUTE_PATCH "${PATCH}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}") + file(SHA512 ${ABSOLUTE_PATCH} CURRENT_HASH) + string(APPEND PATCHSET_HASH ${CURRENT_HASH}) + endforeach() + + string(SHA512 PATCHSET_HASH ${PATCHSET_HASH}) + string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH) + set(SOURCE_PATH "${_vesae_WORKING_DIRECTORY}/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}") + + if(NOT EXISTS ${SOURCE_PATH}) + set(TEMP_DIR "${_vesae_WORKING_DIRECTORY}/TEMP") + file(REMOVE_RECURSE ${TEMP_DIR}) + vcpkg_extract_source_archive("${_vesae_ARCHIVE}" "${TEMP_DIR}") + + if(_vesae_NO_REMOVE_ONE_LEVEL) + set(TEMP_SOURCE_PATH ${TEMP_DIR}) + else() + file(GLOB _ARCHIVE_FILES "${TEMP_DIR}/*") + list(LENGTH _ARCHIVE_FILES _NUM_ARCHIVE_FILES) + set(TEMP_SOURCE_PATH) + foreach(dir IN LISTS _ARCHIVE_FILES) + if (IS_DIRECTORY ${dir}) + set(TEMP_SOURCE_PATH "${dir}") + break() + endif() + endforeach() + + if(NOT _NUM_ARCHIVE_FILES EQUAL 2 OR NOT TEMP_SOURCE_PATH) + message(FATAL_ERROR "Could not unwrap top level directory from archive. Pass NO_REMOVE_ONE_LEVEL to disable this.") + endif() + endif() + + vcpkg_apply_patches( + SOURCE_PATH ${TEMP_SOURCE_PATH} + PATCHES ${_vesae_PATCHES} + ) + + file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH}) + file(REMOVE_RECURSE ${TEMP_DIR}) + endif() + + set(${_vesae_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) + message(STATUS "Using source at ${SOURCE_PATH}") + return() +endfunction() -- cgit v1.2.3 From f0093f747531dc3034ca17bd4d109e51d016e6fe Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Thu, 22 Nov 2018 19:44:57 -0800 Subject: Update range-v3 reference (#4801) --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index 1c5cb114d..09afae49c 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0-87a6c31 +Version: 0.4.0-20181122 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 203ef211c..cbdf04227 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 87a6c31cdd9d13f0673da4f650b44c2171cb2744 - SHA512 8ddf91adf02599bdb87622d80a00fa02da060331572d4e614aec9e22bc6e1890a00da68fcf27d83f9c8de576ec043296e2a7c99a3676b6ddaec6d10d19387479 + REF 00d4676502aa257a3ce934b50555211b4791ae05 + SHA512 a0067e1b0d1d2261c2f868ebc57278b74a081ccc00dcd65648b5c362317c6cd3321fb3b9936733d839cd9d48cf801d1f23710bce9e33edd9dfa8f32556d90526 HEAD_REF master ) -- cgit v1.2.3 From 95f9ce56f32618cceda97d54af16e3d6c57fc4b3 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 23 Nov 2018 14:18:46 -0800 Subject: Update CHANGELOG and bump version to 2018.11.23 --- CHANGELOG.md | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++ toolsrc/VERSION.txt | 2 +- 2 files changed, 197 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b022e78a6..ed5dbbe5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,199 @@ +vcpkg (2018.11.23) +-------------- + * Add ports: + - aixlog 1.2.1 + - civetweb 1.11-1 + - cli11 1.6.1 + - cub 1.8.0 + - cutelyst2 2.5.2-1 + - easyloggingpp 9.96.5-1 + - ecsutil 1.0.1.2-1 + - fdlibm 5.3-2 + - fizz 2018.10.15.00 + - fmi4cpp 0.4.0 + - fribidi 1.0.5 + - glad 0.1.28-3 + - igloo 1.1.1 + - libtins 4.0-2 + - linalg 2.1 + - miniupnpc 2.1 + - nanovg master + - orc 1.5.2-f47e02c-2 + - pixel 0.3 + - plustache 0.4.0-1 + - prometheus-cpp 0.6.0 + - rapidcheck 2018-11-05-1 + - reproc v1.0.0 + - sdl1 1.2.15-3 + - sdl1-net 1.2.8-2 + - snowhouse 3.0.1 + - so5extra 1.2.1 + - socket-io-client 1.6.1 + - stlab 1.3.3 + - tl-optional 0.5-1 + - trompeloeil 32-1 + - vulkan 1.1.82.1 + * Update ports: + - abseil 2018-09-18-3 -> 2018-11-08 + - args 2018-06-28 -> 2018-10-25 + - asio 1.12.1 -> 1.12.1-1 + - asmjit 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a -> 2018-11-08 + - assimp 4.1.0-2 -> 4.1.0-3 + - aws-sdk-cpp 1.6.12-1 -> 1.6.47 + - azure-c-shared-utility 1.1.5 -> 1.1.10-1 + - azure-iot-sdk-c 1.2.3 -> 1.2.10-1 + - azure-storage-cpp 5.1.1 -> 5.2.0 + - azure-uamqp-c 1.2.3 -> 1.2.10-1 + - azure-uhttp-c LTS_01_2018_Ref01 -> 1.1.10-1 + - azure-umqtt-c 1.1.5 -> 1.1.10-1 + - berkeleydb 4.8.30 -> 4.8.30-2 + - boost-modular-build-helper 2018-08-21 -> 2018-10-19 + - brynet 0.9.0 -> 1.0.0 + - bzip2 1.0.6-2 -> 1.0.6-3 + - c-ares cares-1_14_0 -> cares-1_15_0 + - catch2 2.4.0 -> 2.4.2 + - celero 2.3.0-1 -> 2.4.0 + - cgal 4.13-1 -> 4.13-2 + - chakracore 1.11.1-1 -> 1.11.2 + - cimg 2.3.6 -> 2.4.1 + - clara 2018-04-02 -> 2018-11-01 + - corrade 2018.04-1 -> 2018.10-1 + - cpprestsdk 2.10.6-1 -> 2.10.6-3 + - cxxopts 2.1.0-1 -> 2.1.1 + - dimcli 3.1.1-2 -> 4.0.1-1 + - directxmesh aug2018 -> oct2018 + - directxtex aug2018b -> oct2018 + - directxtk aug2018 -> oct2018b + - doctest 2.0.0 -> 2.0.1 + - double-conversion 3.1.0 -> 3.1.0-1 + - eastl 3.12.01 -> 3.12.04 + - egl-registry 2018-06-30 -> 2018-06-30-1 + - entityx 1.2.0-1 -> 1.2.0-2 + - entt 2.7.3 -> 2.7.3-1 + - exiv2 2018-09-18 -> 2018-11-08 + - exprtk 2018.09.30-9836f21 -> 2018-10-11 + - fastcdr 1.0.6-1 -> 1.0.6-2 + - fftw3 3.3.7-2 -> 3.3.8 + - flann 1.9.1-7 -> 1.9.1-8 + - fmt 5.2.0 -> 5.2.1 + - folly 2018.09.17.00 -> 2018.11.05.00 + - forest 9.0.5 -> 9.0.6 + - freeimage 3.17.0-4 -> 3.18.0-2 + - gdcm2 2.8.7 -> 2.8.8 + - glm 0.9.9.2 -> 0.9.9.3 + - google-cloud-cpp 0.1.0-1 -> 0.3.0-1 + - gtest 1.8.0-9 -> 1.8.1-1 + - gtk 3.22.19-1 -> 3.22.19-2 + - hunspell 1.6.1-2 -> 1.6.1-3 + - jsonnet 2018-09-18 -> 2018-11-01 + - libfreenect2 0.2.0 -> 0.2.0-1 + - libgd 2.2.4-3 -> 2.2.4-4 + - libgeotiff 1.4.2-4 -> 1.4.2-6 + - liblinear 2.20 -> 221 + - libpng 1.6.35 -> 1.6.35-1 + - libpq 9.6.1-4 -> 9.6.1-5 + - libusb 1.0.21-fc99620 -> 1.0.22-1 + - libuv 1.23.0 -> 1.24.0 + - libwebm 1.0.0.27-2 -> 1.0.0.27-3 + - magnum 2018.04-1 -> 2018.10-1 + - magnum-extras 2018.04-1 -> 2018.10-1 + - magnum-integration 2018.04-1 -> 2018.10-1 + - magnum-plugins 2018.04-1 -> 2018.10-1 + - matio 1.5.12 -> 1.5.13 + - metis 5.1.0-1 -> 5.1.0-2 + - minizip 1.2.11-2 -> 1.2.11-3 + - mpir 3.0.0-4 -> 3.0.0-5 + - ms-gsl 2018-09-18 -> 2018-11-08 + - nghttp2 1.33.0 -> 1.34.0 + - nlohmann-json 3.3.0 -> 3.4.0 + - nng 1.0.1 -> 1.1.0 + - nuklear 2018-09-18 -> 2018-11-01 + - openal-soft 1.19.0 -> 1.19.1 + - opencv 3.4.1 -> 3.4.3-3 + - opengl-registry 2018-06-30 -> 2018-06-30-1 + - openimageio Release-1.8.13 -> 1.8.16 + - openssl-unix 1.0.2p -> 1.0.2p-1 + - opus 1.2.1-1 -> 1.3 + - osgearth 2.9-1 -> 2.9-2 + - pcl 1.8.1-12 -> 1.9.0-1 + - pixman 0.34.0-4 -> 0.34.0-5 + - portaudio 19.0.6.00-2 -> 19.0.6.00-4 + - qhull 2015.2-2 -> 2015.2-3 + - qscintilla 2.10-4 -> 2.10-7 + - qt5 5.9.2-1 -> 5.11.2 + - qt5-3d 5.9.2-0 -> 5.11.2 + - qt5-activeqt 5.9.2-0 -> 5.11.2 + - qt5-base 5.9.2-7 -> 5.11.2-1 + - qt5-charts 5.9.2-0 -> 5.11.2 + - qt5-datavis3d 5.9.2-0 -> 5.11.2 + - qt5-declarative 5.9.2-0 -> 5.11.2 + - qt5-gamepad 5.9.2-0 -> 5.11.2 + - qt5-graphicaleffects 5.9.2-0 -> 5.11.2 + - qt5-imageformats 5.9.2-0 -> 5.11.2 + - qt5-modularscripts 4 -> 2018-11-01-1 + - qt5-multimedia 5.9.2-0 -> 5.11.2 + - qt5-networkauth 5.9.2-0 -> 5.11.2 + - qt5-quickcontrols 5.9.2-1 -> 5.11.2 + - qt5-quickcontrols2 5.9.2-1 -> 5.11.2 + - qt5-script 5.9.2 -> 5.11.2 + - qt5-scxml 5.9.2-0 -> 5.11.2 + - qt5-serialport 5.9.2-0 -> 5.11.2 + - qt5-speech 5.9.2-0 -> 5.11.2 + - qt5-svg 5.9.2-0 -> 5.11.2 + - qt5-tools 5.9.2-0 -> 5.11.2 + - qt5-virtualkeyboard 5.9.2-0 -> 5.11.2 + - qt5-websockets 5.9.2-0 -> 5.11.2 + - qt5-winextras 5.9.2-0 -> 5.11.2 + - qt5-xmlpatterns 5.9.2-0 -> 5.11.2 + - qwt 6.1.3-5 -> 6.1.3-6 + - range-v3 0.3.5 -> 0.4.0-20181122 + - rapidjson 1.1.0-1 -> 1.1.0-2 + - re2 2018-09-18 -> 2018-11-01 + - rocksdb 5.14.2 -> 5.15.10 + - rs-core-lib 2018-09-18 -> 2018-10-25 + - rttr 0.9.5-2 -> 0.9.5-3 + - scintilla 4.0.3 -> 4.1.2 + - sdl2 2.0.8-1 -> 2.0.9-1 + - sfml 2.5.0-2 -> 2.5.1 + - sobjectizer 5.5.22.1 -> 5.5.23 + - spdlog 1.0.0 -> 1.2.1 + - sqlite3 3.24.0-1 -> 3.25.2 + - suitesparse 4.5.5-4 -> 5.1.2 + - tbb 2018_U5-4 -> 2018_U6 + - thrift 2018-09-18 -> 2018-11-01 + - tiff 4.0.9-4 -> 4.0.10 + - tiny-dnn 2018-09-18 -> 2018-10-25 + - unicorn 2018-09-18 -> 2018-10-25 + - unicorn-lib 2018-09-18 -> 2018-10-25 + - uriparser 0.8.6 -> 0.9.0 + - vtk 8.1.0-1 -> 8.1.0-3 + - vxl 20180414-7a130cf-1 -> v1.18.0-2 + - wangle v2018.07.30.00-1 -> 2018.11.05.00 + - websocketpp 0.7.0-1 -> 0.8.1 + - winpcap 4.1.3-1 -> 4.1.3-2 + - xalan-c 1.11-1 -> 1.11-4 + - xerces-c 3.1.4-3 -> 3.2.2-5 + - yoga 1.9.0 -> 1.10.0 + - zeromq 2018-09-18 -> 2018-11-01 + * `vcpkg install`: Improve error messages + * `vcpkg hash`: Now also tries `shaABCsum tools`, instead of only `shasum`. Allows building in OSes like Alpine. + * `vcpkg edit`: No longer launches the editor in a clean (purged) environment. + * `vcpkg upgrade`: now tab-completed in powershell (it was missing before). + * Add new function: `vcpkg_from_git()` + * Enable Visual Studio versions greater than 15. + * Add Visual Studio Code autotection on OSX (#4589) + * Work-around hash issue caused by NuGet adding signatures to all their files. + * Improve building `vcpkg.exe` (Windows-only): + - Builds out of source + - Temporary files are removed after bootstrap + - User Property Pages are ignored (#4620) + * `vcpkg` now prints URL and filepath, when downloading a tool (#4640) + * Bump version of `cmake` to 3.12.4 + * Bump version of `git` to 2.9.1 + +-- vcpkg team FRI, 23 Nov 2018 14:30:00 -0800 + + vcpkg (2018.10.20) -------------- * Add ports: diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt index dc0d30c54..ce62ec959 100644 --- a/toolsrc/VERSION.txt +++ b/toolsrc/VERSION.txt @@ -1 +1 @@ -"2018.10.20" \ No newline at end of file +"2018.11.23" \ No newline at end of file -- cgit v1.2.3 From aafce6227adbf40d2295e5822132c1ef06379ff1 Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Mon, 26 Nov 2018 23:27:42 +0000 Subject: [imgui] Update to v1.66 (#4799) --- ports/imgui/CONTROL | 2 +- ports/imgui/portfile.cmake | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index a973b215b..8f310b04f 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.65 +Version: 1.66 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 1f427a068..8f5452042 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.65 - SHA512 f68bbf84b781ea3e409beccb02b0bf8fe78d56e1ce7d8fce785f629758310ae75c9624ed62b2b6194e50f00cc7cc17f643191f4fbbad9236aa2e82a9ea4f6aac + REF v1.66 + SHA512 85d41e6fa2141da87b72e5c39d23fe285bea086d6dd758a5ec048a495c29bbcf0a49ee1e9f442d5db3452fd0f28d1e52a2c41b5402cbbaa3ad6612818aaea670 HEAD_REF master ) @@ -21,5 +21,4 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/imgui) -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/imgui) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/imgui/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/imgui/copyright) +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/imgui/copyright COPYONLY) -- cgit v1.2.3 From e78a40b553e6b236e6d532686865a910e7a3ee16 Mon Sep 17 00:00:00 2001 From: i6-xx Date: Tue, 27 Nov 2018 01:27:59 +0200 Subject: [rpclib]Update to 2.2.1 (#4798) * (rpclib)Update to 2.2.1 * [rpclib]Update to 2.2.1 --- ports/rpclib/CONTROL | 2 +- ports/rpclib/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/rpclib/CONTROL b/ports/rpclib/CONTROL index 160f4651c..2123f29c4 100644 --- a/ports/rpclib/CONTROL +++ b/ports/rpclib/CONTROL @@ -1,3 +1,3 @@ Source: rpclib -Version: 2.2.0 +Version: 2.2.1 Description: a RPC library for C++, providing both a client and server implementation. It is built using modern C++14. diff --git a/ports/rpclib/portfile.cmake b/ports/rpclib/portfile.cmake index 5f4ac6a57..40aea10bb 100644 --- a/ports/rpclib/portfile.cmake +++ b/ports/rpclib/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rpclib/rpclib - REF v2.2.0 - SHA512 73d2344debb3a6ced6a045ba3bf8839a6f91d8f43dfac8760c65d19d1fc7960e778457a20fddbd771d7dd4b12e32d8a925f1fc008d11ccc5654dbeb08ba0f50a + REF v2.2.1 + SHA512 a63c6d09a411fb6b87d0df7c4f75a189f775ff0208f5f1c67333a85030a47efe60d5518e5939e98abc683a6063afb6cfed51f118f594a2a08be32330a9691051 HEAD_REF master ) -- cgit v1.2.3 From 8361d177d7bfcd03b4117184483e783f22341d9a Mon Sep 17 00:00:00 2001 From: Erwan BERNARD Date: Tue, 27 Nov 2018 00:41:37 +0100 Subject: [zstd] update to v1.3.7 (#4785) * [zstd] update to v1.3.7 * [zstd] Bump control version * [zstd] Disable force release mode --- ports/zstd/CONTROL | 2 +- ports/zstd/enable-debug-mode.patch | 13 +++++++++++++ ports/zstd/portfile.cmake | 8 +++++--- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 ports/zstd/enable-debug-mode.patch diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index 406d67176..985c24b0c 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,3 +1,3 @@ Source: zstd -Version: 1.3.4 +Version: 1.3.7-1 Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net diff --git a/ports/zstd/enable-debug-mode.patch b/ports/zstd/enable-debug-mode.patch new file mode 100644 index 000000000..a3e829032 --- /dev/null +++ b/ports/zstd/enable-debug-mode.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt +index 1e2921d..31fe3d5 100644 +--- a/build/cmake/CMakeLists.txt ++++ b/build/cmake/CMakeLists.txt +@@ -12,7 +12,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) + SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") + + # Ensure Release build even if not invoked via Makefile +-SET(CMAKE_BUILD_TYPE "Release") ++# SET(CMAKE_BUILD_TYPE "Release") + + LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") + INCLUDE(GNUInstallDirs) diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 44a980db4..dfbb2e3f2 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -2,9 +2,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd - REF v1.3.4 - SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554 - HEAD_REF dev) + REF v1.3.7 + SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738 + HEAD_REF dev + PATCHES enable-debug-mode.patch +) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ZSTD_STATIC 1) -- cgit v1.2.3 From d562441fc96e160444cf476351b986bd410e5a2b Mon Sep 17 00:00:00 2001 From: Jayesh Badwaik Date: Tue, 27 Nov 2018 01:52:11 +0100 Subject: [xmsh] add support for xmsh library (#4656) * [xmsh] add support for xmsh library - xmsh is a mesh document format. xmsh library is the reference implementation for the format. * [xmsh] removed extraneous file command * [xmsh] update version to v0.2.3 * [xmsh] upgrade to version v0.3.1 * [xmsh] update to version v0.4 * + fix python executable packaging * [vcpkg_find_acquire_program] Fix PYTHON3 on non-Windows --- ports/xmsh/CONTROL | 4 ++++ ports/xmsh/portfile.cmake | 29 ++++++++++++++++++++++++++ scripts/cmake/vcpkg_find_acquire_program.cmake | 18 ++++++++++------ 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 ports/xmsh/CONTROL create mode 100644 ports/xmsh/portfile.cmake diff --git a/ports/xmsh/CONTROL b/ports/xmsh/CONTROL new file mode 100644 index 000000000..7f53c582c --- /dev/null +++ b/ports/xmsh/CONTROL @@ -0,0 +1,4 @@ +Source: xmsh +Version: 0.4.1 +Description: Reference Implementation of XMSH Library +Build-Depends: tl-expected diff --git a/ports/xmsh/portfile.cmake b/ports/xmsh/portfile.cmake new file mode 100644 index 000000000..51897e6bd --- /dev/null +++ b/ports/xmsh/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nagzira/xmsh + REF v0.4.1 + SHA512 7bd9fe9e565b33722fec37a7e3d9bd8b7b132692add5d26e31954367fb284b49a26a21532ddcb0e425af7f8208e755f21f2d8de81b33ed2a1149724f4ccd2c38 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPYTHON3_EXECUTABLE=${PYTHON3} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +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_copy_pdbs() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 1ff2ab071..ebe46b335 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -77,12 +77,18 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) elseif(VAR MATCHES "PYTHON3") - set(PROGNAME python) - set(SUBDIR "python3") - set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") - set(ARCHIVE "python-3.5.4-embed-win32.zip") - set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + if(CMAKE_HOST_WIN32) + set(PROGNAME python) + set(SUBDIR "python3") + set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) + set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") + set(ARCHIVE "python-3.5.4-embed-win32.zip") + set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + else() + set(PROGNAME python3) + set(BREW_PACKAGE_NAME "python") + set(APT_PACKAGE_NAME "python3") + endif() elseif(VAR MATCHES "PYTHON2") set(PROGNAME python) set(SUBDIR "python2") -- cgit v1.2.3 From 351fbda5b851f4cb59bdde15183b567f08f20841 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Tue, 27 Nov 2018 10:04:57 +0100 Subject: Update ffmpeg to 4.1. --- ports/ffmpeg/CONTROL | 2 +- ports/ffmpeg/portfile.cmake | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 7688f67f9..35b3e257e 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 3.3.3-5 +Version: 4.1 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 994e057b3..f8c0c9f38 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,9 +1,9 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-3.3.3) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-4.1) vcpkg_download_distfile(ARCHIVE - URLS "http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.bz2" - FILENAME "ffmpeg-3.3.3.tar.bz2" - SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab + URLS "http://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2" + FILENAME "ffmpeg-4.1.tar.bz2" + SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417 ) if (${SOURCE_PATH} MATCHES " ") @@ -59,12 +59,6 @@ else() set(OPTIONS "${OPTIONS} --disable-ffplay") endif() -if("ffserver" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} --enable-ffserver") -else() - set(OPTIONS "${OPTIONS} --disable-ffserver") -endif() - if("ffprobe" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-ffprobe") else() -- cgit v1.2.3 From 007144b1e642fa9699d4bf4e42a7678ef55f25c4 Mon Sep 17 00:00:00 2001 From: James Chang Date: Thu, 29 Nov 2018 01:47:15 +0800 Subject: [ogre] Update to 1.11.3 --- ports/ogre/001-cmake-install-dir.patch | 16 +++--- ports/ogre/002-link-optimized-lib-workaround.patch | 37 +++++++++++++ ports/ogre/CONTROL | 2 +- ports/ogre/portfile.cmake | 62 ++++++++++------------ 4 files changed, 75 insertions(+), 42 deletions(-) create mode 100644 ports/ogre/002-link-optimized-lib-workaround.patch diff --git a/ports/ogre/001-cmake-install-dir.patch b/ports/ogre/001-cmake-install-dir.patch index 27c6d2f70..548f946f7 100644 --- a/ports/ogre/001-cmake-install-dir.patch +++ b/ports/ogre/001-cmake-install-dir.patch @@ -1,5 +1,5 @@ ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt @@ -13,10 +13,12 @@ # directory, but can also be used for custom projects. ############################################################# @@ -8,7 +8,7 @@ - set(OGRE_CMAKE_DIR "CMake") -else() - set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+if (NOT DEFINED OGRE_CMAKE_DIR) ++if(NOT DEFINED OGRE_CMAKE_DIR) + if(WIN32 OR APPLE) + set(OGRE_CMAKE_DIR "CMake") + else() @@ -16,10 +16,10 @@ + endif() endif() - set(INST_FILES ---- a/cmake/InstallResources.cmake -+++ b/cmake/InstallResources.cmake -@@ -241,10 +241,12 @@ endif () + set(INST_FILES Utils/FindPkgMacros.cmake) +--- a/CMake/InstallResources.cmake ++++ b/CMake/InstallResources.cmake +@@ -242,10 +242,12 @@ # Create the CMake package files include(CMakePackageConfigHelpers) @@ -27,7 +27,7 @@ - set(OGRE_CMAKE_DIR "CMake") -else() - set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+if (NOT DEFINED OGRE_CMAKE_DIR) ++if(NOT DEFINED OGRE_CMAKE_DIR) + if(WIN32 OR APPLE) + set(OGRE_CMAKE_DIR "CMake") + else() diff --git a/ports/ogre/002-link-optimized-lib-workaround.patch b/ports/ogre/002-link-optimized-lib-workaround.patch new file mode 100644 index 000000000..b2678f488 --- /dev/null +++ b/ports/ogre/002-link-optimized-lib-workaround.patch @@ -0,0 +1,37 @@ +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -199,6 +199,11 @@ + # Find zlib + find_package(ZLIB) + macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" FALSE "" "") ++# replace optimized/debug keyword with generator expression ++unset(ZLIB_LIBRARY) ++set(ZLIB_LIBRARY $<$:${ZLIB_LIBRARY_RELEASE}> $<$:${ZLIB_LIBRARY_DEBUG}>) ++unset(ZLIB_LIBRARIES) ++set(ZLIB_LIBRARIES ${ZLIB_LIBRARY}) + + if (ZLIB_FOUND) + # Find zziplib +@@ -213,6 +218,11 @@ + # Find FreeType + find_package(Freetype) + macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") ++# replace optimized/debug keyword with generator expression ++unset(FREETYPE_LIBRARY) ++set(FREETYPE_LIBRARY $<$:${FREETYPE_LIBRARY_RELEASE}> $<$:${FREETYPE_LIBRARY_DEBUG}>) ++unset(FREETYPE_LIBRARIES) ++set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) + + # Find X11 + if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN) +--- src.orig/CMake/Utils/FindPkgMacros.cmake ++++ src.new/CMake/Utils/FindPkgMacros.cmake +@@ -82,7 +82,7 @@ + if (${PREFIX}_FWK) + set(${PREFIX} ${${PREFIX}_FWK}) + elseif (${PREFIX}_REL AND ${PREFIX}_DBG) +- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) ++ set(${PREFIX} $<$:${${PREFIX}_REL}> $<$:${${PREFIX}_DBG}>) + elseif (${PREFIX}_REL) + set(${PREFIX} ${${PREFIX}_REL}) + elseif (${PREFIX}_DBG) diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index f7d93e7b2..0ec16b4de 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.10.11 +Version: 1.11.3 Build-Depends: freeimage, freetype, zlib, zziplib Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 8281960c6..4b4e63e02 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -3,15 +3,16 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre - REF v1.10.11 - SHA512 2dfedd6f0a0de1a8c687c001439138b233200ca11e5c9940debf43d8a0380ca6472e0b5f4d599f0e22ca2049d0a5d34066ef41b6bc4912130694fa5d851fc900 + REF v1.11.3 + SHA512 af52821022ab6148e64fdf183b1aa4607b101c7d0edc20d2ccc909f50eed218d7a283fa3b58260fd41cd3f324ecafad8c5137c66e05786580b043240551b2c42 HEAD_REF master ) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/001-cmake-install-dir.patch" + ${CMAKE_CURRENT_LIST_DIR}/001-cmake-install-dir.patch + ${CMAKE_CURRENT_LIST_DIR}/002-link-optimized-lib-workaround.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -58,10 +59,7 @@ vcpkg_configure_cmake( -DOGRE_INSTALL_CMAKE=ON -DOGRE_INSTALL_VSPROPS=OFF -DOGRE_STATIC=${OGRE_STATIC} - -DOGRE_UNITY_BUILD=OFF - -DOGRE_USE_STD11=ON -DOGRE_CONFIG_THREAD_PROVIDER=std - -DOGRE_NODE_STORAGE_LEGACY=OFF -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON -DOGRE_BUILD_RENDERSYSTEM_GL=ON -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON @@ -95,33 +93,31 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link ${CURRENT_PACKAGES_DIR}/lib/manual-link) - -file(GLOB MAIN_REL ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib) -file(COPY ${MAIN_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) -file(GLOB MAIN_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib) -file(COPY ${MAIN_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) -file(REMOVE ${MAIN_REL} ${MAIN_DBG}) - -# Ogre installs custom cmake config files which don't follow the normal pattern. -# This normally makes them completely incompatible with multi-config generators, but with some effort it can be done. -file(READ "${CURRENT_PACKAGES_DIR}/share/ogre/OGREConfig.cmake" _contents) -string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${PACKAGE_PREFIX_DIR}" _contents "${_contents}") -string(REPLACE "SDL2main.lib" "SDL2main$<$:d>.lib" _contents "${_contents}") -string(REPLACE "SDL2.lib" "SDL2$<$:d>.lib" _contents "${_contents}") -string(REPLACE "\${PACKAGE_PREFIX_DIR}/lib" "\${PACKAGE_PREFIX_DIR}$<$:/debug>/lib" _contents "${_contents}") -string(REPLACE "{OGRE_PREFIX_DIR}/lib" "{OGRE_PREFIX_DIR}$<$:/debug>/lib" _contents "${_contents}") - -string(REPLACE "\"Ogre\${COMPONENT}\"" "\"Ogre\${COMPONENT}$<$:_d>\"" _contents "${_contents}") -string(REPLACE "\"Ogre\${COMPONENT}Static\"" "\"Ogre\${COMPONENT}Static$<$:_d>\"" _contents "${_contents}") - -string(REPLACE "\"\${TYPE}_\${COMPONENT}\"" "\"\${TYPE}_\${COMPONENT}$<$:_d>\"" _contents "${_contents}") -string(REPLACE "\"\${TYPE}_\${COMPONENT}Static\"" "\"\${TYPE}_\${COMPONENT}Static$<$:_d>\"" _contents "${_contents}") - -string(REPLACE "\"OgreMain\"" "\"\${PACKAGE_PREFIX_DIR}/lib/manual-link/OgreMain$<$:_d>.lib\"" _contents "${_contents}") -string(REPLACE "\"OgreMainStatic\"" "\"\${PACKAGE_PREFIX_DIR}/lib/manual-link/OgreMainStatic$<$:_d>.lib\"" _contents "${_contents}") - -file(WRITE "${CURRENT_PACKAGES_DIR}/share/ogre/OGREConfig.cmake" "${_contents}") +if(NOT VCPKG_CMAKE_SYSTEM_NAME) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic_d.lib) + endif() + endif() + + file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake) + foreach(SHARE_FILE ${SHARE_FILES}) + file(READ "${SHARE_FILE}" _contents) + string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") + file(WRITE "${SHARE_FILE}" "${_contents}") + endforeach() +endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright) -- cgit v1.2.3 From 1225d80d11124aaa0be7f437772c1b3b9db5efc1 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 28 Nov 2018 18:33:10 -0500 Subject: [physfs] Fix Win10 GetUserProfileDirectory() problem Fixes GetUserProfileDirectory issue on Win10 build 1809(+?) See: https://hg.icculus.org/icculus/physfs/rev/ece6769c0676 --- ports/physfs/CONTROL | 2 +- .../physfs.3.0.1.GetUserProfileDirectory.patch | 25 ++++++++++++++++++++++ ports/physfs/portfile.cmake | 8 ++++++- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch diff --git a/ports/physfs/CONTROL b/ports/physfs/CONTROL index a937d38bf..5d5d69755 100644 --- a/ports/physfs/CONTROL +++ b/ports/physfs/CONTROL @@ -1,4 +1,4 @@ Source: physfs -Version: 3.0.1 +Version: 3.0.1-1 Description: a library to provide abstract access to various archives Build-Depends: zlib diff --git a/ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch b/ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch new file mode 100644 index 000000000..4338e52e5 --- /dev/null +++ b/ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch @@ -0,0 +1,25 @@ + +diff -r a29fef4a20fd -r ece6769c0676 src/physfs_platform_windows.c +--- a/src/physfs_platform_windows.c Wed May 16 19:54:51 2018 -0400 ++++ b/src/physfs_platform_windows.c Wed Oct 03 22:40:57 2018 -0400 +@@ -566,7 +566,6 @@ + else + { + DWORD psize = 0; +- WCHAR dummy = 0; + LPWSTR wstr = NULL; + BOOL rc = 0; + +@@ -575,7 +574,7 @@ + * psize. Also note that the second parameter can't be + * NULL or the function fails. + */ +- rc = pGetDir(accessToken, &dummy, &psize); ++ rc = pGetDir(accessToken, NULL, &psize); + GOTO_IF(rc, PHYSFS_ERR_OS_ERROR, done); /* should have failed! */ + + /* Allocate memory for the profile directory */ + + + + diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 08b49e69f..feee3b456 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -6,7 +6,13 @@ vcpkg_download_distfile(ARCHIVE FILENAME "physfs-${PHYSFS_VERSION}.tar.bz2" SHA512 ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879 ) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PHYSFS_VERSION} + PATCHES + physfs.3.0.1.GetUserProfileDirectory.patch # Fixes GetUserProfileDirectory issue on Win10 build 1809(+?); See: https://hg.icculus.org/icculus/physfs/rev/ece6769c0676 +) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) -- cgit v1.2.3 From 08d6a499775d000c35daf5c94080fbfeac98dbe8 Mon Sep 17 00:00:00 2001 From: Josue Andrade Gomes Date: Thu, 29 Nov 2018 00:09:59 -0200 Subject: Update to GraphicsMagick 1.3.31 (#4847) --- ports/graphicsmagick/CONTROL | 2 +- ports/graphicsmagick/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index f8519040f..7b89a8fd9 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,5 +1,5 @@ Source: graphicsmagick Maintainer: josuegomes@gmail.com -Version: 1.3.30-1 +Version: 1.3.31 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index b04842eb1..87d03bd1f 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(GM_VERSION 1.3.30) +set(GM_VERSION 1.3.31) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z" FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 9e4cfff57ae547f133e6208033213d3aa790cd8c95a061c101c63b8ae8896e7504d02f302efdd20ff24f72c07760a0a5e2b32e21fe454717ed1deb2edeef159c + SHA512 ff67f5e6adf352527264e7a6a76d45ce34470263dc764760d876b9ab5d5078e3a46b9d9cb2e7ab52d53106ffe584d44c66b42f3d4d62c972662d488c86510881 ) vcpkg_extract_source_archive_ex( -- cgit v1.2.3 From 3e71750029740df700b46dfa3761c42509f08e54 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Thu, 29 Nov 2018 11:20:09 +0900 Subject: [pcl] Update to PCL 1.9.1 (#4842) Update PCL port to PCL 1.9.1. --- ports/pcl/CONTROL | 2 +- ports/pcl/pcl_utils.patch | 36 +++++++++++++++++++++--------------- ports/pcl/portfile.cmake | 4 ++-- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 0a12f78c8..a9f23813d 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,5 +1,5 @@ Source: pcl -Version: 1.9.0-1 +Version: 1.9.1-1 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, vtk, 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-ptr-container, boost-uuid, boost-interprocess, boost-asio diff --git a/ports/pcl/pcl_utils.patch b/ports/pcl/pcl_utils.patch index 3f266cdfd..9c12e4d05 100644 --- a/ports/pcl/pcl_utils.patch +++ b/ports/pcl/pcl_utils.patch @@ -1,22 +1,28 @@ diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake -index 41a64a269..a12718339 100644 +index f523dbc8c..a171b6d24 100644 --- a/cmake/pcl_utils.cmake +++ b/cmake/pcl_utils.cmake -@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS) +@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS) + if (NOT DEFINED LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR "lib") endif (NOT DEFINED LIB_INSTALL_DIR) - if(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT -- "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") -+ "include") - else(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir - endif(NOT ANDROID) -@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS) +- if(NOT ANDROID) +- set(INCLUDE_INSTALL_ROOT +- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- else(NOT ANDROID) +- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir +- endif(NOT ANDROID) ++ set(INCLUDE_INSTALL_ROOT "include") + set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl") + set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") set(BIN_INSTALL_DIR "bin") set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") - if(WIN32 AND NOT MINGW) +- if(WIN32 AND NOT MINGW) - set(PCLCONFIG_INSTALL_DIR "cmake") -+ set(PCLCONFIG_INSTALL_DIR "share/pcl") - else(WIN32 AND NOT MINGW) - set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") - endif(WIN32 AND NOT MINGW) +- else(WIN32 AND NOT MINGW) +- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- endif(WIN32 AND NOT MINGW) ++ set(PCLCONFIG_INSTALL_DIR "share/pcl") + endmacro(SET_INSTALL_DIRS) + + diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 650e6de1a..4036d5346 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl - REF pcl-1.9.0 - SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc + REF pcl-1.9.1 + SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf HEAD_REF master PATCHES pcl_utils.patch pcl_config.patch -- cgit v1.2.3 From fae3055effac47bda6f5eefaf5335309bd70816e Mon Sep 17 00:00:00 2001 From: Pavel Kisliak <37534137+PavelKisliak@users.noreply.github.com> Date: Thu, 29 Nov 2018 05:20:43 +0300 Subject: [bitserializer] Update to v0.8, split to two sub-libraries (#4841) --- ports/bitserializer-cpprestjson/CONTROL | 4 ++++ ports/bitserializer-cpprestjson/portfile.cmake | 13 +++++++++++++ ports/bitserializer-rapidjson/CONTROL | 4 ++++ ports/bitserializer-rapidjson/portfile.cmake | 13 +++++++++++++ ports/bitserializer/CONTROL | 5 ++--- ports/bitserializer/portfile.cmake | 6 +++--- 6 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 ports/bitserializer-cpprestjson/CONTROL create mode 100644 ports/bitserializer-cpprestjson/portfile.cmake create mode 100644 ports/bitserializer-rapidjson/CONTROL create mode 100644 ports/bitserializer-rapidjson/portfile.cmake diff --git a/ports/bitserializer-cpprestjson/CONTROL b/ports/bitserializer-cpprestjson/CONTROL new file mode 100644 index 000000000..f75cd41a2 --- /dev/null +++ b/ports/bitserializer-cpprestjson/CONTROL @@ -0,0 +1,4 @@ +Source: bitserializer-cpprestjson +Version: 0.8 +Build-Depends: bitserializer, cpprestsdk +Description: This is an implementation of the BitSerializer archive for serialization JSON (based on CppRestSDK library). diff --git a/ports/bitserializer-cpprestjson/portfile.cmake b/ports/bitserializer-cpprestjson/portfile.cmake new file mode 100644 index 000000000..28430d590 --- /dev/null +++ b/ports/bitserializer-cpprestjson/portfile.cmake @@ -0,0 +1,13 @@ +include(vcpkg_common_functions) +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pavel_Kisliak/BitSerializer + REF 0.8 + SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/archives/bitserializer_cpprest_json DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-cpprestjson RENAME copyright) diff --git a/ports/bitserializer-rapidjson/CONTROL b/ports/bitserializer-rapidjson/CONTROL new file mode 100644 index 000000000..db65c52ae --- /dev/null +++ b/ports/bitserializer-rapidjson/CONTROL @@ -0,0 +1,4 @@ +Source: bitserializer-rapidjson +Version: 0.8 +Build-Depends: bitserializer, rapidjson +Description: This is an implementation of the BitSerializer archive for serialization JSON (based on the RapidJson library). diff --git a/ports/bitserializer-rapidjson/portfile.cmake b/ports/bitserializer-rapidjson/portfile.cmake new file mode 100644 index 000000000..4050b73bc --- /dev/null +++ b/ports/bitserializer-rapidjson/portfile.cmake @@ -0,0 +1,13 @@ +include(vcpkg_common_functions) +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pavel_Kisliak/BitSerializer + REF 0.8 + SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/archives/bitserializer_rapidjson DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-rapidjson RENAME copyright) diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL index 95e36f5b9..35e02fe03 100644 --- a/ports/bitserializer/CONTROL +++ b/ports/bitserializer/CONTROL @@ -1,4 +1,3 @@ Source: bitserializer -Version: 0.7 -Build-Depends: cpprestsdk -Description: The library for simple serialization of arbitrary C++ types to various output formats (currently just supported JSON based on CppRestSDK). +Version: 0.8 +Description: The core part of library for serialization of arbitrary C++ types to various output formats. diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 5e59f0c71..50eb93481 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -2,12 +2,12 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.7 - SHA512 3a50b1b3077115f60d298f4257ae6a5a350c1d8b3d575af83b4f0746757ab3393da7c81ac9c7db4e30540fe94f1742b1d39de724b2dec080faf727b885bb19a4 + REF 0.8 + SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) +file(INSTALL ${SOURCE_PATH}/core/bitserializer DESTINATION ${CURRENT_PACKAGES_DIR}/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer RENAME copyright) -- cgit v1.2.3 From f3b5ed1d24c79966158d20a03b019c4976a0215c Mon Sep 17 00:00:00 2001 From: Raynor Vliegendhart Date: Thu, 29 Nov 2018 03:22:05 +0100 Subject: Add IE Proxy fallback for Win7 (#4838) --- toolsrc/src/vcpkg/base/downloads.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index fad3ff119..571562244 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -42,6 +42,28 @@ namespace vcpkg::Downloads 0); Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError()); + // Win7 IE Proxy fallback + 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(hSession, 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(hSession, WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy)); + } + } + } + // 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); -- cgit v1.2.3 From e943161971653afba2fff5489158f8760ddc804a Mon Sep 17 00:00:00 2001 From: kyp Date: Thu, 29 Nov 2018 03:27:24 +0100 Subject: [folly] update to v2018.11.26 and fix linux build (#4832) --- ports/folly/CONTROL | 2 +- ports/folly/find-gflags.patch | 26 +++++++++++++------------- ports/folly/no-werror.patch | 24 ++++++++++++------------ ports/folly/portfile.cmake | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index f8842fec4..1711bda03 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.11.05.00 +Version: 2018.11.26.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/find-gflags.patch b/ports/folly/find-gflags.patch index 986dd6d57..a3e011683 100644 --- a/ports/folly/find-gflags.patch +++ b/ports/folly/find-gflags.patch @@ -1,13 +1,13 @@ -diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake -index 396fa6c..9d80d99 100644 ---- a/CMake/folly-deps.cmake -+++ b/CMake/folly-deps.cmake -@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) - list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) - - set(FOLLY_HAVE_LIBGFLAGS OFF) --find_package(GFlags CONFIG QUIET) -+find_package(gflags CONFIG REQUIRED) - if (gflags_FOUND) - message(STATUS "Found gflags from package config") - set(FOLLY_HAVE_LIBGFLAGS ON) +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index 437c0cd..5530a35 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) + + set(FOLLY_HAVE_LIBGFLAGS OFF) +-find_package(gflags CONFIG QUIET) ++find_package(gflags CONFIG REQUIRED) + if (gflags_FOUND) + message(STATUS "Found gflags from package config") + set(FOLLY_HAVE_LIBGFLAGS ON) diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch index e9ec920dc..32fbc9494 100644 --- a/ports/folly/no-werror.patch +++ b/ports/folly/no-werror.patch @@ -1,12 +1,12 @@ -diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake -index b7d994b..a518cbe 100644 ---- a/CMake/FollyCompilerUnix.cmake -+++ b/CMake/FollyCompilerUnix.cmake -@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET) - -std=gnu++14 - -finput-charset=UTF-8 - -fsigned-char -- -Werror - -Wall - -Wno-deprecated - -Wdeprecated-declarations +diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake +index a9cc2c1..de7d714 100644 +--- a/CMake/FollyCompilerUnix.cmake ++++ b/CMake/FollyCompilerUnix.cmake +@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET) + -std=${CXX_STD} + -finput-charset=UTF-8 + -fsigned-char +- -Werror + -Wall + -Wno-deprecated + -Wno-deprecated-declarations diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index bb15bf859..c66599f7e 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.11.05.00 - SHA512 08eee201c2b1179a4e52398cc65964fb299abfb95934687f4ce3d72df1ff70493964835d5e52c8821c63553e0be0d578e1130e50e353a7eab6b0334532e4df2e + REF v2018.11.26.00 + SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac HEAD_REF master PATCHES find-gflags.patch -- cgit v1.2.3 From 593d3af5b93284a4decb8f85d7b3f224acc9f5c7 Mon Sep 17 00:00:00 2001 From: Jelani Brandon Date: Wed, 28 Nov 2018 22:53:39 -0800 Subject: Update Azure Iot C SDK repo's SHA for the latest release (#4833) * Update Azure Iot C SDK repo's SHA for the latest release * [azure-uhttp-c] Fix hash --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 4 ++-- ports/azure-iot-sdk-c/CONTROL | 2 +- 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(+), 15 deletions(-) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 7a19242e9..c5e51adaf 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,4 +1,4 @@ Source: azure-c-shared-utility -Version: 1.1.10-1 +Version: 1.1.11-1 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 0d2d8a493..838528ce4 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 68ede5bbc58c7d976f3bd68325edec181c254e5e - SHA512 97253c081cab90c7c879da9ecfa076be43d19fd0d442d91fcab8ab3149e792b868c363c56b5afc3e3880a18b400e663661d257237d2f1ef97544522a1cabcd5a + REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3 + SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1 HEAD_REF master ) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 69c813f3c..9c9410bfe 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-iot-sdk-c -Version: 1.2.10-1 +Version: 1.2.11-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 17893f17e..6ec8ba3eb 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 0ca9b92d4ff7f7a44fe1687e81f919bd7dcaa944 - SHA512 a4d43d5615d3571fda29f3d47467b816745f939941da899df799a0c4cf09c920c20b924aa29e2e2d6f4a19b81ff83969e773b6cf333bec9e2170376fe07b42ec + REF acff8b1677150cb165a7b111745144cf8fab76cc + SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28 HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index f56ab20f3..8f5f63c08 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uamqp-c -Version: 1.2.10-1 +Version: 1.2.11-1 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index c2e08baf0..0f7591099 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF ec107011716bc797d3d7a4a4a1141df4367038a3 - SHA512 db25018a6f93a29da4bae8426f6e021a0d823075375f69f617c6aba776f5ac6ed5107e055f0a436f22ede2057045d28fab15607a58703c6c43937abec87ab076 + REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa + SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58 HEAD_REF master ) diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index be45af110..e41543687 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uhttp-c -Version: 1.1.10-1 +Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index a4bb1c67b..de34ba4dd 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 8ec55bb8596dae1154ae897b5064b8eba34c136c - SHA512 73b861409dede5c1936711ec04e76e8467dadc08acda6ac1b832046a4f9b2f6d35403c01acb818b5655c2c43f700d9f83edf11b8b00f7a565f260700a12c9f7c + REF ed7d104c4ab96aaa68e429066953874f12be70eb + SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f HEAD_REF master ) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 3466cc49d..9a5f5e030 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.10-1 +Version: 1.1.11-1 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index c2825a681..cb14cfaa8 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF e5ab6b66ccba5a7ff7ed7421ffe0fa13ecabe000 - SHA512 19878f798d73f98afdee6ac574e136f1b2f8ddd3a7537ee666a98d04cade6ecd2526714eb74335af2eff05165492933ec90cb79a9cb914093fa96cfe35a84cb4 + REF ff05514c9b4742ae8d7785719a399a7fe6eac09b + SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081 HEAD_REF master ) -- cgit v1.2.3 From 09103d12a02ac588fe875235c3661ad4bc8cd46a Mon Sep 17 00:00:00 2001 From: Juha Sointusalo Date: Thu, 29 Nov 2018 08:55:18 +0200 Subject: [wxwidgets] move setup.h to include (#4846) * [wxwidgets] move setup.h to include Also remove lib/mswu and debug/lib/mswud. They only contain setup.h. Fixes #3180. Closes #4251. * [wxwidgets] remove include/msvc directory The only thing in include/msvc is include/msvc/wx/setup.h which is a "wrapper" around the real setup.h. The wrapper setup.h is hard-coded to include the real setup.h from lib but since the real setup.h is now in include/wx the wrapper has become useless. * [wxwidgets] Fix osx build. Slight modernization. --- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index 48ceab120..af985fa67 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.1 +Version: 3.1.1-2 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index e18b8a6ba..062238946 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -5,11 +5,7 @@ vcpkg_from_github( REF v3.1.1 SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-platform-lib-dir.patch" + PATCHES disable-platform-lib-dir.patch ) vcpkg_configure_cmake( @@ -48,4 +44,11 @@ endif() # Handle copyright file(COPY ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets) file(RENAME ${CURRENT_PACKAGES_DIR}/share/wxwidgets/licence.txt ${CURRENT_PACKAGES_DIR}/share/wxwidgets/copyright) + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -- cgit v1.2.3 From ed9d726429bfa029b9cbcb565821740fe7256f32 Mon Sep 17 00:00:00 2001 From: Jeong Yunwon Date: Thu, 29 Nov 2018 16:09:08 +0900 Subject: [flatbuffers] disable -Werror for gcc8 --- ports/flatbuffers/no-werror.patch | 23 +++++++++++++++++++++++ ports/flatbuffers/portfile.cmake | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ports/flatbuffers/no-werror.patch diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch new file mode 100644 index 000000000..7c2d548b9 --- /dev/null +++ b/ports/flatbuffers/no-werror.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3388dd..f0626e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,12 +119,16 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) + "${CMAKE_CXX_FLAGS} -std=c++0x") + endif(CYGWIN) + set(CMAKE_CXX_FLAGS +- "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow") ++ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow") + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4) + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -faligned-new") + endif() ++ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) ++ set(CMAKE_CXX_FLAGS ++ "${CMAKE_CXX_FLAGS} -Wextra") ++ endif() + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter") + endif() + diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index b6a0e6ba5..d98d5ce48 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_from_github( REF v1.9.0 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696 HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch + ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch ) set(OPTIONS) -- cgit v1.2.3 From 3ade65784513552ccea874baf73d57800bab9e5c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 28 Nov 2018 23:23:38 -0800 Subject: [ogre] Slight modernization --- ports/ogre/CONTROL | 2 +- ports/ogre/portfile.cmake | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 0ec16b4de..9930486e4 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.11.3 +Version: 1.11.3-1 Build-Depends: freeimage, freetype, zlib, zziplib Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 4b4e63e02..8d4e0b490 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -6,13 +6,9 @@ vcpkg_from_github( REF v1.11.3 SHA512 af52821022ab6148e64fdf183b1aa4607b101c7d0edc20d2ccc909f50eed218d7a283fa3b58260fd41cd3f324ecafad8c5137c66e05786580b043240551b2c42 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/001-cmake-install-dir.patch - ${CMAKE_CURRENT_LIST_DIR}/002-link-optimized-lib-workaround.patch + 001-cmake-install-dir.patch + 002-link-optimized-lib-workaround.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) -- cgit v1.2.3 From 71f060f4a17525c95791c5dc41e231d8b85decb1 Mon Sep 17 00:00:00 2001 From: Renat Shaymagsumov Date: Thu, 29 Nov 2018 17:21:19 +0300 Subject: [devil] Fix 'tiff' option name. --- ports/devil/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index e49507386..7fd17630c 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -20,7 +20,7 @@ if("libpng" IN_LIST FEATURES) endif() set(IL_NO_TIF 1) -if("libtiff" IN_LIST FEATURES) +if("tiff" IN_LIST FEATURES) set(IL_NO_TIF 0) endif() -- cgit v1.2.3 From 4c6950adcb4a442e24b43af6643720c41a80fdc8 Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Thu, 29 Nov 2018 19:24:40 -0800 Subject: [range-v3] Update to cf8add9 (#4865) ...which works around LWG 3170. --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index 09afae49c..076c71211 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0-20181122 +Version: 0.4.0-20181129 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index cbdf04227..f7577c9bb 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 00d4676502aa257a3ce934b50555211b4791ae05 - SHA512 a0067e1b0d1d2261c2f868ebc57278b74a081ccc00dcd65648b5c362317c6cd3321fb3b9936733d839cd9d48cf801d1f23710bce9e33edd9dfa8f32556d90526 + REF cf8add9f467aac695b9fa38e168b90df36b1a806 + SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2 HEAD_REF master ) -- cgit v1.2.3 From 724ed8cf4e2f6d6c23bd42e36ef5326b7e829248 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 29 Nov 2018 19:00:40 +0800 Subject: [cpp-taskflow] Add new port --- ports/cpp-taskflow/CONTROL | 3 +++ ports/cpp-taskflow/portfile.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/cpp-taskflow/CONTROL create mode 100644 ports/cpp-taskflow/portfile.cmake diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL new file mode 100644 index 000000000..4abf5457f --- /dev/null +++ b/ports/cpp-taskflow/CONTROL @@ -0,0 +1,3 @@ +Source: cpp-taskflow +Version: 2018-11-30 +Description: Fast Parallel Tasking Programming Library using Modern C++. diff --git a/ports/cpp-taskflow/portfile.cmake b/ports/cpp-taskflow/portfile.cmake new file mode 100644 index 000000000..1f596f0d4 --- /dev/null +++ b/ports/cpp-taskflow/portfile.cmake @@ -0,0 +1,29 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-taskflow/cpp-taskflow + REF 97252f7d782c6e896122645175c08131ce10e649 + SHA512 df8ae9ea449663cb548f3c37346c2e0c785add2d86b9c618aea2741d81fe88c34b0d3d0e610a4b571973f9bc18631becedfe28e029ecf0c0cc87e4c35a280a29 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTF_BUILD_EXAMPLES=OFF + -DTF_BUILD_TESTS=OFF + -DTF_BUILD_BENCHMARKS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-taskflow/copyright COPYONLY) -- cgit v1.2.3 From 0dcfc13003da120b1365fedf0fb9c5e0f137aab0 Mon Sep 17 00:00:00 2001 From: kjpus <35301243+kjpus@users.noreply.github.com> Date: Fri, 30 Nov 2018 13:25:05 -0500 Subject: Update CMakeLists.txt to include hash/* --- ports/abseil/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt index b4b8a646d..d98914e60 100644 --- a/ports/abseil/CMakeLists.txt +++ b/ports/abseil/CMakeLists.txt @@ -62,6 +62,7 @@ add_sublibrary(algorithm) add_sublibrary(base) add_sublibrary(container) add_sublibrary(debugging) +add_sublibrary(hash) add_sublibrary(memory) add_sublibrary(meta) add_sublibrary(numeric) @@ -75,6 +76,7 @@ add_sublibrary(utility) target_link_public_libraries(algorithm base meta) target_link_public_libraries(container algorithm base memory) target_link_public_libraries(debugging base) +target_link_public_libraries(hash base) target_link_public_libraries(memory meta) target_link_public_libraries(meta base) target_link_public_libraries(numeric base) -- cgit v1.2.3 From 8b46548826864d5ab96264a127becc6a01f13cf5 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 30 Nov 2018 16:01:31 -0800 Subject: patch missing @ in cmake config --- ports/gflags/CONTROL | 2 +- ports/gflags/fix_cmake_config.patch | 13 +++++++++++++ ports/gflags/portfile.cmake | 7 ++----- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 ports/gflags/fix_cmake_config.patch diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index bf0800eec..b090f2ba5 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,3 +1,3 @@ Source: gflags -Version: 2.2.2 +Version: 2.2.2-1 Description: A C++ library that implements commandline flags processing diff --git a/ports/gflags/fix_cmake_config.patch b/ports/gflags/fix_cmake_config.patch new file mode 100644 index 000000000..bea561ecb --- /dev/null +++ b/ports/gflags/fix_cmake_config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in +index a512c2a..e7f50d0 100644 +--- a/cmake/config.cmake.in ++++ b/cmake/config.cmake.in +@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS) + else () + set (@PACKAGE_PREFIX@_NOTHREADS FALSE) + endif () +- elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared) ++ elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared) + set (@PACKAGE_PREFIX@_NOTHREADS FALSE) + else () + set (@PACKAGE_PREFIX@_NOTHREADS TRUE) diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 11ef0cd93..87053f849 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -10,12 +10,9 @@ vcpkg_from_github( REF v2.2.2 SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root + 0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root + fix_cmake_config.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 8346836471a672d536d7a41fd8a0814073c9848f Mon Sep 17 00:00:00 2001 From: Raphael Gozzo Date: Fri, 30 Nov 2018 22:37:54 -0200 Subject: [curl] Build openssl and schannel backends by default (#3932) * [curl] Split the OpenSSL and SChannel backends into separate features * [curl] Add mbedTLS backend as a feature * [curl] Make winssl the default for Windows. Remove need for compatibility workaround. * [curl] Continue to use openssl in UWP because PSecurityFunctionTableA is not available. --- ports/curl/CONTROL | 19 +++++++++++++++---- ports/curl/portfile.cmake | 31 ++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 95040eba1..f76c99124 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,9 +1,8 @@ Source: curl -Version: 7.61.1-1 +Version: 7.61.1-2 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl -# For WINSSL add set(CURL_USE_WINSSL ON) to your triplet file Feature: tool Description: Builds curl executable @@ -16,9 +15,21 @@ Build-Depends: nghttp2, curl[ssl] Description: HTTP2 support Feature: ssl -Build-Depends: openssl -Description: SSL support +Build-Depends: curl[openssl] (!windows), curl[winssl] (windows) +Description: Default SSL backend Feature: ssh Build-Depends: libssh2, curl[non-http] Description: SSH support via libssh2 + +# SSL backends +Feature: openssl +Build-Depends: openssl +Description: SSL support (OpenSSL) + +Feature: winssl +Description: SSL support (Secure Channel / "WinSSL") + +Feature: mbedtls +Build-Depends: mbedtls +Description: SSL support (mbedTLS) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 0b156c4d0..534a54aea 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -7,15 +7,15 @@ vcpkg_from_github( SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch - ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch - ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch - ${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch + 0001_cmake.patch + 0002_fix_uwp.patch + 0003_fix_libraries.patch + 0004_nghttp2_staticlib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) -# Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. +# Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. set(HTTP2_OPTIONS) if("http2" IN_LIST FEATURES) set(HTTP2_OPTIONS -DUSE_NGHTTP2=ON) @@ -23,13 +23,21 @@ endif() # SSL set(USE_OPENSSL OFF) +if("openssl" IN_LIST FEATURES) + set(USE_OPENSSL ON) +endif() + set(USE_WINSSL OFF) -if("ssl" IN_LIST FEATURES) - if(CURL_USE_WINSSL) - set(USE_WINSSL ON) - else() - set(USE_OPENSSL ON) +if("winssl" IN_LIST FEATURES) + if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "winssl is not supported on non-Windows platforms") endif() + set(USE_WINSSL ON) +endif() + +set(USE_MBEDTLS OFF) +if("mbedtls" IN_LIST FEATURES) + set(USE_MBEDTLS ON) endif() # SSH @@ -64,7 +72,7 @@ endif() vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PERL_PATH}") +vcpkg_add_to_path(${PERL_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -78,6 +86,7 @@ vcpkg_configure_cmake( -DCURL_STATICLIB=${CURL_STATICLIB} -DCMAKE_USE_OPENSSL=${USE_OPENSSL} -DCMAKE_USE_WINSSL=${USE_WINSSL} + -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS} -DCMAKE_USE_LIBSSH2=${USE_LIBSSH2} -DHTTP_ONLY=${USE_HTTP_ONLY} OPTIONS_RELEASE -- cgit v1.2.3 From 8dd8bc10df85c2f0e72e9bad3a9245cafd0b93fe Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 30 Nov 2018 16:48:21 -0800 Subject: [cpprestsdk] Update to v2.10.8 and add brotli feature. (#4617) The brotli feature is on by default for Windows only. We think it'll probably work on other platforms but haven't tested that extensively. --- ports/cpprestsdk/CONTROL | 12 ++++++++++-- ports/cpprestsdk/portfile.cmake | 20 +++++++++----------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 800d54d42..e5da66ef7 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,10 +1,18 @@ Source: cpprestsdk -Version: 2.10.6-3 +Version: 2.10.7 Build-Depends: zlib, 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) 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: websockets +Default-Features: default-features + +Feature: default-features +Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[websockets] +Description: Features installed by default Feature: websockets Build-Depends: websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp) Description: Websockets support + +Feature: brotli +Build-Depends: brotli +Description: Brotli compression support diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index c94b01b80..d6390836c 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.6 - SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd + REF v2.10.8 + SHA512 d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df HEAD_REF master ) @@ -21,6 +21,11 @@ if("websockets" IN_LIST FEATURES) set(CPPREST_EXCLUDE_WEBSOCKETS OFF) endif() +set(CPPREST_EXCLUDE_BROTLI ON) +if ("brotli" IN_LIST FEATURES) + set(CPPREST_EXCLUDE_BROTLI OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/Release PREFER_NINJA @@ -37,18 +42,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/share") # transition - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) -else() - vcpkg_fixup_cmake_targets() # v2.10.6 and below -endif() - - +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpprestsdk RENAME copyright) vcpkg_copy_pdbs() - -- cgit v1.2.3 From a91d1538592ed7532a39a4532deac867ee13ed26 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Sat, 1 Dec 2018 09:46:45 +0800 Subject: [nghttp2] Update nghttp2 to 1.35.0 --- ports/nghttp2/CONTROL | 2 +- ports/nghttp2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL index eb070c132..d68720137 100644 --- a/ports/nghttp2/CONTROL +++ b/ports/nghttp2/CONTROL @@ -1,3 +1,3 @@ Source: nghttp2 -Version: 1.34.0 +Version: 1.35.0 Description: Implementation of the Hypertext Transfer Protocol version 2 in C diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index cf80ecd66..52f754afb 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) set(LIB_NAME nghttp2) -set(LIB_VERSION 1.34.0) +set(LIB_VERSION 1.35.0) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) @@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 f027f8e043c58710ff34a65c705c0a76d91ffbf20f684606dbbbecc10f0e1fbc98a41047b8df5061af0bda6e8f89a9587e33c6549181f9317c4d3336e4a8b62e + SHA512 65889545684e2c8b4aeeb7084ca36e3f78927fa2b6d1df906af3970d8ce6c7c6093b56a5e0713f7bb54a98f06ad52d6e2b323e760297610702afe526b0fdd577 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From cc0a70e4bbc7b12e6c0df7f9daaa76d1076ee993 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sun, 2 Dec 2018 12:04:15 +0800 Subject: [libui] Add new port (#4810) * [libui] Add new port * [libui] Rename package to be unofficial-libui --- ports/libui/CONTROL | 3 +++ ports/libui/fix-cmake.patch | 46 +++++++++++++++++++++++++++++++++++++++++++++ ports/libui/portfile.cmake | 27 ++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 ports/libui/CONTROL create mode 100644 ports/libui/fix-cmake.patch create mode 100644 ports/libui/portfile.cmake diff --git a/ports/libui/CONTROL b/ports/libui/CONTROL new file mode 100644 index 000000000..d1a70f0d5 --- /dev/null +++ b/ports/libui/CONTROL @@ -0,0 +1,3 @@ +Source: libui +Version: 2018-11-03 +Description: Simple and portable (but not inflexible) native GUI library in C. diff --git a/ports/libui/fix-cmake.patch b/ports/libui/fix-cmake.patch new file mode 100644 index 000000000..3d206584b --- /dev/null +++ b/ports/libui/fix-cmake.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7193fbb..50c997f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,8 +152,7 @@ add_subdirectory("common") + add_subdirectory("${_OSNAME}") + add_library(libui ${_LIBUI_SOURCES}) + target_include_directories(libui +- PUBLIC . +- PRIVATE ${_LIBUI_INCLUEDIRS}) ++ PUBLIC $) + target_compile_definitions(libui + PRIVATE ${_LIBUI_DEFS}) + # cmake produces this for us by default but only for shared libraries +@@ -229,10 +228,30 @@ macro(_add_exec _name) + # TODOfor some reason these don't propagate + if(NOT WIN32) + target_include_directories(${_name} +- PUBLIC .) ++ PUBLIC $) + target_compile_options(${_name} + PUBLIC ${_COMMON_CFLAGS}) + endif() + endmacro() + add_subdirectory("test") + add_subdirectory("examples") ++ ++if(BUILD_SHARED_LIBS) ++ install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++else() ++ install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif() ++ ++install(EXPORT ${PROJECT_NAME}-config ++ FILE unofficial-${PROJECT_NAME}-config.cmake ++ NAMESPACE unofficial::libui:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++) ++ ++install(FILES ui.h DESTINATION include) diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake new file mode 100644 index 000000000..4f543a89b --- /dev/null +++ b/ports/libui/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andlabs/libui + REF 7138276ccfbde94873cb6e2db65642adcbd2ee19 + SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libui/copyright COPYONLY) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 5b5f9044744263e31cf8879ed04fc91731d3e419 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 2 Dec 2018 21:59:20 +0100 Subject: [LLVM] Fix error when using VCPKG_BUILD_TYPE --- ports/llvm/portfile.cmake | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 293751c0d..fd0507080 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -50,12 +50,17 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*) -file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*) -file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm) -file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm) -file(REMOVE ${EXE}) -file(REMOVE ${DEBUG_EXE}) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*) + file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm) + file(REMOVE ${EXE}) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*) + file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm) + file(REMOVE ${DEBUG_EXE}) +endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clang TARGET_PATH share/clang) vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm) -- cgit v1.2.3 From 59431acbc74cbd68f85cf06bc5f1895febd6a54e Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Mon, 3 Dec 2018 08:44:24 +0000 Subject: [CTRE] New port --- ports/ctre/CONTROL | 3 +++ ports/ctre/portfile.cmake | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/ctre/CONTROL create mode 100644 ports/ctre/portfile.cmake diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL new file mode 100644 index 000000000..3351ecf25 --- /dev/null +++ b/ports/ctre/CONTROL @@ -0,0 +1,3 @@ +Source: ctre +Version: 2.2-1 +Description: A Compile time PCRE (almost) compatible regular expression matcher diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake new file mode 100644 index 000000000..76a4a7857 --- /dev/null +++ b/ports/ctre/portfile.cmake @@ -0,0 +1,15 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hanickadot/compile-time-regular-expressions + REF v2.2 + SHA512 f6f18e3e5bc654ff94cd540a3b665615151678541575dfc8d4113c317fba5ea83f57694dc330c174110e6263c9b64a128f2a9234cc626a952e7518c423fda703 + HEAD_REF master +) + +# Install header files +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctre RENAME copyright) -- cgit v1.2.3 From 23384daca676eb97d612b63b2fae2761c74b9466 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 3 Dec 2018 12:24:45 -0500 Subject: Support ECSUtil 1.0.1.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/NoLibSyms.patch | 41 +++++++++++++++++++++++++++++++++++++++++ ports/ecsutil/portfile.cmake | 5 +++-- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 ports/ecsutil/NoLibSyms.patch diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 4bcfb031b..c96e1b0b8 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil -Version: 1.0.1.3 +Version: 1.0.1.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. Build-Depends: atlmfc diff --git a/ports/ecsutil/NoLibSyms.patch b/ports/ecsutil/NoLibSyms.patch new file mode 100644 index 000000000..e4f7e77bd --- /dev/null +++ b/ports/ecsutil/NoLibSyms.patch @@ -0,0 +1,41 @@ + ECSUtil/ECSUtil.vcxproj | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj +index 05c5726..4b5de57 100644 +--- a/ECSUtil/ECSUtil.vcxproj ++++ b/ECSUtil/ECSUtil.vcxproj +@@ -289,7 +289,7 @@ + true + false + false +- ProgramDatabase ++ None + + + Windows +@@ -317,7 +317,7 @@ + true + false + false +- ProgramDatabase ++ None + + + Windows +@@ -462,6 +462,7 @@ + true + false + false ++ None + + + Windows +@@ -493,6 +494,7 @@ + true + false + false ++ None + + + Windows diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index ff8d8a6b1..0dc5fa8fa 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -28,9 +28,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EMCECS/ecs-object-client-windows-cpp - REF v1.0.1.3 - SHA512 0c79e522c687aa942e018f5bab619522523b3efee6e421439bda2a93dfa8e2c2665e136a6aae9cba2f8637c296822b91127cd06053c2a39be4e3324cd1792dda + REF v1.0.1.4 + SHA512 796ed227268cd92fce3eba2a842260d552222900b1df1261200032a7678a48776388dd566f408df2ee4dbc0cee39b70090d524a99e6741e0c8f92594d207761a HEAD_REF master + PATCHES NoLibSyms.patch ) vcpkg_install_msbuild( -- cgit v1.2.3 From 8b9b8fc7ccfc1ea291de3fd1c21f7ff99069ca92 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 11:26:46 -0800 Subject: Add namespace for tinyxml2 in tinyexif port --- ports/tinyexif/CONTROL | 2 +- ports/tinyexif/namespace_tinyxml2.patch | 31 +++++++++++++++++++++++++++++++ ports/tinyexif/portfile.cmake | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/tinyexif/namespace_tinyxml2.patch diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index 9c984a507..ce7162ae9 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.1-1 +Version: 1.0.1-2 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/namespace_tinyxml2.patch b/ports/tinyexif/namespace_tinyxml2.patch new file mode 100644 index 000000000..d27c99c68 --- /dev/null +++ b/ports/tinyexif/namespace_tinyxml2.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f22584b..1ba8329 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,7 +84,7 @@ if(BUILD_SHARED_LIBS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface + endif() + +- target_link_libraries(TinyEXIF tinyxml2) ++ target_link_libraries(TinyEXIF tinyxml2::tinyxml2) + set_target_properties(TinyEXIF PROPERTIES + COMPILE_DEFINITIONS "TINYEXIF_EXPORT" + VERSION "${GENERIC_LIB_VERSION}" +@@ -121,7 +121,7 @@ endif() + if(BUILD_STATIC_LIBS) + add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h) + +- target_link_libraries(TinyEXIFstatic tinyxml2) ++ target_link_libraries(TinyEXIFstatic tinyxml2::tinyxml2) + set_target_properties(TinyEXIFstatic PROPERTIES + OUTPUT_NAME TinyEXIF + VERSION "${GENERIC_LIB_VERSION}" +@@ -162,7 +162,7 @@ if(BUILD_DEMO) + target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT) + else(BUILD_STATIC_LIBS) + add_dependencies(TinyEXIFdemo TinyEXIFstatic) +- target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2) ++ target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2::tinyxml2) + endif() + endif() + diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 4ee127d4a..716415453 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.0.1 SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23 HEAD_REF master + PATCHES + namespace_tinyxml2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -- cgit v1.2.3 From 5edd66af9b4105561816c595616a4445520b7c8f Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 13:33:50 -0800 Subject: Add local FILENAME --- ports/ace/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 4ec2bc48c..e10e82e0e 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -10,6 +10,7 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip" + FILENAME ACE-6.5.3.zip SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 8a71f22e88afe45b0c3efe3c2141a721ecaace6a Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 14:28:14 -0800 Subject: [abseil] bump dash version number in CONTROL Bump dash version number so it will trigger a rebuild for those who already the package installed. --- ports/abseil/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index f616b8608..95191fcf0 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-11-08 +Version: 2018-11-08-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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. -- cgit v1.2.3 From ad29f3823f31464aa3cac70c2d853f6d82ad1bec Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 14:49:47 -0800 Subject: [ogre] bump CONTROL version number --- ports/ogre/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 9930486e4..4ce413bfb 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.11.3-1 +Version: 1.11.3-2 Build-Depends: freeimage, freetype, zlib, zziplib Description: 3D Object-Oriented Graphics Rendering Engine -- cgit v1.2.3 From 89771b0d398e84a392947bc6f856bd0abf711213 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 15:15:56 -0800 Subject: [flatbufers] bump CONTROL version number --- ports/flatbuffers/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 0b90b40c2..9dc3a871f 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,4 +1,4 @@ Source: flatbuffers -Version: 1.9.0-2 +Version: 1.9.0-3 Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/ FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. -- cgit v1.2.3 From d1ea0ce9367e6107631ca2252dc3ed2b1e67e7ee Mon Sep 17 00:00:00 2001 From: Younguk Kim Date: Sat, 1 Dec 2018 00:01:15 +0900 Subject: [openvr] update to 1.1.3b --- ports/openvr/CONTROL | 2 +- ports/openvr/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL index b0f337d0a..dbbe6f4c9 100644 --- a/ports/openvr/CONTROL +++ b/ports/openvr/CONTROL @@ -1,3 +1,3 @@ Source: openvr -Version: 1.0.16 +Version: 1.1.3b Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting. diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 5e4211907..2bc15f368 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/openvr - REF v1.0.16 - SHA512 967356563ba4232da5361510c7519d3058e09eced4571aadc00d8a75ab1f299a0aebda2b0b10b0ffb6c6a443fd718634d0c0103964e289961449c93e8d7b9d02 + REF v1.1.3b + SHA512 03d9f61e8a2fee6bed02e087b20ccdc281a06dcbb151afe07a072b8758d56d7f4bed7a5dd8eccd43166c8fac6536930c0e4e81a8deaa081e635fd99a304fc565 HEAD_REF master ) -- cgit v1.2.3 From 4d1fd42fca46f4c4dfe35011c8c96ff941db3ca6 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 14 Nov 2018 15:11:41 -0800 Subject: [vcpkg-toolchains] Use XYZ_INIT CMake variables for _significantly_ better integration [brynet] Add missing openssl dependency [discord-rpc] Ensure no external downloading [podofo] Improve stability. Modernize. [usrsctp] Disable Werror [vcpkg-toolchains] Add linux changes to android and freebsd. [usrsctp] Remove excess DLLs --- ports/brynet/CONTROL | 3 ++- ports/brynet/portfile.cmake | 5 +---- ports/discord-rpc/CONTROL | 2 +- ports/discord-rpc/disable-downloading.patch | 21 +++++++++++++++++++++ ports/discord-rpc/portfile.cmake | 5 +++++ ports/podofo/CONTROL | 2 +- ports/podofo/portfile.cmake | 18 +++++++++++++----- ports/usrsctp/CONTROL | 2 +- ports/usrsctp/portfile.cmake | 29 +++++++++++------------------ scripts/toolchains/android.cmake | 16 ++++++++++++++++ scripts/toolchains/freebsd.cmake | 20 +++++++++++--------- scripts/toolchains/linux.cmake | 20 +++++++++++--------- scripts/toolchains/osx.cmake | 20 +++++++++++--------- 13 files changed, 105 insertions(+), 58 deletions(-) create mode 100644 ports/discord-rpc/disable-downloading.patch diff --git a/ports/brynet/CONTROL b/ports/brynet/CONTROL index a08457902..3309ab1cf 100644 --- a/ports/brynet/CONTROL +++ b/ports/brynet/CONTROL @@ -1,3 +1,4 @@ Source: brynet -Version: 1.0.0 +Version: 1.0.0-1 Description: A C++ cross platform high performance tcp network library, and support SSL/HTTP/Websocket. +Build-Depends: openssl diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake index 0224eae76..9c9097bfc 100644 --- a/ports/brynet/portfile.cmake +++ b/ports/brynet/portfile.cmake @@ -1,9 +1,6 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "brynet does not support dynamic linkage. Building statically.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index ea7bc5d23..b6af1dc98 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,4 +1,4 @@ Source: discord-rpc -Version: 3.3.0-1 +Version: 3.3.0-2 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. Build-Depends: rapidjson diff --git a/ports/discord-rpc/disable-downloading.patch b/ports/discord-rpc/disable-downloading.patch new file mode 100644 index 000000000..bb8504960 --- /dev/null +++ b/ports/discord-rpc/disable-downloading.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5dad9e9..961f02d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ file(GLOB_RECURSE ALL_SOURCE_FILES + src/*.cpp src/*.h src/*.c + ) + ++if(0) + # Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. clang-format-5.0 + find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX}) + +@@ -43,7 +44,7 @@ if (NOT RAPIDJSONTEST) + ) + file(REMOVE ${RJ_TAR_FILE}) + endif(NOT RAPIDJSONTEST) +- ++endif() + find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH) + + add_library(rapidjson STATIC IMPORTED ${RAPIDJSON}) diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 1fc21e8e6..1dd6d3001 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF v3.3.0 SHA512 8bb2674edefabf75670ceca29364d69e2002152bff9fe55757f4cda03544b4d827ff33595d98e6d8acdc73ca61cef8ab8054ad0a1ffc905cb26496068b15025f HEAD_REF master + PATCHES disable-downloading.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) @@ -21,6 +22,10 @@ vcpkg_configure_cmake( -DRAPIDJSON=${CURRENT_INSTALLED_DIR} ) +if(EXISTS ${SOURCE_PATH}/thirdparty) + message(FATAL_ERROR "The source directory should not be modified during the build.") +endif() + vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL index ba5fa1109..e5485c493 100644 --- a/ports/podofo/CONTROL +++ b/ports/podofo/CONTROL @@ -1,5 +1,5 @@ Source: podofo -Version: 0.9.6 +Version: 0.9.6-1 Description: PoDoFo is a library to work with the PDF file format Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl (!windows&!uwp), freetype diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index e33cda7f4..0897576d0 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -1,11 +1,16 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/podofo-0.9.6) + +set(PODOFO_VERSION 0.9.6) vcpkg_download_distfile(ARCHIVE - URLS "https://sourceforge.net/projects/podofo/files/podofo/0.9.6/podofo-0.9.6.tar.gz/download" - FILENAME "podofo-0.9.6.tar.gz" + URLS "https://sourceforge.net/projects/podofo/files/podofo/${PODOFO_VERSION}/podofo-${PODOFO_VERSION}.tar.gz/download" + FILENAME "podofo-${PODOFO_VERSION}.tar.gz" SHA512 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130 ) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PODOFO_VERSION} +) set(PODOFO_NO_FONTMANAGER ON) if("fontconfig" IN_LIST FEATURES) @@ -22,6 +27,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DPODOFO_BUILD_LIB_ONLY=1 -DPODOFO_BUILD_SHARED=${PODOFO_BUILD_SHARED} @@ -30,11 +36,13 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=${PODOFO_NO_FONTMANAGER} -DCMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO=${IS_WIN32} -DCMAKE_DISABLE_FIND_PACKAGE_LIBIDN=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON ) vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/podofo) file(RENAME ${CURRENT_PACKAGES_DIR}/share/podofo/COPYING ${CURRENT_PACKAGES_DIR}/share/podofo/copyright) diff --git a/ports/usrsctp/CONTROL b/ports/usrsctp/CONTROL index 5e5f172ba..426994732 100644 --- a/ports/usrsctp/CONTROL +++ b/ports/usrsctp/CONTROL @@ -1,3 +1,3 @@ Source: usrsctp -Version: 35c1d97020a +Version: 35c1d97020a-2 Description: This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows. diff --git a/ports/usrsctp/portfile.cmake b/ports/usrsctp/portfile.cmake index 863b3f75c..416cdc6c3 100644 --- a/ports/usrsctp/portfile.cmake +++ b/ports/usrsctp/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) -vcpkg_check_linkage( - ONLY_STATIC_LIBRARY -) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sctplab/usrsctp @@ -10,27 +10,20 @@ vcpkg_from_github( HEAD_REF master ) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -Dsctp_werror=OFF -Dsctp_build_programs=OFF ) - vcpkg_install_cmake() -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(GLOB_RECURSE release_dlls ${CURRENT_PACKAGES_DIR}/lib/*.dll) -file(GLOB_RECURSE debug_dlls ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) -if(release_dlls) - file(REMOVE ${release_dlls}) -endif() -if(debug_dlls) - file(REMOVE ${debug_dlls}) -endif() +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/usrsctp.dll + ${CURRENT_PACKAGES_DIR}/lib/usrsctp.dll +) +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/usrsctp/copyright COPYONLY) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/usrsctp RENAME copyright) +vcpkg_copy_pdbs() diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 355ccc3ac..893463056 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -17,3 +17,19 @@ if(NOT EXISTS "${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") endif() include("${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") + +if(NOT _VCPKG_ANDROID_TOOLCHAIN) +set(_VCPKG_ANDROID_TOOLCHAIN 1) +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} ") +endif() +endif() diff --git a/scripts/toolchains/freebsd.cmake b/scripts/toolchains/freebsd.cmake index ecd4a4478..b6bf5a479 100644 --- a/scripts/toolchains/freebsd.cmake +++ b/scripts/toolchains/freebsd.cmake @@ -1,3 +1,5 @@ +if(NOT _VCPKG_FREEBSD_TOOLCHAIN) +set(_VCPKG_FREEBSD_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") endif() @@ -5,14 +7,14 @@ set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + 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} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") +endif() endif() diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index ade9db90b..6bfb57621 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -1,3 +1,5 @@ +if(NOT _VCPKG_LINUX_TOOLCHAIN) +set(_VCPKG_LINUX_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") endif() @@ -5,14 +7,14 @@ set(CMAKE_SYSTEM_NAME Linux CACHE STRING "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + 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} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") +endif() endif() diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake index 9465ae0de..7f6487c40 100644 --- a/scripts/toolchains/osx.cmake +++ b/scripts/toolchains/osx.cmake @@ -1,3 +1,5 @@ +if(NOT _VCPKG_OSX_TOOLCHAIN) +set(_VCPKG_OSX_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") @@ -13,14 +15,14 @@ set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VCPKG_C_FLAGS} -fPIC" CACHE STRING "") + 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} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") - - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${VCPKG_LINKER_FLAGS}" CACHE STRING "") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") +endif() endif() -- cgit v1.2.3 From e1b5375ea65d14d6f86e8ca1ee722edce9323fef Mon Sep 17 00:00:00 2001 From: Pavel Mach Date: Wed, 5 Dec 2018 03:10:35 +0100 Subject: CppZMQ library version leveraged to 4.3.0. (#4822) * CppZMQ library version leveraged to 4.3.0. * [cppzmq] Disable building tests. Remove vendored FindZeroMQ since our copy already supports the targets. --- ports/cppzmq/CONTROL | 2 +- ports/cppzmq/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL index e970bac53..d54de7494 100644 --- a/ports/cppzmq/CONTROL +++ b/ports/cppzmq/CONTROL @@ -1,4 +1,4 @@ Source: cppzmq -Version: 4.2.2-1 +Version: 4.3.0-1 Build-Depends: zeromq Description: lightweight messaging kernel, C++ bindings diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake index 282a86dfd..cd281513a 100644 --- a/ports/cppzmq/portfile.cmake +++ b/ports/cppzmq/portfile.cmake @@ -1,24 +1,24 @@ -#header-only library include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/cppzmq - REF v4.2.2 - SHA512 5f61ea4a16987c1363c3029cf46b3e83ddd86d65e8d639b0332d691f8fdb5cee121b5d72a9b8c89221daf52ea5892219e0bc4ea4e761bb1e7deb1659011dd3c9 + REF v4.3.0 + SHA512 c9e08e48795b9043c689ffa6953ac59e0fe79d9110d79e06609ab67bf76bea52147b59ecf033f7a06e57d5eb0c3c6bc79634af789966ff22d7d80091d19b135d HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DCPPZMQ_BUILD_TESTS=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cppzmq) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cppzmq/libzmq-pkg-config) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppzmq) -- cgit v1.2.3 From ab924c1b10e61cf91f06e55ddb609040f25e29ad Mon Sep 17 00:00:00 2001 From: rfric <43748255+rfric@users.noreply.github.com> Date: Wed, 5 Dec 2018 04:01:58 +0100 Subject: [mpir] Fix copyright file name on Linux (#4855) --- ports/mpir/CONTROL | 2 +- ports/mpir/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL index 7a8dd7985..59e80a6a8 100644 --- a/ports/mpir/CONTROL +++ b/ports/mpir/CONTROL @@ -1,3 +1,3 @@ Source: mpir -Version: 3.0.0-5 +Version: 3.0.0-6 Description: Multiple Precision Integers and Rationals. diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index 5f54fa08f..42dd34c94 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -71,7 +71,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME) ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info) - configure_file(${SOURCE_PATH}/COPYING.lib ${CURRENT_PACKAGES_DIR}/share/mpir/copyright COPYONLY) + configure_file(${SOURCE_PATH}/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/mpir/copyright COPYONLY) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH -- cgit v1.2.3 From 93f2e956a9096c4d3ca2d98b7b5634ddf2198efb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 4 Dec 2018 19:03:48 -0800 Subject: [devil] Bump control version --- ports/devil/CONTROL | 2 +- ports/devil/portfile.cmake | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL index cddc99222..18d263348 100644 --- a/ports/devil/CONTROL +++ b/ports/devil/CONTROL @@ -1,5 +1,5 @@ Source: devil -Version: 1.8.0-2 +Version: 1.8.0-3 Build-Depends: Description: A full featured cross-platform image library Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index 7fd17630c..ff4e7ee0c 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -1,11 +1,9 @@ include(vcpkg_common_functions) -set(DEVIL_VERSION 1.8.0) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DentonW/DevIL - REF v${DEVIL_VERSION} + REF v1.8.0 SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7 HEAD_REF master PATCHES -- cgit v1.2.3 From 54e497ec6b3b8b86aea5e2850f2a02f8ba1767d8 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 4 Dec 2018 19:17:54 -0800 Subject: [cppgraphqlgen] Add a port for Microsoft/cppgraphqlgen (#4825) * [cppgraphqlgen] Add a port for Microsoft/cppgraphqlgen * Update hash for replacement tag * Change the github ref to a commit ID to invalidate cached downloads * Upgrade to cppgraphqlgen v0.6 --- ports/cppgraphqlgen/CONTROL | 4 ++++ ports/cppgraphqlgen/portfile.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/cppgraphqlgen/CONTROL create mode 100644 ports/cppgraphqlgen/portfile.cmake diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL new file mode 100644 index 000000000..7eaa3d6be --- /dev/null +++ b/ports/cppgraphqlgen/CONTROL @@ -0,0 +1,4 @@ +Source: cppgraphqlgen +Version: 0.6 +Build-Depends: pegtl, rapidjson +Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake new file mode 100644 index 000000000..70ff81070 --- /dev/null +++ b/ports/cppgraphqlgen/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/cppgraphqlgen + REF v0.6 + SHA512 cc2596f5cd975377fcc9432eee11973e2ff044c244c3ac13c3f45549874c2fe0ac5c48bccb96813b48a1b7c940bb54decc194d9eb358c6ae39d1288b9ce58b01 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets() + +vcpkg_copy_pdbs() + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen/copyright COPYONLY) + +vcpkg_test_cmake(PACKAGE_NAME cppgraphqlgen) -- cgit v1.2.3 From 5f63d0a5f77b4179df6dc10110637775a1d0fe69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mendakiewicz?= Date: Tue, 4 Dec 2018 19:18:56 -0800 Subject: [re2] Add vcpkg_copy_pdbs (#4876) * [re2] Add vcpkg_copy_pdbs * [re2] Bump control file version --- ports/re2/CONTROL | 4 ++-- ports/re2/portfile.cmake | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index c2482bcfb..6e82bc86e 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ -Source: re2 -Version: 2018-11-01 +Source: re2 +Version: 2018-11-01-1 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index eb14b12b3..b5689944b 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -15,6 +15,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_copy_pdbs() + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/re2 RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -- cgit v1.2.3 From 642e37b3c9f14d5f822239b630933d8eed7e8b70 Mon Sep 17 00:00:00 2001 From: zhouqi Date: Wed, 5 Dec 2018 16:52:09 +0800 Subject: rxqt port --- ports/rxqt/CONTROL | 4 ++++ ports/rxqt/portfile.cmake | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ports/rxqt/CONTROL create mode 100644 ports/rxqt/portfile.cmake diff --git a/ports/rxqt/CONTROL b/ports/rxqt/CONTROL new file mode 100644 index 000000000..a99d58aa5 --- /dev/null +++ b/ports/rxqt/CONTROL @@ -0,0 +1,4 @@ +Source: rxqt +Version: +Description: The Reactive Extensions for Qt. +Build-Depends: rxcpp \ No newline at end of file diff --git a/ports/rxqt/portfile.cmake b/ports/rxqt/portfile.cmake new file mode 100644 index 000000000..8531af15b --- /dev/null +++ b/ports/rxqt/portfile.cmake @@ -0,0 +1,20 @@ +#header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tetsurom/rxqt + REF master + SHA512 3f25570ab98c8d3959c35b0d99d5c35486339aa8cd752d8140bb064239265ecb8c5002e3a5e2b46324bb79b558cfe0f17e23a59ad51e6d3a0764acdce493b12c + HEAD_REF master +) + +file(INSTALL + ${SOURCE_PATH}/include + DESTINATION ${CURRENT_PACKAGES_DIR} +) + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxqt RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From 197fbf3b8b4bf10a53f44101648b6021d2f3cf14 Mon Sep 17 00:00:00 2001 From: Raynor Vliegendhart Date: Wed, 5 Dec 2018 13:47:04 +0100 Subject: [tesseract] Update to 4.0.0 --- ports/tesseract/CONTROL | 2 +- ports/tesseract/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 1c6121c1a..282282214 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,4 +1,4 @@ Source: tesseract -Version: 3.05.02 +Version: 4.0.0 Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. Build-Depends: leptonica, icu diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 24e27283c..fd66756b1 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract - REF 3.05.02 - SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793 + REF 4.0.0 + SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447 HEAD_REF master ) -- cgit v1.2.3 From 18ba27b4ca568f6296e4e9266635459af1776623 Mon Sep 17 00:00:00 2001 From: inv2004 Date: Wed, 5 Dec 2018 13:16:23 -0500 Subject: mongo and bson 1.9.2 to 1.9.5 (#4722) * mongo and bson 1.9.2 to 1.9.5 * [libbson][mongo-c-driver] Modernize --- ports/libbson/CONTROL | 2 +- ports/libbson/portfile.cmake | 19 ++++++++----------- ports/mongo-c-driver/CONTROL | 2 +- ports/mongo-c-driver/portfile.cmake | 26 +++++++++++--------------- 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL index 8ba25697f..2d64c4c1c 100644 --- a/ports/libbson/CONTROL +++ b/ports/libbson/CONTROL @@ -1,3 +1,3 @@ Source: libbson -Version: 1.9.2 +Version: 1.9.5-1 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents. diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 45bc06170..50b6da175 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,15 +1,11 @@ include(vcpkg_common_functions) -set(LIBBSON_VERSION 1.9.2) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/libbson/archive/${LIBBSON_VERSION}.tar.gz" - FILENAME "libbson-${LIBBSON_VERSION}.tar.gz" - SHA512 a05f1e8fbabb34e847692397e2e41fc5923ddd18dba861e5ab8a31acdf6738e13ab719eae8f9f8563f08fc43aab5c8d1f53cb6a47c38c96e132fa4a62a48d2bf -) -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${LIBBSON_VERSION} + REPO mongodb/libbson + REF 1.9.5 + SHA512 14bc75989baac550f42939ea161fa7872b950e5b669dc8f19e897f0783b04e0212e5e722b3fcdf946308b9a68bc066502ed8238dad92e342e5f49b8b2cc8f484 + HEAD_REF master PATCHES fix-uwp.patch ) @@ -70,7 +66,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson RENAME copyright) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libbson/copyright COPYONLY) file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -79,6 +75,7 @@ else() set(PORT_POSTFIX "1.0") endif() +# Create cmake files for _both_ find_package(libbson) and find_package(libbson-static-1.0)/find_package(libbson-1.0) file(READ ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config.cmake LIBBSON_CONFIG_CMAKE) string(REPLACE "/include/libbson-1.0" "/include" LIBBSON_CONFIG_CMAKE "${LIBBSON_CONFIG_CMAKE}") string(REPLACE "bson-static-1.0" "bson-1.0" LIBBSON_CONFIG_CMAKE "${LIBBSON_CONFIG_CMAKE}") @@ -88,4 +85,4 @@ file(COPY ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config-v file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config.cmake ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-config.cmake) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config-version.cmake ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-config-version.cmake) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 9a367df3a..700f65d1a 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,4 +1,4 @@ Source: mongo-c-driver -Version: 1.9.2 +Version: 1.9.5-1 Build-Depends: libbson, openssl (uwp) Description: Client library written in C for MongoDB. diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 74f4bd66b..54d70aaf8 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,16 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.9.2) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/mongo-c-driver/archive/1.9.2.tar.gz" - FILENAME "mongo-c-driver-1.9.2.tar.gz" - SHA512 a2c819da77aef93ce261093e98e8e8c41c449af56bd03d875e2838a067ae71b5ceb16fed2fb8df9458c84310451b813464377592806fc9ac39d9df2f4ddba83b -) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mongodb/mongo-c-driver + REF 1.9.5 + SHA512 bee584c83bb317802eb855fececc98f2013d7c3134f063c3146521ab535c8a89c2dfe89ccfa6ebbe2d7c64edec0e53105ead361da83b885c7778b40e4801de62 + HEAD_REF master + PATCHES fix-uwp.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -36,7 +31,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-static-1.0") else() vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-1.0") @@ -64,13 +59,13 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_apply_patches( SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include PATCHES - ${CMAKE_CURRENT_LIST_DIR}/static.patch + static.patch ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver RENAME copyright) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/copyright COPYONLY) file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -79,6 +74,7 @@ else() set(PORT_POSTFIX "1.0") endif() +# Create cmake files for _both_ find_package(mongo-c-driver) and find_package(libmongoc-static-1.0)/find_package(libmongoc-1.0) file(READ ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/libmongoc-${PORT_POSTFIX}-config.cmake LIBMONGOC_CONFIG_CMAKE) string(REPLACE "/include/libmongoc-1.0" "/include" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") string(REPLACE "mongoc-static-1.0" "mongoc-1.0" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") -- cgit v1.2.3 From 3b25ec2d5c79b1597e37358ee74cc4f9facd0cb4 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 5 Dec 2018 10:56:25 -0800 Subject: [tinyxml2] patch fastrtps to use tinyxml2 namespace --- ports/fastrtps/CONTROL | 2 +- ports/fastrtps/namespace_tinyxml2.patch | 17 +++++++++++++++++ ports/fastrtps/portfile.cmake | 4 +++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/fastrtps/namespace_tinyxml2.patch diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL index 97748211c..c80f7638c 100644 --- a/ports/fastrtps/CONTROL +++ b/ports/fastrtps/CONTROL @@ -1,4 +1,4 @@ Source: fastrtps -Version: 1.5.0-1 +Version: 1.5.0-2 Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. Build-Depends: openssl, asio, tinyxml2 \ No newline at end of file diff --git a/ports/fastrtps/namespace_tinyxml2.patch b/ports/fastrtps/namespace_tinyxml2.patch new file mode 100644 index 000000000..3df65996f --- /dev/null +++ b/ports/fastrtps/namespace_tinyxml2.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/modules/FindTinyXML2.cmake b/cmake/modules/FindTinyXML2.cmake +index 24aa98a..4e2188e 100644 +--- a/cmake/modules/FindTinyXML2.cmake ++++ b/cmake/modules/FindTinyXML2.cmake +@@ -7,10 +7,10 @@ option(TINYXML2_FROM_SOURCE "Integrate TinyXML2 source code inside Fast RTPS" OF + find_package(TinyXML2 CONFIG QUIET) + if(TinyXML2_FOUND) + message(STATUS "Found TinyXML2: ${TinyXML2_DIR}") +- if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2) ++ if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2::tinyxml2) + # in this case, we're probably using TinyXML2 version 5.0.0 or greater + # in which case tinyxml2 is an exported target and we should use that +- set(TINYXML2_LIBRARY tinyxml2) ++ set(TINYXML2_LIBRARY tinyxml2::tinyxml2) + endif() + else() + if(THIRDPARTY) diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 8111de74d..9aed75f5b 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release SHA512 9ec4a1e41296df1c0bc00926d925e0947602fabb68e9b28311e92739b0e1909a2993b15fc05eb31aeb9842ed50127f8d56571d09e57dd64ac6f37d0fed6cea73 HEAD_REF master - PATCHES fix-install.patch + PATCHES + fix-install.patch + namespace_tinyxml2.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From a9527a8489f2217f7ee01633e4bba7e469a5ba1d Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 5 Dec 2018 11:06:33 -0800 Subject: [ffmpeg] fix aubio break from ffmpeg update --- ports/aubio/CONTROL | 2 +- ports/aubio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index 6f5daa30a..74178f95a 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -1,4 +1,4 @@ Source: aubio -Version: 0.4.6-2 +Version: 0.4.6-967e4041f-2 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 diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 02b898246..d0480dd9b 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -3,8 +3,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd7 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aubio/aubio - REF 0.4.6 - SHA512 9bb787d81f39ab8e3440be9936552a712a24e009884818e13e80dde756ad3874055bcd931ca3af638122f6a0d0bc53e62e1abeedce3fd79af35fe9ddea6bc707 + REF 967e4041f21d7eec9db319db98a37489aa19460c + SHA512 76ab82bc509350fb3fe0cee5806c6f8af72a6ce97b4aba887d8f66f13f924eebea12fbdfeab9c1f201c6141d703336ebbf13813f54c8d0fa20507e048d15b2cd HEAD_REF master ) -- cgit v1.2.3 From 945e0c0f09e1955039e6c85a200daed00cddcd29 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 5 Dec 2018 18:41:01 -0500 Subject: [gettext] macOS fixes (#4849) --- ports/gettext/CMakeLists.txt | 34 +- ports/gettext/CONTROL | 2 +- ports/gettext/config.unix.h.in | 1009 ++++++++++++++++++++++++++++++++++++++++ ports/gettext/portfile.cmake | 1 + 4 files changed, 1042 insertions(+), 4 deletions(-) create mode 100644 ports/gettext/config.unix.h.in diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt index 7df8c33dc..c94ab4c13 100644 --- a/ports/gettext/CMakeLists.txt +++ b/ports/gettext/CMakeLists.txt @@ -23,10 +23,31 @@ else() 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.win32.h config/config.h COPYONLY) + configure_file(config.unix.h.in config/config.h @ONLY) endif() if(NOT DISABLE_INSTALL_HEADERS) @@ -85,7 +106,14 @@ add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIB add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -D_CRT_SECURE_NO_WARNINGS") add_library(libintl ${SOURCES}) -target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) +target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) +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() install(TARGETS libintl RUNTIME DESTINATION bin diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 9044cd724..76e1d22d4 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,4 +1,4 @@ Source: gettext -Version: 0.19-4 +Version: 0.19-5 Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages Build-Depends: libiconv diff --git a/ports/gettext/config.unix.h.in b/ports/gettext/config.unix.h.in new file mode 100644 index 000000000..9f00a6fcd --- /dev/null +++ b/ports/gettext/config.unix.h.in @@ -0,0 +1,1009 @@ +/* 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/portfile.cmake b/ports/gettext/portfile.cmake index cb5ea37c1..7f0b6bc12 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) 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) -- cgit v1.2.3 From 11bee32d76b1bccce894dab443ccb032d2930700 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 6 Dec 2018 01:28:35 +0100 Subject: Upgrade to openssl 1.0.2q (#4844) * Upgrade to openssl 1.0.2q * [qca] Use vcpkg_from_git() --- ports/openssl-windows/CONTROL | 2 +- ports/openssl-windows/portfile.cmake | 4 +-- ports/qca/CONTROL | 2 +- ports/qca/portfile.cmake | 51 +++++++++--------------------------- 4 files changed, 16 insertions(+), 43 deletions(-) diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL index 881c311d0..a62c2fbdc 100644 --- a/ports/openssl-windows/CONTROL +++ b/ports/openssl-windows/CONTROL @@ -1,3 +1,3 @@ Source: openssl-windows -Version: 1.0.2p-1 +Version: 1.0.2q 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-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index f9a8bcbbf..8a95bd6c1 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME) endif() include(vcpkg_common_functions) -set(OPENSSL_VERSION 1.0.2p) +set(OPENSSL_VERSION 1.0.2q) set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) vcpkg_find_acquire_program(PERL) @@ -14,7 +14,7 @@ set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 + SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 ) vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE}) diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL index 4f484666f..72f20869f 100644 --- a/ports/qca/CONTROL +++ b/ports/qca/CONTROL @@ -1,4 +1,4 @@ Source: qca -Version: 2.2.0-2 +Version: 2.2.0-3 Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/ Build-Depends: qt5-base diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 6ad35d1f7..ff667cd6c 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -5,50 +5,24 @@ # Updated certstore. See certstore.pem in the output dirs # -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(STATUS "Warning: Static building not supported yet. Building dynamic.") - set(VCPKG_LIBRARY_LINKAGE dynamic) -endif() - include(vcpkg_common_functions) -find_program(GIT git) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") - -# Set git variables to qca version 2.2.0 commit -set(GIT_URL "git://anongit.kde.org/qca.git") -set(GIT_REF "19ec49f89a0a560590ec733c549b92e199792837") # Commit +vcpkg_add_to_path(${PERL_EXE_PATH}) -# Prepare source dir -if(NOT EXISTS "${DOWNLOADS}/qca.git") - message(STATUS "Cloning") - vcpkg_execute_required_process( - COMMAND ${GIT} clone --bare ${GIT_URL} ${DOWNLOADS}/qca.git - WORKING_DIRECTORY ${DOWNLOADS} - LOGNAME clone - ) +if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) endif() -message(STATUS "Cloning done") -if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") - message(STATUS "Adding worktree") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}) - vcpkg_execute_required_process( - COMMAND ${GIT} worktree add -f --detach ${CURRENT_BUILDTREES_DIR}/src ${GIT_REF} - WORKING_DIRECTORY ${DOWNLOADS}/qca.git - LOGNAME worktree - ) -endif() -message(STATUS "Adding worktree done") - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/) - -# Apply the patch to install to the expected folders -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-fix-path-for-vcpkg.patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/qca + REF 19ec49f89a0a560590ec733c549b92e199792837 + SHA512 6a83ee6715a9a922f4fde5af571e2aad043ac5cbd522f57365038dd31879b44eb57a099ff797793d7ee19e320e0a151e5beacdff3bed525d39ea0b8e46efca9a + PATCHES 0001-fix-path-for-vcpkg.patch ) # According to: @@ -72,9 +46,8 @@ message(STATUS "Importing certstore done") # Configure and build vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - CURRENT_PACKAGES_DIR ${CURRENT_PACKAGES_DIR} + PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=ON -DUSE_RELATIVE_PATHS=ON -DQT4_BUILD=OFF -DBUILD_TESTS=OFF -- cgit v1.2.3 From 4456dcab406eec335e41ed825264345bc74c3e2f Mon Sep 17 00:00:00 2001 From: angelmixu Date: Thu, 6 Dec 2018 01:30:25 +0100 Subject: Fix pango on macOS (#4784) * fix pango for macOS: added an already parsed config.h.unix and moved win32 code conditionally for platform * use a list for better viewing wich source files are added * only define HAVE_CORE_TEXT on macOS * [pango] Modernize. Bump control version. Fix configure into source directory. --- ports/pango/CMakeLists.txt | 26 ++++++-- ports/pango/CONTROL | 2 +- ports/pango/config.h.unix | 153 +++++++++++++++++++++++++++++++++++++++++++++ ports/pango/portfile.cmake | 20 +++--- 4 files changed, 185 insertions(+), 16 deletions(-) create mode 100644 ports/pango/config.h.unix diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index 9c7e7f182..71b5f9fed 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -5,9 +5,14 @@ set(PANGO_LIB_SUFFIX 1.0) set(PANGO_DLL_SUFFIX 1) set(GLIB_LIB_VERSION 2.0) -configure_file(./config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY) +if(WIN32) + configure_file(./config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY) +else() + configure_file(./config.h.unix ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY) +endif() + add_definitions(-DHAVE_CONFIG_H) -include_directories(. ./pango) +include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR}) # find libintl find_path(LIBINTL_INCLUDE_DIR libintl.h) @@ -100,12 +105,14 @@ pango_add_module(pango pango/shape.c pango/pango-enum-types.c) +if(WIN32) pango_add_module(pangowin32 pango/pangowin32.c pango/pangowin32-fontcache.c pango/pangowin32-fontmap.c pango/pangowin32-shape.c) target_link_libraries(pangowin32 usp10 pango) +endif() pango_add_module(pangoft2 pango/pangofc-font.c @@ -122,18 +129,25 @@ pango_add_module(pangoft2 target_link_libraries(pangoft2 pango ${FONT_LIBRARIES}) target_include_directories(pangoft2 PRIVATE ${FONT_INCLUDE_DIRS}) -pango_add_module(pangocairo - pango/pangocairo-fcfont.c +list(APPEND PANGO_CAIRO_SOURCES + pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c - pango/pangocairo-win32font.c - pango/pangocairo-win32fontmap.c pango/pangocairo-context.c pango/pangocairo-font.c pango/pangocairo-fontmap.c pango/pangocairo-render.c) + +if(WIN32) + list(APPEND PANGO_CAIRO_SOURCES + pango/pangocairo-win32font.c + pango/pangocairo-win32fontmap.c) +endif() + +pango_add_module(pangocairo ${PANGO_CAIRO_SOURCES}) target_link_libraries(pangocairo ${CAIRO_LIBRARIES} pango pangowin32 pangoft2 ${FONT_LIBRARIES}) target_include_directories(pangocairo PRIVATE ${CAIRO_INCLUDE_DIR} ${FONT_INCLUDE_DIRS}) + if(NOT PANGO_SKIP_HEADERS) install(FILES pango/pango.h diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index daeeb53db..e7b365e0b 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,4 +1,4 @@ Source: pango -Version: 1.40.11-1 +Version: 1.40.11-2 Description: Text and font handling library. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static) diff --git a/ports/pango/config.h.unix b/ports/pango/config.h.unix new file mode 100644 index 000000000..83b2f52fd --- /dev/null +++ b/ports/pango/config.h.unix @@ -0,0 +1,153 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Have usable Cairo library and font backend */ +#define HAVE_CAIRO 1 + +/* Whether Cairo can use FreeType for fonts */ +#define HAVE_CAIRO_FREETYPE 1 + +/* Whether Cairo has PDF support */ +/* #undef HAVE_CAIRO_PDF */ + +/* Whether Cairo has PNG support */ +/* #undef HAVE_CAIRO_PNG */ + +/* Whether Cairo has PS support */ +/* #undef HAVE_CAIRO_PS */ + +/* Whether Cairo can use Quartz for fonts */ +/* #undef HAVE_CAIRO_QUARTZ */ + +/* Whether Cairo can use the Win32 GDI for fonts */ +/* #undef HAVE_CAIRO_WIN32 */ + +/* Whether Cairo has Xlib support */ +/* #undef HAVE_CAIRO_XLIB */ + +/* Whether CoreText is available on the system */ +#ifdef __APPLE_CC__ + #define HAVE_CORE_TEXT 1 +#else + #undef HAVE_CORE_TEXT +#endif + +/* 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 have the `FcWeightFromOpenType' function. */ +/* #undef HAVE_FCWEIGHTFROMOPENTYPE */ + +/* Define to 1 if you have the `flockfile' function. */ +#define HAVE_FLOCKFILE 1 + +/* Have FreeType 2 library */ +#define HAVE_FREETYPE 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Whether libthai is available */ +/* #undef HAVE_LIBTHAI */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 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 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 you have the `strtok_r' function. */ +#define HAVE_STRTOK_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* 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. */ +#define HAVE_SYS_MMAN_H 1 + +/* 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. */ +#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 + +/* Have Xft library */ +/* #undef HAVE_XFT */ + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "pango" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=pango" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "pango" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "pango 1.40.11" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "pango" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.40.11" + +/* PANGO binary age */ +#define PANGO_BINARY_AGE 4011 + +/* PANGO interface age */ +#define PANGO_INTERFACE_AGE 11 + +/* PANGO major version */ +#define PANGO_VERSION_MAJOR 1 + +/* PANGO micro version */ +#define PANGO_VERSION_MICRO 11 + +/* PANGO minor version */ +#define PANGO_VERSION_MINOR 40 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.40.11" + +/* defines how to decorate public symbols while building */ +#define _PANGO_EXTERN __attribute__((visibility("default"))) extern diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 009953534..926efd98d 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -1,24 +1,26 @@ include(vcpkg_common_functions) + set(PANGO_VERSION 1.40.11) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pango-${PANGO_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-${PANGO_VERSION}.tar.xz" FILENAME "pango-${PANGO_VERSION}.tar.xz" SHA512 e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PANGO_VERSION} + PATCHES 0001-fix-static-symbols-export.diff +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-fix-static-symbols-export.diff) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.unix DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS_DEBUG - -DPANGO_SKIP_HEADERS=ON) + OPTIONS_DEBUG + -DPANGO_SKIP_HEADERS=ON +) vcpkg_install_cmake() vcpkg_copy_pdbs() -- cgit v1.2.3 From 77163c57f0d31e8d5a6afd94c5134349662b86ad Mon Sep 17 00:00:00 2001 From: Richard Fric Date: Sun, 25 Nov 2018 15:34:22 +0100 Subject: [pbc] Initial support for PBC library --- ports/pbc/CONTROL | 4 ++ ports/pbc/linux.patch | 45 ++++++++++++++ ports/pbc/portfile.cmake | 153 +++++++++++++++++++++++++++++++++++++++++++++++ ports/pbc/windows.patch | 108 +++++++++++++++++++++++++++++++++ 4 files changed, 310 insertions(+) create mode 100644 ports/pbc/CONTROL create mode 100644 ports/pbc/linux.patch create mode 100644 ports/pbc/portfile.cmake create mode 100644 ports/pbc/windows.patch diff --git a/ports/pbc/CONTROL b/ports/pbc/CONTROL new file mode 100644 index 000000000..a8ee10486 --- /dev/null +++ b/ports/pbc/CONTROL @@ -0,0 +1,4 @@ +Source: pbc +Version: 0.5.14 +Build-Depends: mpir +Description: Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems. diff --git a/ports/pbc/linux.patch b/ports/pbc/linux.patch new file mode 100644 index 000000000..198277739 --- /dev/null +++ b/ports/pbc/linux.patch @@ -0,0 +1,45 @@ +--- configure.ac 2018-11-29 13:51:14.495012138 +0100 ++++ configure.ac 2018-11-29 13:51:45.308095312 +0100 +@@ -10,7 +10,6 @@ + LT_INIT + #AC_CANONICAL_HOST + +-CFLAGS= + default_fink_path=/sw + case $host_os in + darwin*) +@@ -78,20 +77,7 @@ + AC_PROG_MAKE_SET + + AC_PROG_LEX +-if test "x$LEX" != xflex; then +- echo "************************" +- echo "flex not found" +- echo "************************" +- exit -1 +-fi +- + AC_PROG_YACC +-if test "x$YACC" != "xbison -y"; then +- echo "************************" +- echo "bison not found" +- echo "************************" +- exit -1 +-fi + + # Checks for libraries. + lib_err_msg="add its path to LDFLAGS\nsee ./configure --help" +@@ -121,13 +134,6 @@ + + CFLAGS="$CFLAGS -Wall -W -Wfloat-equal -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wredundant-decls \ + -Wendif-labels -Wshadow -pipe -ffast-math -U__STRICT_ANSI__ -std=gnu99" +-if test "$with_debug" == "y"; then +- CFLAGS="$CFLAGS -g3 -O0" +-elif test "$with_enable_optimized" != "no"; then +- CFLAGS="$CFLAGS -g -O2" +-else +- CFLAGS="$CFLAGS -fomit-frame-pointer -O3" +-fi + + if test "$with_safe_clean" != "n"; then + CFLAGS="$CFLAGS -DSAFE_CLEAN" diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake new file mode 100644 index 000000000..32e233420 --- /dev/null +++ b/ports/pbc/portfile.cmake @@ -0,0 +1,153 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "PBC currently can only be built for desktop") +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message(FATAL_ERROR "PBC currently can only be built using the dynamic CRT when building DLLs") +endif() + +set(PBC_VERSION 0.5.14) + +if(VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_download_distfile( + ARCHIVE + URLS "https://crypto.stanford.edu/pbc/files/pbc-${PBC_VERSION}.tar.gz" + FILENAME pbc-${PBC_VERSION}.tar.gz + SHA512 d75d4ceb3f67ee62c7ca41e2a91ee914fbffaeb70256675aed6734d586950ea8e64e2f16dc069d71481eddb703624df8d46497005fb58e75cf098dd7e7961333 + ) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PBC_VERSION} + PATCHES linux.patch + ) + + vcpkg_find_acquire_program(BISON) + vcpkg_find_acquire_program(FLEX) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SHARED_STATIC --enable-static --disable-shared) + else() + set(SHARED_STATIC --disable-static --enable-shared) + endif() + + set(OPTIONS ${SHARED_STATIC} LEX=${FLEX} YACC=${BISON}\ -y) + vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/setup + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME setup-${TARGET_TRIPLET} + ) + + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -O0 -g -I${SOURCE_PATH}/include") + set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") + vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_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 + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME install-${TARGET_TRIPLET}-dbg + ) + + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -O3 -I${SOURCE_PATH}/include") + set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") + vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_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 + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME install-${TARGET_TRIPLET}-rel + ) + + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info) + configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/pbc/copyright COPYONLY) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO blynn/pbc + REF fbf4589036ce4f662e2d06905862c9e816cf9d08 + SHA512 9348afd3866090b9fca189ae3a6bbb86c842b5f6ee7e1972f1a579993e589952c5926cb0795d4db1e647e3af263827e22c7602314c39bd97e03ffe9ad0fb48ab + HEAD_REF master + PATCHES windows.patch + ) + + set(CMAKE_FIND_LIBRARY_PREFIXES "") + set(CMAKE_FIND_LIBRARY_SUFFIXES "") + + find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES include) + if(NOT MPIR_INCLUDE_DIR) + message(FATAL_ERROR "GMP includes not found") + endif() + + find_library(MPIR_LIBRARIES_REL NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES lib) + if(NOT MPIR_LIBRARIES_REL) + message(FATAL_ERROR "mpir library not found") + endif() + + find_library(MPIR_LIBRARIES_DBG NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES debug/lib) + if(NOT MPIR_LIBRARIES_DBG) + message(FATAL_ERROR "mpir debug library not found") + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LibrarySuffix "lib") + set(ConfigurationSuffix "") + else() + set(LibrarySuffix "dll") + set(ConfigurationSuffix " DLL") + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") + else() + set(RuntimeLibraryExt "DLL") + endif() + + if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") + set(Platform "Win32") + else() + set(Platform ${TRIPLET_SYSTEM_ARCH}) + endif() + + # PBC expects mpir directory in build root + get_filename_component(SOURCE_PATH_PARENT ${SOURCE_PATH} DIRECTORY) + file(REMOVE_RECURSE ${SOURCE_PATH_PARENT}/mpir) + file(MAKE_DIRECTORY ${SOURCE_PATH_PARENT}/mpir) + file(GLOB FILES ${MPIR_INCLUDE_DIR}/gmp*.h) + file(COPY ${FILES} ${MPIR_LIBRARIES_REL} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Release") + file(COPY ${FILES} ${MPIR_LIBRARIES_DBG} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Debug") + + get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) + vcpkg_install_msbuild(SOURCE_PATH ${SOURCE_PATH_PARENT} + PROJECT_SUBPATH ${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj + INCLUDES_SUBPATH ${SOURCE_PATH_SUFFIX}/include + LICENSE_SUBPATH ${SOURCE_PATH_SUFFIX}/COPYING + RELEASE_CONFIGURATION "Release${ConfigurationSuffix}" + DEBUG_CONFIGURATION "Debug${ConfigurationSuffix}" + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + OPTIONS /p:SolutionDir=../ + ALLOW_ROOT_INCLUDES ON + ) + + # clean up mpir stuff + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mpir.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib) +endif() diff --git a/ports/pbc/windows.patch b/ports/pbc/windows.patch new file mode 100644 index 000000000..5b790767a --- /dev/null +++ b/ports/pbc/windows.patch @@ -0,0 +1,108 @@ +diff --git "a/include/pbc_vc_compat.win32.h" "b/include/pbc_vc_compat.win32.h" +index 27d3bba..7f772d4 100644 +--- "a/include/pbc_vc_compat.win32.h" ++++ "b/include/pbc_vc_compat.win32.h" +@@ -3,7 +3,3 @@ + #define __attribute__(X) + #define inline + #define __func__ __FUNCTION__ +- +-#define NULL 0 +- +-#define snprintf _snprintf +\ No newline at end of file +diff --git "a/pbcwin/projects/pbclib.vcxproj" "b/pbcwin/projects/pbclib.vcxproj" +index f0a9b3f..507c24d 100644 +--- "a/pbcwin/projects/pbclib.vcxproj" ++++ "b/pbcwin/projects/pbclib.vcxproj" +@@ -214,13 +214,13 @@  + + + $(SolutionDir)..\include;$(SolutionDir)..;$(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(IncludePath) +- $(SolutionDir)..\..\mpir\lib\x64\Release;$(LibraryPath) ++ $(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(LibraryPath) + $(SolutionDir)lib\$(Platform)\Release\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + +- $(SolutionDir)..\include;$(SolutionDir)..;$(SolutionDir)..\..\mpir\lib\x64\Release;$(IncludePath) +- $(SolutionDir)..\..\mpir\lib\x64\Release;$(LibraryPath) ++ $(SolutionDir)..\include;$(SolutionDir)..;$(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(IncludePath) ++ $(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(LibraryPath) + $(SolutionDir)lib\$(Platform)\Release\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + +@@ -245,7 +245,8 @@  + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebug ++ $(RuntimeLibrary) ++ OldStyle + + + true +@@ -275,7 +276,8 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebug ++ $(RuntimeLibrary) ++ OldStyle + + + true +@@ -305,7 +307,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebugDLL ++ $(RuntimeLibrary) + + + true +@@ -332,7 +334,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebugDLL ++ $(RuntimeLibrary) + + + true +@@ -361,7 +363,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreaded ++ $(RuntimeLibrary) + + + true +@@ -395,7 +397,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreaded ++ $(RuntimeLibrary) + + + true +@@ -429,7 +431,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDLL ++ $(RuntimeLibrary) + + + true +@@ -460,7 +462,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDLL ++ $(RuntimeLibrary) + + + true -- cgit v1.2.3 From 89de5f705e199ad4c5b230902aa0d87dec94206c Mon Sep 17 00:00:00 2001 From: plevy Date: Thu, 6 Dec 2018 11:27:31 -0500 Subject: Update to release version 2.10 Update to release version 2.10 --- ports/osgearth/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 77320a2e1..21243fced 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -26,8 +26,8 @@ vcpkg_download_distfile( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF d1884d819d4a43de32b7ca1ded655c73964bed17 - SHA512 525ad4ce8bcbd7d73a2ed66e7fbcd9d302582276f26dda1ef2baa3828da5c1e302ba81aac95d0a0632c7395cbcd072d2b19d084ba641c1ba92872d42bb6f769c + REF osgearth-2.10 + SHA512 ba742f4fc8dbbdaee65e413d477b713cad8da313a1dc68327997359aca88dadc871b03ad4b09172e3e048164989c2797108db67f14edff8ee5a0c63a8fe1bb0c HEAD_REF master PATCHES ${VS2017PATCH} ) -- cgit v1.2.3 From 457ca501f56b68cdc93273c76d0e8fe6b9805ff1 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 6 Dec 2018 14:13:02 -0800 Subject: [ogre] add missing 'debug' to rename path --- ports/ogre/CONTROL | 2 +- ports/ogre/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 4ce413bfb..288e558e9 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.11.3-2 +Version: 1.11.3-3 Build-Depends: freeimage, freetype, zlib, zziplib Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 8d4e0b490..74cb8a1c0 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -103,7 +103,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic_d.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib) endif() endif() -- cgit v1.2.3 From e76fa8ee7326302512fc68870a211acdfdf75d64 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 6 Dec 2018 16:26:43 -0800 Subject: [osgearth] bump version in control file --- ports/osgearth/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index 5a8255a2a..3b2ba3e4b 100644 --- a/ports/osgearth/CONTROL +++ b/ports/osgearth/CONTROL @@ -1,4 +1,4 @@ Source: osgearth -Version: 2.9-2 +Version: 2.10 Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping. Build-Depends: osg -- cgit v1.2.3 From a1bb1bdebe44e94ebc446f9614ab3f0aebc75d82 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 6 Dec 2018 17:29:29 -0800 Subject: [proj4] undo proj4 portfile changes --- ports/proj4/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 3317172ea..f7532a967 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -40,13 +40,13 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/proj4) # Rename library and adapt cmake configuration -if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(READ ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-release.cmake _contents) string(REPLACE "proj_4_9.lib" "proj.lib" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-release.cmake "${_contents}") endif() -if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(READ ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-debug.cmake _contents) string(REPLACE "proj_4_9_d.lib" "projd.lib" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-debug.cmake "${_contents}") -- cgit v1.2.3 From da53f7c8d614709ee66b9f55fb9ee8aed00416f1 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 6 Dec 2018 17:32:05 -0800 Subject: [vtk] bump version in control file --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index d06f16331..01418b850 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-3 +Version: 8.1.0-5 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora -- cgit v1.2.3 From 8dc28516f6833df07b8498d0a71838a2f8a42bee Mon Sep 17 00:00:00 2001 From: Marco Magdy Date: Thu, 6 Dec 2018 17:47:30 -0800 Subject: [aws-lambda-cpp] add new port --- ports/aws-lambda-cpp/CONTROL | 4 ++++ ports/aws-lambda-cpp/portfile.cmake | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 ports/aws-lambda-cpp/CONTROL create mode 100644 ports/aws-lambda-cpp/portfile.cmake diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL new file mode 100644 index 000000000..6c4ed94e4 --- /dev/null +++ b/ports/aws-lambda-cpp/CONTROL @@ -0,0 +1,4 @@ +Source: aws-lambda-cpp +Version: 2018-12-06 +Build-Depends: curl +Description: C++ Runtime for AWS Lambda. diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake new file mode 100644 index 000000000..37bb2122a --- /dev/null +++ b/ports/aws-lambda-cpp/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-lambda-cpp + REF 9183f81cbb5bfb1fe3eeb4e38d1993a858a58744 + SHA512 6b25223bd07c46ff6f6ee239c794bf4b4a8b97430d85ad434eff80da3bf9692a5f47d428929efcba17f4392eb87c86c27e2fd6bf8d216ecd7c690dcf8cd4fad4 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-lambda-cpp RENAME copyright) + -- cgit v1.2.3 From 5ff5ab7ae29313e95eab07172721800c5fa84c0c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 7 Dec 2018 17:34:13 -0800 Subject: Remove constructor for type that was using aggregate initialization; in C++20 any user declared constructor means a type is no longer an aggregate. (#4906) --- toolsrc/src/vcpkg/postbuildlint.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index 650b6e3c9..a62d4ece5 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -657,8 +657,6 @@ namespace vcpkg::PostBuildLint { fs::path file; OutdatedDynamicCrt outdated_crt; - - OutdatedDynamicCrtAndFile() = delete; }; static LintStatus check_outdated_crt_linkage_of_dlls(const std::vector& dlls, -- cgit v1.2.3 From 221b65afc56fdc97a84d8cffac9636c28f633e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mendakiewicz?= Date: Mon, 10 Dec 2018 20:21:32 -0800 Subject: Replace MinGit with PortableGit MinGit does not provide gzip.exe required by git archive required by vcpkg_from_git --- scripts/vcpkgTools.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 650e46b03..de01a9557 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -24,9 +24,9 @@ 2.19.1 cmd\git.exe - https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/MinGit-2.19.1-32-bit.zip - 8a6d2caae2cbaacee073a641cda21465a749325c0af620dabd0e5521c84c92c8d747caa468b111d2ec52b99aee2ee3e6ec41a0a07a8fff582f4c8da568ea329e - MinGit-2.19.1-32-bit.zip + https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/PortableGit-2.19.1-32-bit.7z.exe + 50e11ba1190bca0210cf1aac4a1a10acddc8cff2f15ac4d036c1fcbab816ee35089b6115554e7d346dfb6f37003dc5da4bea396f3db4dae9b2f2bdd23fd0d876 + PortableGit-2.19.1-32-bit.7z.exe 2.7.4 -- cgit v1.2.3 From 3fb47a376f94094a5b2ffd46bb016a5955eb8530 Mon Sep 17 00:00:00 2001 From: Andrew Sayman Date: Tue, 11 Dec 2018 02:30:37 -0500 Subject: Include instructions for CentOS bootstrapping (#4892) Currently only includes Ubuntu or apt oriented system. CentOS provides similarly working compilers through devtoolsets. --- scripts/bootstrap.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 478183372..cc272da58 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -181,9 +181,14 @@ selectCXX() gccversion="$(extractStringBetweenDelimiters "$gccversion" "gcc version " ".")" if [ "$gccversion" -lt "6" ]; then echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7." + echo "On Ubuntu try the following: echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" echo "sudo apt-get update -y" echo "sudo apt-get install g++-7 -y" + echo "On CentOS try the following:" + echo "sudo yum install centos-release-scl" + echo "sudo yum install devtoolset-7" + echo "scl enable devtoolset-7 bash" return 1 fi -- cgit v1.2.3 From 13d1231ad4d6df3c26c846b542bcc4185615c833 Mon Sep 17 00:00:00 2001 From: Berrysoft <37586447+Berrysoft@users.noreply.github.com> Date: Tue, 11 Dec 2018 16:31:44 +0800 Subject: Adapt bootstrap to VS 2019 Preview (#4922) --- scripts/bootstrap.ps1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index ed82a6ab1..42eabd01b 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -160,6 +160,16 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) } $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", "v141" + } + } + if ($majorVersion -eq "15") { $VCFolder= "$path\VC\Tools\MSVC\" -- cgit v1.2.3 From 42fd0c982a2e201674cea1979457079bb1bce046 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Tue, 11 Dec 2018 11:12:21 +0100 Subject: Fix unterminated quoted string in bootstrapping script. (#4946) --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index cc272da58..a8b3d102b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -181,7 +181,7 @@ selectCXX() gccversion="$(extractStringBetweenDelimiters "$gccversion" "gcc version " ".")" if [ "$gccversion" -lt "6" ]; then echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7." - echo "On Ubuntu try the following: + echo "On Ubuntu try the following:" echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" echo "sudo apt-get update -y" echo "sudo apt-get install g++-7 -y" -- cgit v1.2.3 From 905f04da3d8b5c7275eb2ee60044c2b41ed1d81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mendakiewicz?= Date: Tue, 11 Dec 2018 08:47:16 -0800 Subject: Upgrade to Git 2.20.0 --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index de01a9557..9378c7832 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -22,11 +22,11 @@ cmake-3.12.4-Linux-x86_64.tar.gz - 2.19.1 + 2.20.0 cmd\git.exe - https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/PortableGit-2.19.1-32-bit.7z.exe - 50e11ba1190bca0210cf1aac4a1a10acddc8cff2f15ac4d036c1fcbab816ee35089b6115554e7d346dfb6f37003dc5da4bea396f3db4dae9b2f2bdd23fd0d876 - PortableGit-2.19.1-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe + 81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49 + PortableGit-2.20.0-32-bit.7z.exe 2.7.4 -- cgit v1.2.3 From cd7eb41290874fa61042808d3f03961d479671f9 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 11 Dec 2018 18:34:00 +0100 Subject: [OpenCV3] fix protobuf linking (#4861) --- ports/opencv/0001-winrt-fixes.patch | 4 ---- ports/opencv/0002-install-options.patch | 12 ------------ .../0005-remove-custom-protobuf-find-package.patch | 22 ++++++++++++++++++++++ ports/opencv/0005-remove-protobuf-target.patch | 22 ---------------------- ports/opencv/CONTROL | 2 +- ports/opencv/portfile.cmake | 3 ++- 6 files changed, 25 insertions(+), 40 deletions(-) create mode 100644 ports/opencv/0005-remove-custom-protobuf-find-package.patch delete mode 100644 ports/opencv/0005-remove-protobuf-target.patch diff --git a/ports/opencv/0001-winrt-fixes.patch b/ports/opencv/0001-winrt-fixes.patch index fa8c8cfc9..b2fe1a021 100644 --- a/ports/opencv/0001-winrt-fixes.patch +++ b/ports/opencv/0001-winrt-fixes.patch @@ -19,8 +19,6 @@ using namespace Windows::UI::Xaml::Controls; namespace cv -diff --git a/modules/highgui/src/window_winrt_bridge.hpp b/modules/highgui/src/window_winrt_bridge.hpp -index 25f4aef..5429f0b 100644 --- a/modules/highgui/src/window_winrt_bridge.hpp +++ b/modules/highgui/src/window_winrt_bridge.hpp @@ -28,6 +28,7 @@ @@ -31,8 +29,6 @@ index 25f4aef..5429f0b 100644 using namespace Windows::UI::Xaml::Controls; -diff --git a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp -index 236e227..e2417dc 100644 --- a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp +++ b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp @@ -94,10 +94,10 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber() diff --git a/ports/opencv/0002-install-options.patch b/ports/opencv/0002-install-options.patch index 03e1334f1..0719a7cb9 100644 --- a/ports/opencv/0002-install-options.patch +++ b/ports/opencv/0002-install-options.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7c76ecf3..d1c14bfcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,6 +312,10 @@ OCV_OPTION(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF ) @@ -48,8 +46,6 @@ index c7c76ecf3..d1c14bfcd 100644 install(FILES ${OPENCV_LICENSE_FILE} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ DESTINATION ./ COMPONENT libs) -diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake -index b2ca82bad..c2f6e001d 100644 --- a/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake @@ -105,7 +105,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) @@ -70,8 +66,6 @@ index b2ca82bad..c2f6e001d 100644 if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) if(BUILD_SHARED_LIBS) set(_lib_suffix "lib") -diff --git a/cmake/OpenCVGenHeaders.cmake b/cmake/OpenCVGenHeaders.cmake -index 477b91055..57dc82e13 100644 --- a/cmake/OpenCVGenHeaders.cmake +++ b/cmake/OpenCVGenHeaders.cmake @@ -1,7 +1,9 @@ @@ -94,8 +88,6 @@ index 477b91055..57dc82e13 100644 + install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev) +endif() \ No newline at end of file -diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 54f100d3c..eae83b074 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -1000,7 +1000,9 @@ macro(_ocv_create_module) @@ -109,8 +101,6 @@ index 54f100d3c..eae83b074 100644 endif() endforeach() endif() -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1f0d72008..86b9d8929 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,8 +1,10 @@ @@ -126,8 +116,6 @@ index 1f0d72008..86b9d8929 100644 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/include/CMakeLists.txt b/include/CMakeLists.txt -index b4e48e6fa..5ac6f1603 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,7 +1,9 @@ diff --git a/ports/opencv/0005-remove-custom-protobuf-find-package.patch b/ports/opencv/0005-remove-custom-protobuf-find-package.patch new file mode 100644 index 000000000..2944810e5 --- /dev/null +++ b/ports/opencv/0005-remove-custom-protobuf-find-package.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -633,7 +633,7 @@ include(cmake/OpenCVFindLibsGUI.cmake) + include(cmake/OpenCVFindLibsVideo.cmake) + include(cmake/OpenCVFindLibsPerf.cmake) + include(cmake/OpenCVFindLAPACK.cmake) +-include(cmake/OpenCVFindProtobuf.cmake) ++find_package(protobuf) + + # ---------------------------------------------------------------------------- + # Detect other 3rd-party libraries/tools +--- a/modules/dnn/CMakeLists.txt ++++ b/modules/dnn/CMakeLists.txt +@@ -78,7 +78,7 @@ endif() + + set(include_dirs ${fw_inc}) + set(sources_options "") +-set(libs libprotobuf ${LAPACK_LIBRARIES}) ++set(libs protobuf ${LAPACK_LIBRARIES}) + if(OPENCV_DNN_OPENCL AND HAVE_OPENCL) + list(APPEND include_dirs ${OPENCL_INCLUDE_DIRS}) + else() diff --git a/ports/opencv/0005-remove-protobuf-target.patch b/ports/opencv/0005-remove-protobuf-target.patch deleted file mode 100644 index a31e6d168..000000000 --- a/ports/opencv/0005-remove-protobuf-target.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index b9171f14f..6e06310b1 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -43,17 +43,6 @@ else() - # end of compatibility block - - if(Protobuf_FOUND) -- if(TARGET protobuf::libprotobuf) -- add_library(libprotobuf INTERFACE) -- target_link_libraries(libprotobuf INTERFACE protobuf::libprotobuf) -- else() -- add_library(libprotobuf UNKNOWN IMPORTED) -- set_target_properties(libprotobuf PROPERTIES -- IMPORTED_LOCATION "${Protobuf_LIBRARY}" -- INTERFACE_INCLUDE_SYSTEM_DIRECTORIES "${Protobuf_INCLUDE_DIR}" -- ) -- get_protobuf_version(Protobuf_VERSION "${Protobuf_INCLUDE_DIR}") -- endif() - set(HAVE_PROTOBUF TRUE) - endif() - endif() diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index e1d1248b0..5f012d80e 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-3 +Version: 3.4.3-4 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 966c914b0..6fbb535cf 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( "${CMAKE_CURRENT_LIST_DIR}/0002-install-options.patch" "${CMAKE_CURRENT_LIST_DIR}/0003-disable-downloading.patch" "${CMAKE_CURRENT_LIST_DIR}/0004-use-find-package-required.patch" - "${CMAKE_CURRENT_LIST_DIR}/0005-remove-protobuf-target.patch" + "${CMAKE_CURRENT_LIST_DIR}/0005-remove-custom-protobuf-find-package.patch" ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) @@ -291,6 +291,7 @@ vcpkg_configure_cmake( -DWITH_JASPER=${WITH_JASPER} -DWITH_JPEG=${WITH_JPEG} -DWITH_LAPACK=OFF + -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENEXR=${WITH_OPENEXR} -- cgit v1.2.3 From 5295c8fdeb8fd2332bfce7a897465fdf9391d99a Mon Sep 17 00:00:00 2001 From: rfric <43748255+rfric@users.noreply.github.com> Date: Tue, 11 Dec 2018 18:38:44 +0100 Subject: [mpir] Embed debug info into static lib (#4905) --- ports/mpir/CONTROL | 2 +- ports/mpir/enable-runtimelibrary-toggle.patch | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL index 59e80a6a8..5a944e6bd 100644 --- a/ports/mpir/CONTROL +++ b/ports/mpir/CONTROL @@ -1,3 +1,3 @@ Source: mpir -Version: 3.0.0-6 +Version: 3.0.0-7 Description: Multiple Precision Integers and Rationals. diff --git a/ports/mpir/enable-runtimelibrary-toggle.patch b/ports/mpir/enable-runtimelibrary-toggle.patch index d0260e869..391d4e103 100644 --- a/ports/mpir/enable-runtimelibrary-toggle.patch +++ b/ports/mpir/enable-runtimelibrary-toggle.patch @@ -2,12 +2,13 @@ diff --git a/build.vc/mpir_debug_lib.props b/build.vc/mpir_debug_lib.props index b2fd57b..3937570 100644 --- a/build.vc/mpir_debug_lib.props +++ b/build.vc/mpir_debug_lib.props -@@ -9,7 +9,7 @@ +@@ -9,7 +9,8 @@ $(IntDir)dum\my\%(RelativeDir) - MultiThreadedDebug + $(RuntimeLibrary) ++ OldStyle $(TargetDir)$(TargetName).pdb -- cgit v1.2.3 From 9b8cc8095323a550ecd7a184881bd5802b5a313f Mon Sep 17 00:00:00 2001 From: James Chang Date: Wed, 12 Dec 2018 02:01:05 +0800 Subject: [gdcm2] fix improper cmake file setup (#4880) * move cmake files to proper location, and modify path in contents accordingly * workaround cmake script to find openjpeg package, and include openjpeg in Build-Depends list * [gdcm2] Use vcpkg_fixup_cmake_targets() --- ports/gdcm2/CONTROL | 4 ++-- ports/gdcm2/find-openjpeg.patch | 48 +++++++++++++++++++++++++++++++++++++++++ ports/gdcm2/portfile.cmake | 10 ++++++--- ports/gdcm2/socketxx.patch | 11 ---------- 4 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 ports/gdcm2/find-openjpeg.patch delete mode 100644 ports/gdcm2/socketxx.patch diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL index d3ff62aa7..a3a083ed8 100644 --- a/ports/gdcm2/CONTROL +++ b/ports/gdcm2/CONTROL @@ -1,4 +1,4 @@ Source: gdcm2 -Version: 2.8.8 +Version: 2.8.8-2 Description: Grassroots DICOM library -Build-Depends: zlib, expat +Build-Depends: zlib, expat, openjpeg diff --git a/ports/gdcm2/find-openjpeg.patch b/ports/gdcm2/find-openjpeg.patch new file mode 100644 index 000000000..c3fff18f5 --- /dev/null +++ b/ports/gdcm2/find-openjpeg.patch @@ -0,0 +1,48 @@ +--- a/CMake/FindOpenJPEG.cmake ++++ b/CMake/FindOpenJPEG.cmake +@@ -20,14 +20,38 @@ + + # Try with pkg-config first + find_package(PkgConfig) +-pkg_check_modules(OPENJPEG libopenjp2) ++if (PKG_CONFIG_FOUND) ++ pkg_check_modules(OPENJPEG libopenjp2) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(OpenJPEG REQUIRED_VARS ++ OPENJPEG_LIBRARIES ++ OPENJPEG_INCLUDE_DIRS ++ VERSION_VAR OPENJPEG_VERSION ++ ) ++endif() + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(OpenJPEG REQUIRED_VARS +- OPENJPEG_LIBRARIES +- OPENJPEG_INCLUDE_DIRS +- VERSION_VAR OPENJPEG_VERSION +-) ++find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h) ++find_library(OPENJPEG_LIBRARY NAMES openjp2) ++if (OPENJPEG_LIBRARY) ++ string(FIND ${OPENJPEG_LIBRARY} debug _debug_substrpos) ++ if (_debug_substrpos EQUAL -1) ++ set(OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY}) ++ string(REPLACE "/lib" "/debug/lib" OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY_RELEASE}) ++ else() ++ set(OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY}) ++ string(REPLACE "/debug/lib" "/lib" OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY_DEBUG}) ++ endif() ++ set(OPENJPEG_LIBRARY optimized ${OPENJPEG_LIBRARY_RELEASE} debug ${OPENJPEG_LIBRARY_DEBUG}) ++ set(OPENJPEG_FOUND TRUE) ++endif() ++ ++if (OPENJPEG_FOUND) ++ set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) ++ set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) ++ message(STATUS "Found OPENJPEG library ${OPENJPEG_LIBRARIES}") ++else() ++ message(FATAL_ERROR "NOT found OPENJPEG") ++endif() + + mark_as_advanced( + OPENJPEG_LIBRARIES diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake index 3bddfeff6..a6aad4e11 100644 --- a/ports/gdcm2/portfile.cmake +++ b/ports/gdcm2/portfile.cmake @@ -4,7 +4,8 @@ vcpkg_from_github( REPO malaterre/GDCM REF v2.8.8 SHA512 92efa1b85e38a5e463933c36a275e1392608c9da4d7c3ab17acfa70bfa112bc03e8705086eaac4a3ad5153fde5116ccc038093adaa8598b18000f403f39db738 - PATCHES socketxx.patch + HEAD_REF master + PATCHES find-openjpeg.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -22,17 +23,20 @@ vcpkg_configure_cmake( -DGDCM_INSTALL_INCLUDE_DIR=include -DGDCM_USE_SYSTEM_EXPAT=ON -DGDCM_USE_SYSTEM_ZLIB=ON - ${ADDITIONAL_OPTIONS} + -DGDCM_USE_SYSTEM_OPENJPEG=ON + -DGDCM_BUILD_TESTING=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm-2.8 TARGET_PATH share/gdcm) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() diff --git a/ports/gdcm2/socketxx.patch b/ports/gdcm2/socketxx.patch deleted file mode 100644 index 0142910b1..000000000 --- a/ports/gdcm2/socketxx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Utilities/socketxx/socket++/CMakeLists.txt -+++ b/Utilities/socketxx/socket++/CMakeLists.txt -@@ -76,7 +76,7 @@ - endif() - set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES ${SOCKETXX_LIBRARY_PROPERTIES}) - if(BUILD_SHARED_LIBS) -- set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "" LINK_INTERFACE_LIBRARIES "") -+ set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "") - endif() - - # Install library -- cgit v1.2.3 From 9e773bd912e42a413f87e9fb1a6712461e10c4bf Mon Sep 17 00:00:00 2001 From: Marco Magdy Date: Tue, 11 Dec 2018 10:07:26 -0800 Subject: Target the v0.1.0 release --- ports/aws-lambda-cpp/CONTROL | 2 +- ports/aws-lambda-cpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL index 6c4ed94e4..fb45cc22d 100644 --- a/ports/aws-lambda-cpp/CONTROL +++ b/ports/aws-lambda-cpp/CONTROL @@ -1,4 +1,4 @@ Source: aws-lambda-cpp -Version: 2018-12-06 +Version: 0.1.0 Build-Depends: curl Description: C++ Runtime for AWS Lambda. diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake index 37bb2122a..977c9bd40 100644 --- a/ports/aws-lambda-cpp/portfile.cmake +++ b/ports/aws-lambda-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-lambda-cpp - REF 9183f81cbb5bfb1fe3eeb4e38d1993a858a58744 - SHA512 6b25223bd07c46ff6f6ee239c794bf4b4a8b97430d85ad434eff80da3bf9692a5f47d428929efcba17f4392eb87c86c27e2fd6bf8d216ecd7c690dcf8cd4fad4 + REF v0.1.0 + SHA512 78b1ad1dcd88176a954c03b38cbb962c77488da6c75acb37a8b64cde147c030b02c6e51f0a974edb042e59c3c969d110d181ad097ef76f43255500b272a94454 HEAD_REF master ) -- cgit v1.2.3 From cf7e2f3906f78dcb89f320a642428b54c00e4e0b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 11 Dec 2018 11:48:41 -0800 Subject: Allow redirection of the downloads folder with an environment variable. (#4883) * Add detection for VCPKG_DOWNLOADS environment variable in vcpkgpaths.cpp. * Pass the downloads directory from VcpkgPaths to cmake. * Also fixup bootstrap on *nix. * Make error message a little prettier. * Make that bash script actually work :) * [vcpkg] Alter Optional<> usage style * [vcpkg-docs] Add section on Environment Variables to the docs --- docs/index.md | 4 ++-- docs/users/triplets.md | 41 +++++++++++++++++++++------------------- scripts/bootstrap.sh | 11 ++++++++++- toolsrc/src/vcpkg/build.cpp | 3 ++- toolsrc/src/vcpkg/vcpkgpaths.cpp | 27 +++++++++++++++++++++++++- 5 files changed, 62 insertions(+), 24 deletions(-) diff --git a/docs/index.md b/docs/index.md index 69dbdcd1e..cde241e92 100644 --- a/docs/index.md +++ b/docs/index.md @@ -2,8 +2,6 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are constantly evolving; your involvement are vital to its success! -- [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md) - ### Examples - [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md) @@ -15,6 +13,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Integration with build systems](users/integration.md) - [Triplet files](users/triplets.md) +- [Configuration and Environment](users/config-environment.md) ### Maintainer help @@ -24,6 +23,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too ### Specifications - [Export](specifications/export-command.md) +- [Feature Packages](specifications/feature-packages.md) ### Blog posts - [Announcing a single C++ library manager for Linux, macOS and Windows: Vcpkg](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 9ff372aed..4f23c8e27 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -33,24 +33,6 @@ Valid options include any CMake system name, such as: - `Darwin` (Mac OSX) - `Linux` (Linux) -### VCPKG_PLATFORM_TOOLSET -Specifies the VS-based C/C++ compiler toolchain to use. - -This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine. - -Visual Studio 2015 platform toolset is `v140` -Visual Studio 2017 platform toolset is `v141` - -### VCPKG_VISUAL_STUDIO_PATH -Specifies the Visual Studio installation to use. - -When unspecified, a Visual Studio instance is selected automatically, preferring Stable 2017, then Preview 2017, then 2015. - -The path should be absolute, formatted with backslashes, and have no trailing slash: -```cmake -set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community") -``` - ### VCPKG_CHAINLOAD_TOOLCHAIN_FILE Specifies an alternate CMake Toolchain file to use. @@ -69,7 +51,28 @@ This option also has forms for configuration-specific and C flags: - `VCPKG_C_FLAGS_DEBUG` - `VCPKG_C_FLAGS_RELEASE` -## macOS Variables +## Windows Variables + +### VCPKG_PLATFORM_TOOLSET +Specifies the VS-based C/C++ compiler toolchain to use. + +This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine. + +Visual Studio 2015 platform toolset is `v140` +Visual Studio 2017 platform toolset is `v141` + + +### VCPKG_VISUAL_STUDIO_PATH +Specifies the Visual Studio installation to use. + +When unspecified, a Visual Studio instance is selected automatically, preferring Stable 2017, then Preview 2017, then 2015. + +The path should be absolute, formatted with backslashes, and have no trailing slash: +```cmake +set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community") +``` + +## MacOS Variables ### VCPKG_INSTALL_NAME_DIR Sets the install name used when building macOS dynamic libraries. Default value is `@rpath`. See the CMake documentation for [CMAKE_INSTALL_NAME_DIR](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_NAME_DIR.html) for more information. diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a8b3d102b..5de0998c1 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -17,7 +17,16 @@ while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do vcpkgRootDir="$(dirname "$vcpkgRootDir")" done -downloadsDir="$vcpkgRootDir/downloads" +if [ -z ${VCPKG_DOWNLOADS+x} ]; then + downloadsDir="$vcpkgRootDir/downloads" +else + downloadsDir="$VCPKG_DOWNLOADS" + if [ ! -d "$VCPKG_DOWNLOADS" ]; then + echo "VCPKG_DOWNLOADS was set to '$VCPKG_DOWNLOADS', but that was not a directory." + exit 1 + fi + +fi extractStringBetweenDelimiters() { diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 0e60fd50e..67d9b63ed 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -372,7 +372,8 @@ namespace vcpkg::Build {"TARGET_TRIPLET", spec.triplet().canonical_name()}, {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, {"VCPKG_USE_HEAD_VERSION", - Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"}, + Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"}, + {"DOWNLOADS", paths.downloads}, {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"}, {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)}, {"GIT", git_exe_path}, diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 9a51818e8..a92a5673e 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -34,7 +34,32 @@ namespace vcpkg paths.packages = paths.root / "packages"; paths.buildtrees = paths.root / "buildtrees"; - paths.downloads = paths.root / "downloads"; + + const auto overriddenDownloadsPath = System::get_environment_variable("VCPKG_DOWNLOADS"); + if (auto odp = overriddenDownloadsPath.get()) + { + auto asPath = fs::u8path(*odp); + if (!fs::stdfs::is_directory(asPath)) + { + Metrics::g_metrics.lock()->track_property("error", "Invalid VCPKG_DOWNLOADS override directory."); + Checks::exit_with_message( + VCPKG_LINE_INFO, + "Invalid downloads override directory: %s; " + "create that directory or unset VCPKG_DOWNLOADS to use the default downloads location.", + asPath.u8string()); + } + + paths.downloads = fs::stdfs::canonical(std::move(asPath), ec); + if (ec) + { + return ec; + } + } + else + { + paths.downloads = paths.root / "downloads"; + } + paths.ports = paths.root / "ports"; paths.installed = paths.root / "installed"; paths.triplets = paths.root / "triplets"; -- cgit v1.2.3 From aace39dc14a1d6dd4cac74b2c4c991241fcc35c8 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 11 Dec 2018 22:22:53 -0500 Subject: Upgrade google-cloud-cpp to v0.4.0 Just a periodic release. --- 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 7a64d2e14..5689f78bb 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.3.0-1 +Version: 0.4.0 Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 2081b20f7..54fa6d483 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -8,8 +8,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.3.0 - SHA512 90f876ebf4bea40c5bc12d2bd20d27b48202f951d57a68b657c07b7d468b2ac5a00e39a3a6fca48f92030d89ba7d9706eb52b3c8e734b392aee63632af042b5d + REF v0.4.0 + SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a HEAD_REF master PATCHES include-protobuf.patch ) -- cgit v1.2.3 From f8ce85feefa307304642ba6e217aafe947beb9bc Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 11 Dec 2018 22:28:05 -0500 Subject: Upgrade crc32c to 1.0.6. This version supports both static and shared libraries, yay! --- ports/crc32c/CONTROL | 2 +- ports/crc32c/portfile.cmake | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/crc32c/CONTROL b/ports/crc32c/CONTROL index 20786bad2..71fb14bb9 100644 --- a/ports/crc32c/CONTROL +++ b/ports/crc32c/CONTROL @@ -1,3 +1,3 @@ Source: crc32c -Version: 1.0.5-1 +Version: 1.0.6 Description: CRC32C implementation with support for CPU-specific acceleration instructions. diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake index a60f37671..b8695a3c6 100644 --- a/ports/crc32c/portfile.cmake +++ b/ports/crc32c/portfile.cmake @@ -1,12 +1,10 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/crc32c - REF 12a65bfb328fefae5c05879132676f702a3f68e8 - SHA512 610b7c54b0247edd2d37ec18db68c1f8a55b60b2fd3ddcede41e6321eb45d040f513cece493cbdc67e881065a643c4972126864811ff08b24aa7e82642e54f56 + REF 1.0.6 + SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b HEAD_REF master ) -- cgit v1.2.3 From 2455140d99b4f215f24b7b600417f8c5834ded07 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 11 Dec 2018 22:34:47 -0500 Subject: Upgrade gRPC to 1.16.1. --- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 7045bd444..d2b0f44e8 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.14.1 +Version: 1.16.1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 537fa32ae..b0dca5a93 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.14.1 - SHA512 f0e4fe9777ebc3316a85cb581edad19fef785cdcd2859b1dc54bf7407aa2ba804718973661595e318ea62463620f30ca828e5d7638798cca154af5e1d456ed1e + REF v1.16.1 + SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d HEAD_REF master PATCHES fix-uwp.patch ) -- cgit v1.2.3 From 666cc9cee23c11ade0471a59a52afc3f7f8754c0 Mon Sep 17 00:00:00 2001 From: Albert Fong Date: Wed, 12 Dec 2018 02:59:01 -0800 Subject: [antlr4] Upgrade to antlr 4.7.1 --- ports/antlr4/CONTROL | 2 +- .../Fix-building-in-Visual-Studio-2017.patch | 52 ---------------------- ports/antlr4/portfile.cmake | 9 ++-- 3 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 ports/antlr4/Fix-building-in-Visual-Studio-2017.patch diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index bf4df8d1c..af881f1c3 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7 +Version: 4.7.1 Description: ANother Tool for Language Recognition \ No newline at end of file diff --git a/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch b/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch deleted file mode 100644 index 64e483599..000000000 --- a/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/runtime/src/ANTLRInputStream.h b/runtime/src/ANTLRInputStream.h -index 3d85bed..813451c 100644 ---- a/runtime/src/ANTLRInputStream.h -+++ b/runtime/src/ANTLRInputStream.h -@@ -16,7 +16,7 @@ namespace antlr4 { - protected: - /// The data being scanned. - // UTF-32 --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - i32string _data; // Custom type for VS 2015. - #else - std::u32string _data; -diff --git a/runtime/src/UnbufferedCharStream.h b/runtime/src/UnbufferedCharStream.h -index b489f18..295804c 100644 ---- a/runtime/src/UnbufferedCharStream.h -+++ b/runtime/src/UnbufferedCharStream.h -@@ -52,7 +52,7 @@ namespace antlr4 { - /// we keep adding to buffer. Otherwise, resets so - /// we start filling at index 0 again. - // UTF-32 encoded. --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - i32string _data; // Custom type for VS 2015. - #else - std::u32string _data; -diff --git a/runtime/src/antlr4-common.h b/runtime/src/antlr4-common.h -index 197fd6d..8357b3e 100644 ---- a/runtime/src/antlr4-common.h -+++ b/runtime/src/antlr4-common.h -@@ -52,7 +52,7 @@ - typedef __int32 ssize_t; - #endif - -- #if _MSC_VER == 1900 -+ #if _MSC_VER >= 1900 - // VS 2015 has a known bug when using std::codecvt_utf8 - // so we have to temporarily use __int32 instead. - // https://connect.microsoft.com/VisualStudio/feedback/details/1403302/unresolved-external-when-using-codecvt-utf8 -diff --git a/runtime/src/support/StringUtils.h b/runtime/src/support/StringUtils.h -index cb751a7..be14bbb 100644 ---- a/runtime/src/support/StringUtils.h -+++ b/runtime/src/support/StringUtils.h -@@ -10,7 +10,7 @@ - namespace antlrcpp { - // For all conversions utf8 <-> utf32. - // VS 2015 has a bug in std::codecvt_utf8 (VS 2013 works fine). --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - static std::wstring_convert, __int32> utfConverter; - #else - static std::wstring_convert, char32_t> utfConverter; diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 0d77208e0..886a1ab64 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -4,20 +4,20 @@ endif() include(vcpkg_common_functions) -set(VERSION 4.7) +set(VERSION 4.7.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime) vcpkg_download_distfile(ARCHIVE - URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7-source.zip" + URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip" FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip" - SHA512 a14fd3320537075a8d4c1cfa81d416bad6257d238608e2428f4930495072cce984c707126e3777ffd3849dd6b6cdf1bf43624bd6d318b1fa5dd6749a7304f808 + SHA512 24d53278db56b199e6787242f22339f74e07d2cd3ed56f851ad905b110c2ba3cb001e1e2fcbc8624f0e93e00ba1fe1b23630dd1a736558c694655aeb1c3129da ) # license not exist in antlr folder. vcpkg_download_distfile(LICENSE URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt FILENAME "antlr4-copyright" - SHA512 c72ae3d5c9f3f07160405b5ca44f01116a9602d82291d6cd218fcc5ec6e8baf985e4baa2acf3d621079585385708bd171c96ef44dd808e60c40a48bc1f56c9ae + SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -25,7 +25,6 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch - ${CMAKE_CURRENT_LIST_DIR}/Fix-building-in-Visual-Studio-2017.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") -- cgit v1.2.3 From 828cedb755d1ef1616e4e134bf1c6ef1ee2ae389 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 11 Dec 2018 10:15:44 -0800 Subject: [vcpkg] Add support for muslc, static crt linkage, and forcing the system binaries for cmake and ninja --- scripts/bootstrap.sh | 37 +++++++++++++++++++++++++++---------- scripts/toolchains/linux.cmake | 4 ++++ toolsrc/src/vcpkg.cpp | 4 +++- toolsrc/src/vcpkg/tools.cpp | 10 ++++++++++ 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 5de0998c1..4bb428668 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,12 +1,23 @@ #!/bin/sh vcpkgDisableMetrics="OFF" +vcpkgUseSystem=false for var in "$@" do - if [ "$var" = "-disableMetrics" ]; then + if [ "$var" = "-disableMetrics" -o "$var" = "--disableMetrics" ]; then vcpkgDisableMetrics="ON" + elif [ "$var" = "-useSystemBinaries" -o "$var" = "--useSystemBinaries" ]; then + vcpkgUseSystem=true + elif [ "$var" = "-help" -o "$var" = "--help" ]; then + echo "Usage: ./bootstrap-vcpkg.sh [options]" + echo + echo "Options:" + echo " -help Display usage help" + echo " -disableMetrics Do not build metrics reporting into the executable" + echo " -useSystemBinaries Force use of the system utilities for building vcpkg" + exit 1 else - echo "Unknown argument $var" + echo "Unknown argument $var. Use '-help' for help." exit 1 fi done @@ -191,13 +202,13 @@ selectCXX() if [ "$gccversion" -lt "6" ]; then echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7." echo "On Ubuntu try the following:" - echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" - echo "sudo apt-get update -y" - echo "sudo apt-get install g++-7 -y" + echo " sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y" + echo " sudo apt-get update -y" + echo " sudo apt-get install g++-7 -y" echo "On CentOS try the following:" - echo "sudo yum install centos-release-scl" - echo "sudo yum install devtoolset-7" - echo "scl enable devtoolset-7 bash" + echo " sudo yum install centos-release-scl" + echo " sudo yum install devtoolset-7" + echo " scl enable devtoolset-7 bash" return 1 fi @@ -206,8 +217,14 @@ selectCXX() # Preparation UNAME="$(uname)" -fetchTool "cmake" "$UNAME" cmakeExe || exit 1 -fetchTool "ninja" "$UNAME" ninjaExe || exit 1 + +if $vcpkgUseSystem; then + cmakeExe="cmake" + ninjaExe="ninja" +else + fetchTool "cmake" "$UNAME" cmakeExe || exit 1 + fetchTool "ninja" "$UNAME" ninjaExe || exit 1 +fi selectCXX CXX || exit 1 # Do the build diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index 6bfb57621..b9cbc0ff3 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -16,5 +16,9 @@ if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + if(VCPKG_CRT_LINKAGE STREQUAL "static") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ") + endif() endif() endif() diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 3589881a7..fc7283599 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -171,8 +171,10 @@ static void inner(const VcpkgCmdArguments& args) default_triplet = Triplet::from_canonical_name("x64-osx"); #elif defined(__FreeBSD__) default_triplet = Triplet::from_canonical_name("x64-freebsd"); -#else +#elif defined(__GLIBC__) default_triplet = Triplet::from_canonical_name("x64-linux"); +#else + default_triplet = Triplet::from_canonical_name("x64-linux-musl"); #endif } } diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index f4ee2d653..c623d816d 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -253,6 +253,11 @@ namespace vcpkg static PathAndVersion get_path(const VcpkgPaths& paths) { + if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) + { + return {"cmake", "0"}; + } + std::vector candidate_paths; #if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "cmake"); @@ -317,6 +322,11 @@ namespace vcpkg static PathAndVersion get_path(const VcpkgPaths& paths) { + if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) + { + return {"ninja", "0"}; + } + static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "ninja"); std::vector candidate_paths; -- cgit v1.2.3 From e6ee17a9511e5797b8f96a177b11ef8001b8bdae Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 11 Dec 2018 10:17:31 -0800 Subject: [libiconv] Modernize --- ports/libiconv/CMakeLists.txt | 59 ++++++++++++++++++++++++++++++------------- ports/libiconv/CONTROL | 2 +- ports/libiconv/portfile.cmake | 25 ++++++++++-------- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt index 95071be9d..3c2a6125c 100644 --- a/ports/libiconv/CMakeLists.txt +++ b/ports/libiconv/CMakeLists.txt @@ -6,24 +6,47 @@ if(BUILD_SHARED_LIBS) else() set(LIBICONV_DYNAMIC "0 /*LIBICONV_DYNAMIC*/") endif() -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*/") - -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 const" _contents "${_contents}") -string(REPLACE "#undef EILSEQ" "" _contents "${_contents}") -string(REPLACE "#undef WORDS_LITTLEENDIAN" "#define WORDS_LITTLEENDIAN 1" _contents "${_contents}") -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "${_contents}") - -configure_file(libcharset/include/localcharset.h.build.in localcharset.h) -configure_file(include/iconv.h.build.in iconv.h) + +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*/") + + 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 const" _contents "${_contents}") + string(REPLACE "#undef EILSEQ" "" _contents "${_contents}") + string(REPLACE "#undef WORDS_LITTLEENDIAN" "#define WORDS_LITTLEENDIAN 1" _contents "${_contents}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "${_contents}") + + configure_file(libcharset/include/localcharset.h.build.in localcharset.h) + configure_file(include/iconv.h.build.in iconv.h) +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/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}) diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 852156dc6..a5e4d0cc4 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,3 +1,3 @@ Source: libiconv -Version: 1.15-4 +Version: 1.15-5 Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 3ccd85c53..7de4cac0e 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -6,24 +6,27 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.15) + +set(LIBICONV_VERSION 1.15) + vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz" - FILENAME "libiconv-1.15.tar.gz" + URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" + FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a ) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBICONV_VERSION} + PATCHES + 0001-Add-export-definitions.patch + 0002-Config-for-MSVC.patch + 0003-Fix-uwp.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_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Add-export-definitions.patch - ${CMAKE_CURRENT_LIST_DIR}/0002-Config-for-MSVC.patch - ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-uwp.patch -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA -- cgit v1.2.3 From 1d5e22919fcfeba3fe513248e73395c42ac18ae4 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 12 Dec 2018 09:22:16 -0800 Subject: [docs] Add config-environment.md --- docs/users/config-environment.md | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 docs/users/config-environment.md diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md new file mode 100644 index 000000000..103c1c547 --- /dev/null +++ b/docs/users/config-environment.md @@ -0,0 +1,42 @@ +## Environment and Configuration + +### Environment Variables + +#### VCPKG_DOWNLOADS + +This environment variable can be set to an existing directory to use for storing downloads instead of the internal +`downloads/` directory. It should always be set to an absolute path. + +#### VCPKG_FEATURE_FLAGS + +This environment variable can be set to a comma-separated list of off-by-default features in vcpkg. These features are +subject to change without notice and should be considered highly unstable. + +Non-exhaustive list of off-by-default features: + +- `binarycaching` + +#### EDITOR + +This environment variable can be set to the full path of an executable to be used for `vcpkg edit`. Please see +`vcpkg help edit` for command-specific help. + +#### VCPKG_ROOT + +This environment variable can be set to a directory to use as the root of the vcpkg instance. Note that mixing vcpkg +repo versions and executable versions can cause issues. + +#### VCPKG_DEFAULT_VS_PATH + +This environment variable can be set to the full path to a Visual Studio instance on the machine. This Visual Studio instance +will be used if the triplet does not override it via the [`VCPKG_VISUAL_STUDIO_PATH` triplet setting](triplets.md#VCPKG_VISUAL_STUDIO_PATH). + +Example: `D:\2017` + +#### VCPKG_DEFAULT_TRIPLET + +This environment variable can be set to a triplet name which will be used for unqualified triplet references in command lines. + +#### VCPKG_FORCE_SYSTEM_BINARIES + +This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries. -- cgit v1.2.3 From a60120cbad46361f359836a79eb7c682c825894d Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 13 Dec 2018 04:32:45 +0800 Subject: [sajson] Add new port (#4818) * [sajson] Add new port * [sajson] Fix package namespace --- ports/sajson/CMakeLists.txt | 26 ++++++++++++++++++++++++++ ports/sajson/CONTROL | 3 +++ ports/sajson/portfile.cmake | 27 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 ports/sajson/CMakeLists.txt create mode 100644 ports/sajson/CONTROL create mode 100644 ports/sajson/portfile.cmake diff --git a/ports/sajson/CMakeLists.txt b/ports/sajson/CMakeLists.txt new file mode 100644 index 000000000..da8327003 --- /dev/null +++ b/ports/sajson/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.8) + +project(sajson) + +add_library(sajson INTERFACE) + +target_compile_features(sajson INTERFACE cxx_std_11) + +target_include_directories(sajson INTERFACE + $ + $) + +install(DIRECTORY include/ + DESTINATION include + USE_SOURCE_PERMISSIONS + FILES_MATCHING PATTERN "*.h" + ) + +install(TARGETS sajson EXPORT unofficial-sajson-config) + +install(EXPORT unofficial-sajson-config + FILE unofficial-sajson-config.cmake + NAMESPACE unofficial::sajson:: + DESTINATION share/cmake/unofficial-sajson + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/ports/sajson/CONTROL b/ports/sajson/CONTROL new file mode 100644 index 000000000..c990cd3df --- /dev/null +++ b/ports/sajson/CONTROL @@ -0,0 +1,3 @@ +Source: sajson +Version: 2018-09-21 +Description: Lightweight, extremely high-performance JSON parser for C++11 diff --git a/ports/sajson/portfile.cmake b/ports/sajson/portfile.cmake new file mode 100644 index 000000000..662ab01f7 --- /dev/null +++ b/ports/sajson/portfile.cmake @@ -0,0 +1,27 @@ +# Header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chadaustin/sajson + REF 2dcfd350586375f9910f74821d4f07d67ae455ba + SHA512 6029a640f8bd6c7cefc507819a18a708f6d7e9ce84fdd2998506cea26d597b999d2776a7307908f5df02994bc53c3c9bdf6a73344ab70ee6a5c775b54351e7d2 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/unofficial-sajson TARGET_PATH share/unofficial-sajson) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/sajson/copyright COPYONLY) -- cgit v1.2.3 From 4347bc7e456670ff8d39eb92bf80ce645209b8d5 Mon Sep 17 00:00:00 2001 From: Federico Fuga Date: Wed, 12 Dec 2018 21:46:59 +0100 Subject: Port of sparsepp added (#4938) --- ports/sparsepp/CMakeLists.txt | 18 ++++++++++++++++++ ports/sparsepp/CONTROL | 3 +++ ports/sparsepp/portfile.cmake | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 ports/sparsepp/CMakeLists.txt create mode 100644 ports/sparsepp/CONTROL create mode 100644 ports/sparsepp/portfile.cmake diff --git a/ports/sparsepp/CMakeLists.txt b/ports/sparsepp/CMakeLists.txt new file mode 100644 index 000000000..36d304ce5 --- /dev/null +++ b/ports/sparsepp/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required (VERSION 3.9) +project (sparsepp) + +set(HEADERS + sparsepp/spp.h + sparsepp/spp_config.h + sparsepp/spp_dlalloc.h + sparsepp/spp_memory.h + sparsepp/spp_smartptr.h + sparsepp/spp_stdint.h + sparsepp/spp_timer.h + sparsepp/spp_traits.h + sparsepp/spp_utils.h + ) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/sparsepp) +endif() diff --git a/ports/sparsepp/CONTROL b/ports/sparsepp/CONTROL new file mode 100644 index 000000000..6606595e8 --- /dev/null +++ b/ports/sparsepp/CONTROL @@ -0,0 +1,3 @@ +Source: sparsepp +Version: 1.22 +Description: A fast, memory efficient hash map for C++ diff --git a/ports/sparsepp/portfile.cmake b/ports/sparsepp/portfile.cmake new file mode 100644 index 000000000..01822ea16 --- /dev/null +++ b/ports/sparsepp/portfile.cmake @@ -0,0 +1,32 @@ + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/sparsepp + REF 1.22 + SHA512 b660cd7de48fcab50d4a0df4e4813226b0b0a8a3791aba4e4cc6a456af7bba0be6694bc44781a7d00b5582b32b1d85b9afa83095b7e5c0a26d1b0344ddc94b0f + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON +) + +# Note: we could add: OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +# but it's an header only package, so there's no INSTALL target. So +# we remove the duplicate headers. + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsepp RENAME copyright) -- cgit v1.2.3 From e04b4ed5b5ff5c1b61e5ce3d70ac101ffe3237c4 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Wed, 12 Dec 2018 20:47:57 +0000 Subject: xalan-c: Remove use of obsolete unary_ and binary_function for C++17 compatibility (#4575) * xalan-c: Remove use of obsolete unary_ and binary_function for C++17 compatibility * [xerces-c] Improve port stability by adding control over ICU dependency --- ports/xalan-c/CONTROL | 2 +- ports/xalan-c/portfile.cmake | 14 ++++++++++++++ ports/xerces-c/CONTROL | 6 +++++- ports/xerces-c/portfile.cmake | 6 ++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL index aa2345462..eb882eb38 100644 --- a/ports/xalan-c/CONTROL +++ b/ports/xalan-c/CONTROL @@ -1,4 +1,4 @@ Source: xalan-c -Version: 1.11-4 +Version: 1.11-5 Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Build-Depends: xerces-c diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index 4c035260a..e5a9a6654 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -10,6 +10,18 @@ vcpkg_download_distfile(ARCHIVE SHA512 2e79a2c8f755c9660ffc94b26b6bd4b140685e05a88d8e5abb19a2f271383a3f2f398b173ef403f65dc33af75206214bd21ac012c39b4c0051b3a9f61f642fe6 ) +vcpkg_download_distfile(XALAN_PATCH8 + URLS "https://github.com/rleigh-codelibre/vcpkg-patches/raw/ca09d69280469ce8f787c67b48f86e46a463ef5d/xalan-c/0008-remove-unary-binary-function.patch" + FILENAME "0008-remove-unary-binary-function.patch" + SHA512 059d9a39b29125ae770369e4c44ab7804ae16d4ff5c90e35f25b7990dc987161bf1187ceb2dcbab181ffb72490a9d9f45e30ab5928644734e7627cb74b03e201 +) + +vcpkg_download_distfile(XALAN_PATCH9 + URLS "https://raw.githubusercontent.com/rleigh-codelibre/vcpkg-patches/ca09d69280469ce8f787c67b48f86e46a463ef5d/xalan-c/0009-remove-select-workaround.patch" + FILENAME "0009-remove-select-workaround.patch" + SHA512 73730736cd1f1809ebcc35562017402d606cbfd5a64665d104a21d89d679ab3274f6f5685ab63305c57fffab74e62084c0e18c76d19eb5f9c2e36be6679fd4d3 +) + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -22,6 +34,8 @@ vcpkg_extract_source_archive_ex( 0005-fix-ftbfs-ld-as-needed.patch 0006-fix-testxslt-segfault.patch 0007-fix-readme-typos.patch + ${XALAN_PATCH8} + ${XALAN_PATCH9} ) if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index 006210e2f..c5958f4a1 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,3 +1,7 @@ Source: xerces-c -Version: 3.2.2-5 +Version: 3.2.2-6 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. + +Feature: icu +Description: ICU support +Build-Depends: icu diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index b14981c74..80e56b0f6 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -9,6 +9,11 @@ vcpkg_from_github( PATCHES disable-tests.patch ) +set(DISABLE_ICU ON) +if("icu" IN_LIST FEATURES) + set(DISABLE_ICU OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -16,6 +21,7 @@ vcpkg_configure_cmake( -DDISABLE_TESTS=ON -DDISABLE_DOC=ON -DDISABLE_SAMPLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ICU=${DISABLE_ICU} ) vcpkg_install_cmake() -- cgit v1.2.3 From 9b850a81497be8981a32e2c8f31c68a8dc94a696 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 13 Dec 2018 11:44:01 +0100 Subject: [OpenCV3] fix protobuf patch --- ports/opencv/0005-remove-custom-protobuf-find-package.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/opencv/0005-remove-custom-protobuf-find-package.patch b/ports/opencv/0005-remove-custom-protobuf-find-package.patch index 2944810e5..91ac137f9 100644 --- a/ports/opencv/0005-remove-custom-protobuf-find-package.patch +++ b/ports/opencv/0005-remove-custom-protobuf-find-package.patch @@ -1,11 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -633,7 +633,7 @@ include(cmake/OpenCVFindLibsGUI.cmake) +@@ -633,7 +633,10 @@ include(cmake/OpenCVFindLibsGUI.cmake) include(cmake/OpenCVFindLibsVideo.cmake) include(cmake/OpenCVFindLibsPerf.cmake) include(cmake/OpenCVFindLAPACK.cmake) -include(cmake/OpenCVFindProtobuf.cmake) +find_package(protobuf) ++if(Protobuf_LIBRARIES) ++ set(HAVE_PROTOBUF TRUE) ++endif() # ---------------------------------------------------------------------------- # Detect other 3rd-party libraries/tools @@ -16,7 +19,7 @@ set(include_dirs ${fw_inc}) set(sources_options "") -set(libs libprotobuf ${LAPACK_LIBRARIES}) -+set(libs protobuf ${LAPACK_LIBRARIES}) ++set(libs protobuf::libprotobuf ${LAPACK_LIBRARIES}) if(OPENCV_DNN_OPENCL AND HAVE_OPENCL) list(APPEND include_dirs ${OPENCL_INCLUDE_DIRS}) else() -- cgit v1.2.3 From a2c846338ced13df79089419c3161c3d2fefb68c Mon Sep 17 00:00:00 2001 From: "ing. Federico Fuga" Date: Thu, 13 Dec 2018 11:59:19 +0100 Subject: Update mpfr to 4.0.1 and fix compilation under gcc 7 gcc 7 deprecates the use of varargs.h in favour of stdarg.h. mpfr already fixes it, but the fix is enabled if stdarg is available. This patch adds the test on CMakeLists.txt and enables the fix if needed. --- ports/mpfr/CMakeLists.txt | 5 +++++ ports/mpfr/portfile.cmake | 9 +++++---- ports/mpfr/test_stdarg.c | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 ports/mpfr/test_stdarg.c diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index ed48eaf59..7770b18fd 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -255,6 +255,11 @@ if(BUILD_SHARED_LIBS) target_compile_definitions(mpfr PRIVATE __GMP_LIBGMP_DLL) endif() +try_compile(I_HAVE_STDARG ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/test_stdarg.c) +if (I_HAVE_STDARG) + target_compile_definitions(mpfr PRIVATE HAVE_STDARG) +endif (I_HAVE_STDARG) + target_link_libraries(mpfr ${GMP_LIBRARIES}) target_include_directories(mpfr PUBLIC ${GMP_INCLUDE_DIRS}) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 689b075fc..4b534ff0c 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -1,13 +1,14 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-3.1.6) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-4.0.1) vcpkg_download_distfile(ARCHIVE - URLS "http://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.xz" - FILENAME "mpfr-3.1.6.tar.xz" - SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 + URLS "http://www.mpfr.org/mpfr-4.0.1/mpfr-4.0.1.tar.xz" + FILENAME "mpfr-4.0.1.tar.xz" + SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f ) vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/test_stdarg.c DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) vcpkg_configure_cmake( diff --git a/ports/mpfr/test_stdarg.c b/ports/mpfr/test_stdarg.c new file mode 100644 index 000000000..dc1e2d7b4 --- /dev/null +++ b/ports/mpfr/test_stdarg.c @@ -0,0 +1,6 @@ +# include + +int main(int argc, char *argv) { + return 0; +} + -- cgit v1.2.3 From dba828e5904dcf6bec908571ece9ab3ab2c51232 Mon Sep 17 00:00:00 2001 From: "ing. Federico Fuga" Date: Thu, 13 Dec 2018 13:06:27 +0100 Subject: Geos: Removed empty directory after install (when only static lib are built) --- ports/geos/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 2f374e79d..673b159f8 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -26,6 +26,10 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +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) if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/geos-config) -- cgit v1.2.3 From 13710d5854d5fdda7ae181707bb3b529c440e2f1 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 13 Dec 2018 21:05:21 +0800 Subject: [ponder] Add new port --- ports/ponder/CONTROL | 3 +++ ports/ponder/no-install-unused.patch | 27 +++++++++++++++++++++++++++ ports/ponder/portfile.cmake | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 ports/ponder/CONTROL create mode 100644 ports/ponder/no-install-unused.patch create mode 100644 ports/ponder/portfile.cmake diff --git a/ports/ponder/CONTROL b/ports/ponder/CONTROL new file mode 100644 index 000000000..7f935d304 --- /dev/null +++ b/ports/ponder/CONTROL @@ -0,0 +1,3 @@ +Source: ponder +Version: 3.0.0 +Description: A C++ multi-purpose reflection library. diff --git a/ports/ponder/no-install-unused.patch b/ports/ponder/no-install-unused.patch new file mode 100644 index 000000000..e540dd909 --- /dev/null +++ b/ports/ponder/no-install-unused.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 091f56d..715f86e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -325,14 +325,14 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PonderConfig.cmake ${CMAKE_CURRENT_BIN + COMPONENT devel + ) + +-install(FILES README.md COPYING.txt +- DESTINATION ${INSTALL_MISC_DIR} +-) +- +-install(DIRECTORY cmake +- DESTINATION ${INSTALL_MISC_DIR} +- COMPONENT utils +-) ++#install(FILES README.md COPYING.txt ++# DESTINATION ${INSTALL_MISC_DIR} ++#) ++ ++#install(DIRECTORY cmake ++# DESTINATION ${INSTALL_MISC_DIR} ++# COMPONENT utils ++#) + + ############################### + # packaging diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake new file mode 100644 index 000000000..ee0267b00 --- /dev/null +++ b/ports/ponder/portfile.cmake @@ -0,0 +1,32 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO billyquith/ponder + REF 3.0.0 + SHA512 b6ba1ce9fa0584b16085c56afb70e31f204a66b57193c1a4225bfe18abbda561bb71b3279dd0a4f1b21867b985ef5ce78c8e360f3fc654c61ce61c44d35c5f38 + HEAD_REF master + PATCHES + no-install-unused.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSES_RAPIDJSON=OFF + -DUSES_RAPIDXML=OFF + -DBUILD_TEST=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ponder/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/ponder + ${CURRENT_PACKAGES_DIR}/lib/ponder) + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/ponder/copyright COPYONLY) -- cgit v1.2.3 From 6d15819fdde0d52ce29c6922d3615ab22a9fbf33 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 13 Dec 2018 14:13:05 +0100 Subject: [opencv] bump version --- ports/opencv/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 5f012d80e..41e73b195 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-4 +Version: 3.4.3-5 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann -- cgit v1.2.3 From 751aa7809d7f8e3286d00ffd8ab90d95ceebe8b2 Mon Sep 17 00:00:00 2001 From: Juha Sointusalo Date: Thu, 13 Dec 2018 23:09:57 +0200 Subject: [ftgl] add new port --- ports/ftgl/0001-fix-building-DLL-on-Windows.patch | 26 +++++++++++++++++++++++ ports/ftgl/CONTROL | 6 ++++++ ports/ftgl/portfile.cmake | 24 +++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 ports/ftgl/0001-fix-building-DLL-on-Windows.patch create mode 100644 ports/ftgl/CONTROL create mode 100644 ports/ftgl/portfile.cmake diff --git a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch new file mode 100644 index 000000000..e9b8c52a5 --- /dev/null +++ b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch @@ -0,0 +1,26 @@ +From b56270d28a59297518e91f85333a2e1a7fecdc9e Mon Sep 17 00:00:00 2001 +From: Juha Sointusalo +Date: Thu, 13 Dec 2018 21:38:23 +0200 +Subject: [PATCH] fix building DLL on Windows + +Without FTGL_LIBRARY all symbols are declared to be imported instead of +exported and linking the library fails. +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6c5a57..6b230ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,6 +27,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE) + OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON) + IF(BUILD_SHARED_LIBS) + SET(LIB_TYPE SHARED) ++ ADD_DEFINITIONS(-DFTGL_LIBRARY) + ELSE(BUILD_SHARED_LIBS) + SET(LIB_TYPE STATIC) + ADD_DEFINITIONS(-D FTGL_LIBRARY_STATIC) +-- +2.18.0.windows.1 + diff --git a/ports/ftgl/CONTROL b/ports/ftgl/CONTROL new file mode 100644 index 000000000..2abfa8778 --- /dev/null +++ b/ports/ftgl/CONTROL @@ -0,0 +1,6 @@ +Source: ftgl +Version: 2.3.1 +Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications. + Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format. + FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering. +Build-Depends: freetype, opengl diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake new file mode 100644 index 000000000..a8878af0f --- /dev/null +++ b/ports/ftgl/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO frankheckenbach/ftgl + REF 2.3.1 + SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a + HEAD_REF master + PATCHES "0001-fix-building-DLL-on-Windows.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_test_cmake(PACKAGE_NAME FTGL) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ftgl) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/ftgl/COPYING ${CURRENT_PACKAGES_DIR}/share/ftgl/copyright) -- cgit v1.2.3 From fed9a245268df9591a4150fb1f916df0894ca9d3 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 13 Dec 2018 13:49:24 -0800 Subject: [autocomplete] Add tab-completion support for bash --- README.md | 7 +++-- scripts/vcpkg_completion.bash | 17 +++++++++++ toolsrc/src/vcpkg/commands.integrate.cpp | 52 ++++++++++++++++++++++++++++++-- 3 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 scripts/vcpkg_completion.bash diff --git a/README.md b/README.md index 93262a1ca..e32ef7025 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,12 @@ For more information, see our [using a package](docs/examples/installing-and-usi Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/). ## Tab-Completion / Auto-Completion -`vcpkg` supports auto-completion of commands, package names, options etc. To enable tab-completion in Powershell, use +`vcpkg` supports auto-completion of commands, package names, options etc in Powershell and bash. To enable tab-completion, use one of the following: ``` -.\vcpkg integrate powershell +PS> .\vcpkg integrate powershell +Linux:~/$ ./vcpkg integrate bash ``` -and restart Powershell. +and restart your console. ## Examples diff --git a/scripts/vcpkg_completion.bash b/scripts/vcpkg_completion.bash new file mode 100644 index 000000000..804507d58 --- /dev/null +++ b/scripts/vcpkg_completion.bash @@ -0,0 +1,17 @@ +#/usr/bin/env bash + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) + + # Colon is treated as a delimiter in bash. The following workaround + # allows triplet completion to work correctly in the syntax: + # zlib:x64-windows + local cur + _get_comp_words_by_ref -n : cur + __ltrim_colon_completions "$cur" +} + +complete -F _vcpkg_completions vcpkg diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 82172e363..c1d3a8c8d 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include +#include #include #include #include @@ -122,7 +123,7 @@ namespace vcpkg::Commands::Integrate static ElevationPromptChoice elevated_cmd_execute(const std::string& param) { - SHELLEXECUTEINFOW sh_ex_info{}; + SHELLEXECUTEINFOW sh_ex_info {}; sh_ex_info.cbSize = sizeof(sh_ex_info); sh_ex_info.fMask = SEE_MASK_NOCLOSEPROCESS; sh_ex_info.hwnd = nullptr; @@ -404,6 +405,47 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console Checks::exit_with_code(VCPKG_LINE_INFO, rc); } +#elif defined(__unix__) + static void integrate_bash(const VcpkgPaths& paths) + { + const auto home_path = System::get_environment_variable("HOME").value_or_exit(VCPKG_LINE_INFO); + const fs::path bashrc_path = fs::path {home_path} / ".bashrc"; + + auto& fs = paths.get_filesystem(); + const fs::path completion_script_path = paths.scripts / "vcpkg_completion.bash"; + + Expected> maybe_bashrc_content = fs.read_lines(bashrc_path); + Checks::check_exit( + VCPKG_LINE_INFO, maybe_bashrc_content.has_value(), "Unable to read %s", bashrc_path.u8string()); + + std::vector bashrc_content = maybe_bashrc_content.value_or_exit(VCPKG_LINE_INFO); + + std::vector matches; + for (auto&& line : bashrc_content) + { + std::smatch match; + if (std::regex_match(line, match, std::regex {R"###(^source.*scripts/vcpkg_completion.bash$)###"})) + { + matches.push_back(line); + } + } + + if (!matches.empty()) + { + System::print("vcpkg bash completion is already imported to your %s file.\n" + "The following entries were found:\n" + " %s\n" + "Please make sure you have started a new bash shell for the changes to take effect.\n", + bashrc_path.u8string(), + Strings::join("\n ", matches)); + Checks::exit_success(VCPKG_LINE_INFO); + } + + System::print("Adding vcpkg completion entry to %s\n", bashrc_path.u8string()); + bashrc_content.push_back(Strings::format("source %s", completion_script_path.u8string())); + fs.write_contents(bashrc_path, Strings::join("\n", bashrc_content)); + Checks::exit_success(VCPKG_LINE_INFO); + } #endif #if defined(_WIN32) @@ -425,11 +467,12 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console static const std::string REMOVE = "remove"; static const std::string PROJECT = "project"; static const std::string POWERSHELL = "powershell"; + static const std::string BASH = "bash"; } static std::vector valid_arguments(const VcpkgPaths&) { - return {Subcommand::INSTALL, Subcommand::REMOVE, Subcommand::PROJECT, Subcommand::POWERSHELL}; + return {Subcommand::INSTALL, Subcommand::REMOVE, Subcommand::PROJECT, Subcommand::POWERSHELL, Subcommand::BASH}; } const CommandStructure COMMAND_STRUCTURE = { @@ -463,6 +506,11 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console { return integrate_powershell(paths); } +#elif defined(__unix__) + if (args.command_arguments[0] == Subcommand::BASH) + { + return integrate_bash(paths); + } #endif Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown parameter %s for integrate", args.command_arguments[0]); -- cgit v1.2.3 From 02c27dd55ec6401dd9c0b3af99e96b4d7cfd82a8 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 15:53:32 -0800 Subject: [antlr4] bump dash version in control file Done to force test to run --- ports/antlr4/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index af881f1c3..2254d4d80 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7.1 +Version: 4.7.1-1 Description: ANother Tool for Language Recognition \ No newline at end of file -- cgit v1.2.3 From 83b8a6e0366b63283f285240cebde2b7312de761 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 16:11:58 -0800 Subject: [mpfr] bump control version number --- ports/mpfr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index fdfe6deb0..a7fcfdeaf 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,4 +1,4 @@ Source: mpfr -Version: 3.1.6-2 +Version: 3.1.6-3 Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir -- cgit v1.2.3 From 96b282341fd80763ef8533ba6619064ad3e8a60f Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 16:19:44 -0800 Subject: [geos] bump control version number --- ports/geos/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL index 0a4421eea..cb19bebd9 100644 --- a/ports/geos/CONTROL +++ b/ports/geos/CONTROL @@ -1,3 +1,3 @@ Source: geos -Version: 3.6.3-2 +Version: 3.6.3-3 Description: Geometry Engine Open Source -- cgit v1.2.3 From 165f96bb51a33239f81cd084378fde0479283508 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 13 Dec 2018 19:20:26 -0500 Subject: Update to v1.17.1 --- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index d2b0f44e8..f7a46c9f6 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.16.1 +Version: 1.17.1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index b0dca5a93..4b307a87a 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.16.1 - SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d + REF v1.17.1 + SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e HEAD_REF master PATCHES fix-uwp.patch ) -- cgit v1.2.3 From a05cbffe55eedf928b1da2fb82290a75722d381b Mon Sep 17 00:00:00 2001 From: Albert Huang Date: Fri, 14 Dec 2018 01:40:18 +0000 Subject: Update libpng-apng to match libpng ports changes + update to 1.6.36 (#4944) * Update libpng-apng to match libpng ports changes + update to 1.6.36 * Delete CONTROL.bak * Delete portfile.cmake.bak * Delete use-abort-on-all-platforms.patch.bak --- ports/libpng-apng/CONTROL | 2 +- ports/libpng-apng/portfile.cmake | 22 ++++++++++++++++------ ports/libpng-apng/skip-install-symlink.patch | 22 ++++++++++++++++++++++ ports/libpng-apng/use-abort-on-all-platforms.patch | 2 +- ports/libpng-apng/vcpkg-cmake-wrapper.cmake | 6 ++++++ 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 ports/libpng-apng/skip-install-symlink.patch create mode 100644 ports/libpng-apng/vcpkg-cmake-wrapper.cmake diff --git a/ports/libpng-apng/CONTROL b/ports/libpng-apng/CONTROL index f4ea530fe..81db06eee 100644 --- a/ports/libpng-apng/CONTROL +++ b/ports/libpng-apng/CONTROL @@ -1,4 +1,4 @@ Source: libpng-apng -Version: 1.6.34-2 +Version: 1.6.36-1 Build-Depends: zlib Description: libpng-apng is a library implementing an interface for reading and writing (A)PNG ((Animated) Portable Network Graphics) format files. This is backward compatible with the regular libpng, both in library usage and format. diff --git a/ports/libpng-apng/portfile.cmake b/ports/libpng-apng/portfile.cmake index b1ec137a8..948b0a2f3 100644 --- a/ports/libpng-apng/portfile.cmake +++ b/ports/libpng-apng/portfile.cmake @@ -1,19 +1,19 @@ include(vcpkg_common_functions) -set(LIBPNG_APNG_VERSION 1.6.34) +set(LIBPNG_APNG_VERSION 1.6.36) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glennrp/libpng REF v${LIBPNG_APNG_VERSION} - SHA512 23b6112a1d16a34c8037d5c5812944d4385fc96ed819a22172776bdd5acd3a34e55f073b46087b77d1c12cecc68f9e8ba7754c86b5ab6ed3016063e1c795de7a + SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d HEAD_REF master ) vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_APNG_VERSION}/libpng-${LIBPNG_APNG_VERSION}-apng.patch.gz" FILENAME "libpng-${LIBPNG_APNG_VERSION}-apng.patch.gz" - SHA512 0777b8e55aeee207ee92479f2258ef1f60f16d7951fdbc6d89a80ef533b86dadecd1ef659d6fe7602d8ea3a8e711a096b0f77ee09b993799b73dfffddfe5dd3c + SHA512 8fa213204768b058459ffd5eae6b3661c3f185d3baf1913da4337e7b7855e567f2525e7f67411c32fa8cb177a5f93d538c3d0ce17a94d4aa71bd9cffabe8b311 ) vcpkg_find_acquire_program(7Z) @@ -35,6 +35,7 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch + ${CMAKE_CURRENT_LIST_DIR}/skip-install-symlink.patch ${CURRENT_BUILDTREES_DIR}/src/libpng-${LIBPNG_APNG_VERSION}-apng.patch ) @@ -57,15 +58,20 @@ vcpkg_configure_cmake( -DSKIP_INSTALL_PROGRAMS=ON -DSKIP_INSTALL_EXECUTABLES=ON -DSKIP_INSTALL_FILES=ON + -DSKIP_INSTALL_SYMLINK=ON OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) vcpkg_install_cmake() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib ${CURRENT_PACKAGES_DIR}/lib/libpng16.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16d.lib) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib ${CURRENT_PACKAGES_DIR}/lib/libpng16.lib) + endif() + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16_staticd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16d.lib) + endif() endif() # Remove CMake config files as they are incorrectly generated and everyone uses built-in FindPNG anyway. @@ -76,3 +82,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng-apng/LICENSE ${CURRENT_PACKAGES vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png) +endif() diff --git a/ports/libpng-apng/skip-install-symlink.patch b/ports/libpng-apng/skip-install-symlink.patch new file mode 100644 index 000000000..c25075941 --- /dev/null +++ b/ports/libpng-apng/skip-install-symlink.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48c6fa2..589e5f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -853,7 +853,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +- if(PNG_SHARED) ++ if(PNG_SHARED AND NOT SKIP_INSTALL_SYMLINK) + # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin + if(CYGWIN OR MINGW) + create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png) +@@ -868,7 +868,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) + endif() + endif() + +- if(PNG_STATIC) ++ if(PNG_STATIC AND NOT SKIP_INSTALL_SYMLINK) + if(NOT WIN32 OR CYGWIN OR MINGW) + create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static) + install(FILES $/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} diff --git a/ports/libpng-apng/use-abort-on-all-platforms.patch b/ports/libpng-apng/use-abort-on-all-platforms.patch index 0a629e059..ef21211c6 100644 --- a/ports/libpng-apng/use-abort-on-all-platforms.patch +++ b/ports/libpng-apng/use-abort-on-all-platforms.patch @@ -2,7 +2,7 @@ diff --git a/pngpriv.h b/pngpriv.h index fe3355d..5a049b5 100644 --- a/pngpriv.h +++ b/pngpriv.h -@@ -457,11 +457,7 @@ +@@ -556,11 +556,7 @@ /* Memory model/platform independent fns */ #ifndef PNG_ABORT diff --git a/ports/libpng-apng/vcpkg-cmake-wrapper.cmake b/ports/libpng-apng/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..cb9c74f32 --- /dev/null +++ b/ports/libpng-apng/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a") + set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a" CACHE FILEPATH "") +elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE FILEPATH "") +endif() +_find_package(${ARGS}) -- cgit v1.2.3 From 42828b6f39453219b7f60544a4f2b84f4c6175df Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Fri, 14 Dec 2018 04:40:55 +0300 Subject: [imgui] Update to 1.66b (#4941) --- ports/imgui/CONTROL | 2 +- ports/imgui/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 8f310b04f..46d927c9e 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.66 +Version: 1.66b Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 8f5452042..756574d76 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.66 - SHA512 85d41e6fa2141da87b72e5c39d23fe285bea086d6dd758a5ec048a495c29bbcf0a49ee1e9f442d5db3452fd0f28d1e52a2c41b5402cbbaa3ad6612818aaea670 + REF v1.66b + SHA512 894339a70f99c517d9306c49d861a43710b936e71067ddd322f5e771396f8e658a541111fcb00ce9010599f0ec9702d029d18b155199c7635129fd659ac13dbc HEAD_REF master ) -- cgit v1.2.3 From 06cad7ff8535b84339b7d5bcdf7102296a27a298 Mon Sep 17 00:00:00 2001 From: Yann Lanthony Date: Fri, 14 Dec 2018 02:43:20 +0100 Subject: [geogram] update to 1.6.9 (#4680) * [geogram] update to 1.6.9 * [geogram] Cleanup. Enable ninja. Modernize. * [geogram] Disable PREFER_NINJA with comment --- ports/geogram/CONTROL | 2 +- ports/geogram/fix-cmake-config-and-install.patch | 2 +- ports/geogram/portfile.cmake | 80 ++++++++++-------------- 3 files changed, 34 insertions(+), 50 deletions(-) diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index 687174914..7b19ca9cf 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -1,5 +1,5 @@ Source: geogram -Version: 1.6.4 +Version: 1.6.9-2 Description: Geogram is a programming library of geometric algorithms. Build-Depends: openblas, clapack diff --git a/ports/geogram/fix-cmake-config-and-install.patch b/ports/geogram/fix-cmake-config-and-install.patch index f5d933586..2c7790923 100644 --- a/ports/geogram/fix-cmake-config-and-install.patch +++ b/ports/geogram/fix-cmake-config-and-install.patch @@ -3,7 +3,7 @@ index 17dc02e..e489d75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set(VORPALINE_VERSION_MINOR 6) - set(VORPALINE_VERSION_PATCH 4) + set(VORPALINE_VERSION_PATCH 9) set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH}) -set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR}) diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 17060723f..46709f6c3 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -1,64 +1,48 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geogram_1.6.4) +set(GEOGRAM_VERSION 1.6.9) + vcpkg_download_distfile(ARCHIVE - URLS "https://gforge.inria.fr/frs/download.php/file/37525/geogram_1.6.4.tar.gz" - FILENAME "geogram_1.6.4.tar.gz" - SHA512 a89b824cc7c055b7d0a5882e2f1922f09729f6eed5ed656136e8375e9b414e286fdbc5372fdb69b1ea5ce340dc81231db0228974b997be805043227de3c341b8 + URLS "https://gforge.inria.fr/frs/download.php/file/37779/geogram_${GEOGRAM_VERSION}.tar.gz" + FILENAME "geogram_${GEOGRAM_VERSION}.tar.gz" + SHA512 1b5c7540bef734c1908f213f26780aba63b4911a8022d5eb3f7c90eabe2cb69efd1f298b30cdc8e2c636a5b37c8c25832dd4aad0b7c2ff5f0a5b5caa17970136 ) -vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-cmake-config-and-install.patch + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${GEOGRAM_VERSION} + PATCHES fix-cmake-config-and-install.patch ) +file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) + set(GEOGRAM_WITH_GRAPHICS OFF) if("graphics" IN_LIST FEATURES) set(GEOGRAM_WITH_GRAPHICS ON) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DVORPALINE_BUILD_DYNAMIC=FALSE - -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS} - -DGEOGRAM_LIB_ONLY=ON - -DGEOGRAM_USE_SYSTEM_GLFW3=ON - -DVORPALINE_PLATFORM=Win-vs-generic - -DGEOGRAM_WITH_VORPALINE=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 - ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(VORPALINE_BUILD_DYNAMIC FALSE) + set(VORPALINE_PLATFORM Win-vs-generic) else() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DVORPALINE_BUILD_DYNAMIC=TRUE - -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS} - -DGEOGRAM_LIB_ONLY=ON - -DGEOGRAM_USE_SYSTEM_GLFW3=ON - -DVORPALINE_PLATFORM=Win-vs-dynamic-generic - -DGEOGRAM_WITH_VORPALINE=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 - ) + set(VORPALINE_BUILD_DYNAMIC TRUE) + set(VORPALINE_PLATFORM Win-vs-dynamic-generic) endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # Geogram cannot be built with ninja because it embeds $(Configuration) in some of the generated paths. These require MSBuild in order to be evaluated. + #PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DVORPALINE_BUILD_DYNAMIC=${VORPALINE_BUILD_DYNAMIC} + -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS} + -DGEOGRAM_LIB_ONLY=ON + -DGEOGRAM_USE_SYSTEM_GLFW3=ON + -DVORPALINE_PLATFORM=${VORPALINE_PLATFORM} + -DGEOGRAM_WITH_VORPALINE=OFF +) + vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH "share/geogram") -- cgit v1.2.3 From ff87743dcf6398835c6ffc82dfbb0233c571ad2b Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 14 Dec 2018 09:50:34 +0800 Subject: [rapidstring] Add new port (#4814) * [rapidstring] Add new port * [rapidstring] Rename package to be unofficial-rapidstring --- ports/rapidstring/CONTROL | 3 +++ ports/rapidstring/fix-cmake-install.patch | 34 +++++++++++++++++++++++++++++++ ports/rapidstring/portfile.cmake | 27 ++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 ports/rapidstring/CONTROL create mode 100644 ports/rapidstring/fix-cmake-install.patch create mode 100644 ports/rapidstring/portfile.cmake diff --git a/ports/rapidstring/CONTROL b/ports/rapidstring/CONTROL new file mode 100644 index 000000000..e88c40ec2 --- /dev/null +++ b/ports/rapidstring/CONTROL @@ -0,0 +1,3 @@ +Source: rapidstring +Version: 2018-08-03 +Description: rapidstring is maybe the fastest string library ever written in ANSI C. diff --git a/ports/rapidstring/fix-cmake-install.patch b/ports/rapidstring/fix-cmake-install.patch new file mode 100644 index 000000000..624a71d2b --- /dev/null +++ b/ports/rapidstring/fix-cmake-install.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8543256..8ebce9c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,15 +1,26 @@ + cmake_minimum_required(VERSION 3.8 FATAL_ERROR) + project(rapidstring LANGUAGES C VERSION 0.1.0) + add_library(rapidstring INTERFACE) +-target_include_directories(rapidstring INTERFACE include) ++target_include_directories(rapidstring INTERFACE ++ $ ++ $) + + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utility.cmake) + + # TODO: Installation. ++install(FILES include/rapidstring.h DESTINATION include) ++ ++install(TARGETS rapidstring EXPORT rapidstringConfig) ++ ++install(EXPORT rapidstringConfig ++ FILE unofficial-rapidstringConfig.cmake ++ NAMESPACE unofficial::rapidstring:: ++ DESTINATION share/cmake/rapidstring ++ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + + if(BUILD_TESTING) + enable_testing() + endif() + +-add_subdirectory(test) +-add_subdirectory(benchmark) ++#add_subdirectory(test) ++#add_subdirectory(benchmark) diff --git a/ports/rapidstring/portfile.cmake b/ports/rapidstring/portfile.cmake new file mode 100644 index 000000000..2bce2d015 --- /dev/null +++ b/ports/rapidstring/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boyerjohn/rapidstring + REF ee433955c1e9cacfaecbf53c0a13318ab5825bd4 + SHA512 89e0656323d53dc3c47ba24ad9a032445b0985f21aaace05ea5bdbfb0ade5291193ac06145faf5984bcdff67c2a07a500109ce938174dbf1339fea2d79a6bd10 + HEAD_REF master + PATCHES + fix-cmake-install.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/rapidstring TARGET_PATH share/unofficial-rapidstring) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/rapidstring/copyright COPYONLY) -- cgit v1.2.3 From bc79cf9a7c39067fcbd7765ec8129b232cb35da4 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 14 Dec 2018 23:12:44 -0500 Subject: Apply patch to export all symbols. --- ports/crc32c/0001_export_symbols.patch | 15 +++++++++++++++ ports/crc32c/portfile.cmake | 1 + 2 files changed, 16 insertions(+) create mode 100644 ports/crc32c/0001_export_symbols.patch diff --git a/ports/crc32c/0001_export_symbols.patch b/ports/crc32c/0001_export_symbols.patch new file mode 100644 index 000000000..691e8603f --- /dev/null +++ b/ports/crc32c/0001_export_symbols.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 80b7d17..6ab78e2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,10 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + ++# When compiling a Windows DLL export all symbols, just like Unix shared ++# objects do. ++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) ++ + # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake + if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Use the highest warning level for Visual Studio. diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake index b8695a3c6..85883c7e2 100644 --- a/ports/crc32c/portfile.cmake +++ b/ports/crc32c/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF 1.0.6 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b HEAD_REF master + PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 0d1229d34babdc9c8fbfe2e1b43b38e657519093 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 17 Dec 2018 09:34:45 +0100 Subject: update msys2 to latest release --- scripts/cmake/vcpkg_acquire_msys.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index ed4f7ac29..adbd58ca5 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -53,20 +53,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64") set(TOOLSUBPATH msys64) set(URLS - "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-x86_64-20161025.tar.xz") - set(HASH 6c4c18ec59db80b8269698d074866438a624f1ce735ee5005a01b148b02e8f2e966ae381aa1cb4c50f6226c3b7feb271e36907cf26580df084d695b3c9f5c0eb) + set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz") + set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056) set(STAMP "initialized-msys2_64.stamp") else() set(TOOLSUBPATH msys32) set(URLS - "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-i686-20161025.tar.xz") - set(HASH c9260a38e0c6bf963adeaea098c4e376449c1dd0afe07480741d6583a1ac4c138951ccb0c5388bd148e04255a5c1a23bf5ee2d58dcd6607c14f1eaa5639a7c85) + set(ARCHIVE "msys2-base-i686-20181211.tar.xz") + set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f) set(STAMP "initialized-msys2_32.stamp") endif() -- cgit v1.2.3 From 524a1414fc395fdc60951d63f4a66683309fd630 Mon Sep 17 00:00:00 2001 From: Francisco Dias Date: Mon, 17 Dec 2018 11:13:02 -0200 Subject: TinyXml Linkage error fixed --- ports/tinyxml/0002_export_tinyxml.patch | 26 ++++++++++++++++++++++++++ ports/tinyxml/CMakeLists.txt | 8 +++++++- ports/tinyxml/portfile.cmake | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/tinyxml/0002_export_tinyxml.patch diff --git a/ports/tinyxml/0002_export_tinyxml.patch b/ports/tinyxml/0002_export_tinyxml.patch new file mode 100644 index 000000000..7f09a6ec9 --- /dev/null +++ b/ports/tinyxml/0002_export_tinyxml.patch @@ -0,0 +1,26 @@ +# User Francisco Dias +# Date 1545049386 7200 +# Mon Dec 17 10:23:06 2018 -0200 +Export tinyXML. + +diff --git a/tinyxml.h b/tinyxml.h +--- a/tinyxml.h ++++ b/tinyxml.h +@@ -38,6 +38,8 @@ + #include + #include + ++#include "tinyxml_export.h" ++ + // Help out windows: + #if defined( _DEBUG ) && !defined( DEBUG ) + #define DEBUG +@@ -414,7 +416,7 @@ + + }; + static Entity entity[ NUM_ENTITY ]; +- static bool condenseWhiteSpace; ++ static TINYXML_EXPORT bool condenseWhiteSpace; + }; + + diff --git a/ports/tinyxml/CMakeLists.txt b/ports/tinyxml/CMakeLists.txt index 9b55aa717..21776c156 100644 --- a/ports/tinyxml/CMakeLists.txt +++ b/ports/tinyxml/CMakeLists.txt @@ -15,6 +15,11 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) add_library(tinyxml ${SOURCES}) target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL") +include(GenerateExportHeader) +generate_export_header(tinyxml) + +target_include_directories(tinyxml PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + install( TARGETS tinyxml ARCHIVE DESTINATION lib @@ -22,4 +27,5 @@ install( RUNTIME DESTINATION bin ) -install(FILES ${HEADERS} DESTINATION include) +install(FILES ${HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include) diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake index 54d462bb4..dcd1fcc08 100644 --- a/ports/tinyxml/portfile.cmake +++ b/ports/tinyxml/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch + ${CMAKE_CURRENT_LIST_DIR}/0002_export_tinyxml.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From c3c6c0d0de43fa46deeceea1cd409b1e533cbcdc Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Mon, 17 Dec 2018 16:37:46 +0100 Subject: Update eigen3 to 3.3.7 --- ports/eigen3/CONTROL | 2 +- ports/eigen3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index 0b048eaa1..2586620a0 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,3 +1,3 @@ Source: eigen3 -Version: 3.3.5 +Version: 3.3.7 Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4e32d4e10..f3efca4b8 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eigenteam/eigen-git-mirror - REF 3.3.5 - SHA512 398d864bb3c12be9b1d7081bac1343d54b1edf65f165be54814794cd8d36c35035340384a97ad203e5295d466445dfbad4225d86748c8d31c322948de9a33a3f + REF 3.3.7 + SHA512 270ab9b5c22e09aa0e70d1a26995523c5c21fb0f09da45c137c11ab4c7700fe2bdb2b343c1e063bea4be5ae61d2313ff29ebbcad519dc355a568792b4a6e9e48 HEAD_REF master ) -- cgit v1.2.3 From f64362201923a20111ced9b789286437a8acac13 Mon Sep 17 00:00:00 2001 From: Carsten Neumann Date: Mon, 17 Dec 2018 09:52:25 -0600 Subject: Fix spdlog handling of external fmt lib Using an external fmt lib should cause the spdlog::spdlog target to have a dependency on fmt lib - so that a consuming project does not need to call find_package(fmt) and target_link_libraries(... fmt::fmt). To this end a new cmake option SPDLOG_FMT_EXTERNAL is introduced which makes spdlog depend on fmt lib and defines the SPDLOG_FMT_EXTERNAL macro to avoid using the bundled fmt lib. The value of SPDLOG_FMT_EXTERNAL is also stored in the installed spdlogConfig.cmake and if it is ON find_dependency() is used to ensure the fmt::fmt target is imported. --- ports/spdlog/fmt-external-cmake-option.patch | 100 +++++++++++++++++++++++++++ ports/spdlog/portfile.cmake | 8 +-- 2 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 ports/spdlog/fmt-external-cmake-option.patch diff --git a/ports/spdlog/fmt-external-cmake-option.patch b/ports/spdlog/fmt-external-cmake-option.patch new file mode 100644 index 000000000..635eb3b23 --- /dev/null +++ b/ports/spdlog/fmt-external-cmake-option.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc75346..5b3a5c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,12 @@ cmake_dependent_option(SPDLOG_BUILD_TESTING + "BUILD_TESTING" OFF + ) + ++option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) ++ ++if(SPDLOG_FMT_EXTERNAL) ++ find_package(fmt REQUIRED CONFIG) ++endif() ++ + target_include_directories( + spdlog + INTERFACE +@@ -66,6 +72,11 @@ target_include_directories( + "$" + ) + ++if(SPDLOG_FMT_EXTERNAL) ++ target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL) ++ target_link_libraries(spdlog INTERFACE fmt::fmt) ++endif() ++ + set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include") + + if(SPDLOG_BUILD_EXAMPLES) +@@ -88,7 +99,8 @@ set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}") + set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake") +-set(project_config "${PROJECT_NAME}Config.cmake") ++set(project_config "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") ++set(targets_config "${PROJECT_NAME}Targets.cmake") + set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc") + set(targets_export_name "${PROJECT_NAME}Targets") + set(namespace "${PROJECT_NAME}::") +@@ -101,6 +113,8 @@ write_basic_package_version_file( + + # configure pkg config file + configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY) ++# configure spdlogConfig.cmake file ++configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY) + + # install targets + install( +@@ -114,9 +128,9 @@ install( + DESTINATION "${include_install_dir}" + ) + +-# install project version file ++# install project config and version file + install( +- FILES "${version_config}" ++ FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" + ) + +@@ -126,19 +140,19 @@ install( + DESTINATION "${pkgconfig_install_dir}" + ) + +-# install project config file ++# install targets config file + install( + EXPORT "${targets_export_name}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" +- FILE ${project_config} ++ FILE ${targets_config} + ) + +-# export build directory config file ++# export build directory targets file + export( + EXPORT ${targets_export_name} + NAMESPACE "${namespace}" +- FILE ${project_config} ++ FILE ${targets_config} + ) + + # register project in CMake user registry +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index ba0b36f..0b0fd11 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -21,4 +21,11 @@ + # * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + # *************************************************************************/ + ++set(SPDLOG_FMT_EXTERNAL @SPDLOG_FMT_EXTERNAL@) ++ + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") ++ ++if(SPDLOG_FMT_EXTERNAL) ++ include(CMakeFindDependencyMacro) ++ find_dependency(fmt CONFIG) ++endif() diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 21f3121e9..f953af33d 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v1.2.1 SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 HEAD_REF v1.x + PATCHES + fmt-external-cmake-option.patch ) vcpkg_configure_cmake( @@ -13,6 +15,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DSPDLOG_BUILD_TESTING=OFF + -DSPDLOG_FMT_EXTERNAL=ON ) vcpkg_install_cmake() @@ -22,11 +25,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/spdlog) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -# use vcpkg-provided fmt library +# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) -file(READ ${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h SPDLOG_TWEAKME_CONTENTS) -string(REPLACE "// #define SPDLOG_FMT_EXTERNAL" "#define SPDLOG_FMT_EXTERNAL" SPDLOG_TWEAKME_CONTENTS "${SPDLOG_TWEAKME_CONTENTS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "${SPDLOG_TWEAKME_CONTENTS}") # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spdlog) -- cgit v1.2.3 From a6b12004c7b29353a68a142eaa7493ca997e05e7 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Mon, 17 Dec 2018 12:09:44 -0800 Subject: [vtk] add warning for libx11_xt_lib on linux --- ports/vtk/CONTROL | 2 +- ports/vtk/portfile.cmake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 01418b850..0eb485dcd 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-5 +Version: 8.1.0-6 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 86616fd1f..7a5536163 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") +endif() + include(vcpkg_common_functions) set(VTK_SHORT_VERSION "8.1") -- cgit v1.2.3 From 3439aef9c0dcf0e0111b51e64e3740a7b9213028 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Mon, 17 Dec 2018 15:58:45 -0800 Subject: [ffmpeg] Add patch for upstream fixes address build failures in pangolin that are related to updating the ffmpeg library by pulling in pangolin fix from upstream. --- ports/pangolin/CONTROL | 2 +- ports/pangolin/deprecated_constants.patch | 69 +++++++++++++++++++++++++++++++ ports/pangolin/portfile.cmake | 1 + 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 ports/pangolin/deprecated_constants.patch diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL index a515ba50e..f7f242293 100644 --- a/ports/pangolin/CONTROL +++ b/ports/pangolin/CONTROL @@ -1,4 +1,4 @@ Source: pangolin -Version: 0.5-3 +Version: 0.5-4 Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg Description: Lightweight GUI Library diff --git a/ports/pangolin/deprecated_constants.patch b/ports/pangolin/deprecated_constants.patch new file mode 100644 index 000000000..813d2360d --- /dev/null +++ b/ports/pangolin/deprecated_constants.patch @@ -0,0 +1,69 @@ +diff --git a/src/video/drivers/ffmpeg.cpp b/src/video/drivers/ffmpeg.cpp +index 435225d..ff30349 100644 +--- a/src/video/drivers/ffmpeg.cpp ++++ b/src/video/drivers/ffmpeg.cpp +@@ -34,6 +34,8 @@ extern "C" + #include + } + ++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++ + namespace pangolin + { + +@@ -74,8 +76,10 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt) + TEST_PIX_FMT_RETURN(YUVJ420P); + TEST_PIX_FMT_RETURN(YUVJ422P); + TEST_PIX_FMT_RETURN(YUVJ444P); ++#ifdef FF_API_XVMC + TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC); + TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT); ++#endif + TEST_PIX_FMT_RETURN(UYVY422); + TEST_PIX_FMT_RETURN(UYYVYY411); + TEST_PIX_FMT_RETURN(BGR8); +@@ -95,11 +99,13 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt) + TEST_PIX_FMT_RETURN(YUV440P); + TEST_PIX_FMT_RETURN(YUVJ440P); + TEST_PIX_FMT_RETURN(YUVA420P); ++#ifdef FF_API_VDPAU + TEST_PIX_FMT_RETURN(VDPAU_H264); + TEST_PIX_FMT_RETURN(VDPAU_MPEG1); + TEST_PIX_FMT_RETURN(VDPAU_MPEG2); + TEST_PIX_FMT_RETURN(VDPAU_WMV3); + TEST_PIX_FMT_RETURN(VDPAU_VC1); ++#endif + TEST_PIX_FMT_RETURN(RGB48BE ); + TEST_PIX_FMT_RETURN(RGB48LE ); + TEST_PIX_FMT_RETURN(RGB565BE); +@@ -119,7 +125,9 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt) + TEST_PIX_FMT_RETURN(YUV422P16BE); + TEST_PIX_FMT_RETURN(YUV444P16LE); + TEST_PIX_FMT_RETURN(YUV444P16BE); ++#ifdef FF_API_VDPAU + TEST_PIX_FMT_RETURN(VDPAU_MPEG4); ++#endif + TEST_PIX_FMT_RETURN(DXVA2_VLD); + TEST_PIX_FMT_RETURN(RGB444BE); + TEST_PIX_FMT_RETURN(RGB444LE); +@@ -559,7 +567,8 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame) + + int ret; + int got_packet = 1; +- ++ ++#if FF_API_LAVF_FMT_RAWPICTURE + // Setup AVPacket + if (recorder.oc->oformat->flags & AVFMT_RAWPICTURE) { + /* Raw video case - directly store the picture in the packet */ +@@ -569,6 +578,10 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame) + pkt.pts = frame->pts; + ret = 0; + } else { ++#else ++ { ++#endif ++ + /* encode the image */ + #if (LIBAVFORMAT_VERSION_MAJOR >= 54) + ret = avcodec_encode_video2(stream->codec, &pkt, frame, &got_packet); diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index 19763f0d6..b25378c56 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF v0.5 SHA512 7ebeec108f33f1aa8b1ad08e3ca128a837b22d33e3fc580021f981784043b023a1bf563bbfa8b51d46863db770b336d24fc84ee3d836b85e0da1848281b2a5b2 HEAD_REF master + PATCHES deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library ) file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake) -- cgit v1.2.3 From 9cbdb33caf9975e5bd8b76da80df04d7cbfaa9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mendakiewicz?= Date: Mon, 17 Dec 2018 16:15:15 -0800 Subject: get_versions should return all versions so the best match can be found (#4945) * get_versions should return all versions so the best match can be found * [vcpkg] Consider more than one path when searching for system binaries --- toolsrc/src/vcpkg/archives.cpp | 6 +- toolsrc/src/vcpkg/tools.cpp | 483 +++++++++++++++++++---------------------- 2 files changed, 226 insertions(+), 263 deletions(-) diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index 8943893d6..38efedf87 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -8,7 +8,11 @@ namespace vcpkg::Archives void extract_archive(const VcpkgPaths& paths, const fs::path& archive, const fs::path& to_path) { Files::Filesystem& fs = paths.get_filesystem(); - const fs::path to_path_partial = to_path.u8string() + ".partial"; + const fs::path to_path_partial = to_path.u8string() + ".partial" +#if defined(_WIN32) + + "." + std::to_string(GetCurrentProcessId()) +#endif + ; std::error_code ec; fs.remove_all(to_path, ec); diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index c623d816d..365271872 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -44,7 +44,7 @@ namespace vcpkg return result; } - static ToolData parse_tool_data_from_xml(const VcpkgPaths& paths, const std::string& tool) + static ExpectedT parse_tool_data_from_xml(const VcpkgPaths& paths, const std::string& tool) { #if defined(_WIN32) static constexpr StringLiteral OS_STRING = "windows"; @@ -53,13 +53,13 @@ namespace vcpkg #elif defined(__linux__) static constexpr StringLiteral OS_STRING = "linux"; #else - return ToolData{}; + return std::string("operating system is unknown"); #endif #if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) 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"###()###"}; + static const std::regex XML_VERSION_REGEX {R"###()###"}; static const std::string XML = paths.get_filesystem().read_contents(XML_PATH).value_or_exit(VCPKG_LINE_INFO); std::smatch match_xml_version; const bool has_xml_version = std::regex_search(XML.cbegin(), XML.cend(), match_xml_version, XML_VERSION_REGEX); @@ -67,22 +67,22 @@ namespace vcpkg has_xml_version, R"(Could not find in %s)", XML_VERSION, - XML_PATH.generic_string()); + XML_PATH.u8string()); Checks::check_exit(VCPKG_LINE_INFO, XML_VERSION == match_xml_version[1], "Expected %s version: [%s], but was [%s]. Please re-run bootstrap-vcpkg.", - XML_PATH.generic_string(), + XML_PATH.u8string(), XML_VERSION, match_xml_version[1]); - const std::regex tool_regex{Strings::format(R"###()###", tool, OS_STRING)}; + const std::regex tool_regex {Strings::format(R"###()###", tool, OS_STRING)}; std::smatch match_tool_entry; const bool has_tool_entry = std::regex_search(XML.cbegin(), XML.cend(), match_tool_entry, tool_regex); - Checks::check_exit(VCPKG_LINE_INFO, - has_tool_entry, - "Could not find entry for tool [%s] in %s", - tool, - XML_PATH.generic_string()); + if (!has_tool_entry) + { + return Strings::format( + "Could not find entry for tool %s in %s for os=%s", tool, XML_PATH.u8string(), OS_STRING); + } const std::string tool_data = StringRange::find_exactly_one_enclosed(XML, match_tool_entry[0], "").to_string(); @@ -106,13 +106,13 @@ namespace vcpkg const fs::path tool_dir_path = paths.tools / tool_dir_name; const fs::path exe_path = tool_dir_path / exe_relative_path; - return ToolData{*version.get(), - exe_path, - url, - paths.downloads / archive_name.value_or(exe_relative_path).to_string(), - archive_name.has_value(), - tool_dir_path, - sha512}; + return ToolData {*version.get(), + exe_path, + url, + paths.downloads / archive_name.value_or(exe_relative_path).to_string(), + archive_name.has_value(), + tool_dir_path, + sha512}; #endif } @@ -122,55 +122,43 @@ namespace vcpkg std::string version; }; - static Optional find_first_with_sufficient_version(const std::vector& candidates, - const std::array& expected_version) + struct ToolProvider { - const auto it = Util::find_if(candidates, [&](const PathAndVersion& candidate) { - const auto parsed_version = parse_version_string(candidate.version); - if (!parsed_version.has_value()) - { - return false; - } + virtual const std::string& tool_data_name() const = 0; + virtual const std::string& exe_stem() const = 0; + virtual std::array default_min_version() const = 0; - const std::array actual_version = *parsed_version.get(); - return actual_version[0] > expected_version[0] || - (actual_version[0] == expected_version[0] && actual_version[1] > expected_version[1]) || - (actual_version[0] == expected_version[0] && actual_version[1] == expected_version[1] && - actual_version[2] >= expected_version[2]); - }); + virtual void add_special_paths(std::vector& out_candidate_paths) const {} + virtual Optional get_version(const fs::path& path_to_exe) const = 0; + }; - if (it == candidates.cend()) + static Optional find_first_with_sufficient_version(const Files::Filesystem& fs, + const ToolProvider& tool_provider, + const std::vector& candidates, + const std::array& expected_version) + { + for (auto&& candidate : candidates) { - return nullopt; + if (!fs.exists(candidate)) continue; + auto maybe_version = tool_provider.get_version(candidate); + const auto version = maybe_version.get(); + if (!version) continue; + const auto parsed_version = parse_version_string(*version); + if (!parsed_version) continue; + auto& actual_version = *parsed_version.get(); + const auto version_acceptable = + actual_version[0] > expected_version[0] || + (actual_version[0] == expected_version[0] && actual_version[1] > expected_version[1]) || + (actual_version[0] == expected_version[0] && actual_version[1] == expected_version[1] && + actual_version[2] >= expected_version[2]); + if (!version_acceptable) continue; + + return PathAndVersion {candidate, *version}; } - return *it; + return nullopt; } - struct VersionProvider - { - virtual Optional get_version(const fs::path& path_to_exe) const = 0; - - std::vector get_versions(const std::vector& candidate_paths) const - { - auto&& fs = Files::get_real_filesystem(); - - std::vector output; - for (auto&& p : candidate_paths) - { - if (!fs.exists(p)) continue; - auto maybe_version = this->get_version(p); - if (const auto version = maybe_version.get()) - { - output.emplace_back(PathAndVersion{p, *version}); - return output; - } - } - - return output; - } - }; - static fs::path fetch_tool(const VcpkgPaths& paths, const std::string& tool_name, const ToolData& tool_data) { const std::array& version = tool_data.version; @@ -220,76 +208,90 @@ namespace vcpkg } static PathAndVersion fetch_tool(const VcpkgPaths& paths, - const std::string& tool_name, - const ToolData& tool_data, - const VersionProvider& version_provider) + const ToolProvider& tool_provider, + const ToolData& tool_data) { - const auto downloaded_path = fetch_tool(paths, tool_name, tool_data); - const auto downloaded_version = version_provider.get_version(downloaded_path).value_or_exit(VCPKG_LINE_INFO); + const auto downloaded_path = fetch_tool(paths, tool_provider.tool_data_name(), tool_data); + const auto downloaded_version = tool_provider.get_version(downloaded_path).value_or_exit(VCPKG_LINE_INFO); return {downloaded_path, downloaded_version}; } - namespace CMake + static PathAndVersion get_path(const VcpkgPaths& paths, const ToolProvider& tool) { - struct CmakeVersionProvider : VersionProvider + auto& fs = paths.get_filesystem(); + + std::array min_version = tool.default_min_version(); + + std::vector candidate_paths; + auto maybe_tool_data = parse_tool_data_from_xml(paths, tool.tool_data_name()); + if (auto tool_data = maybe_tool_data.get()) { - Optional get_version(const fs::path& path_to_exe) const override - { - const std::string cmd = Strings::format(R"("%s" --version)", path_to_exe.u8string()); - const auto rc = System::cmd_execute_and_capture_output(cmd); - if (rc.exit_code != 0) - { - return nullopt; - } + candidate_paths.push_back(tool_data->exe_path); + min_version = tool_data->version; + } - /* Sample output: - cmake version 3.10.2 + auto& exe_stem = tool.exe_stem(); + if (!exe_stem.empty()) + { + auto paths_from_path = fs.find_from_PATH(exe_stem); + candidate_paths.insert(candidate_paths.end(), paths_from_path.cbegin(), paths_from_path.cend()); + } - CMake suite maintained and supported by Kitware (kitware.com/cmake). - */ - return StringRange::find_exactly_one_enclosed(rc.output, "cmake version ", "\n").to_string(); - } - }; + tool.add_special_paths(candidate_paths); - static PathAndVersion get_path(const VcpkgPaths& paths) + const auto maybe_path = find_first_with_sufficient_version(fs, tool, candidate_paths, min_version); + if (const auto p = maybe_path.get()) { - if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) - { - return {"cmake", "0"}; - } + return *p; + } + if (auto tool_data = maybe_tool_data.get()) + { + return fetch_tool(paths, tool, *tool_data); + } - std::vector candidate_paths; -#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) - static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "cmake"); - candidate_paths.push_back(TOOL_DATA.exe_path); -#else - static const ToolData TOOL_DATA = ToolData{{3, 5, 1}, ""}; -#endif - const std::vector from_path = paths.get_filesystem().find_from_PATH("cmake"); - candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); + Checks::exit_with_message(VCPKG_LINE_INFO, maybe_tool_data.error()); + } + + struct CMakeProvider : ToolProvider + { + std::string m_exe = "cmake"; + + virtual const std::string& tool_data_name() const override { return m_exe; } + virtual const std::string& exe_stem() const override { return m_exe; } + virtual std::array default_min_version() const override { return {3, 5, 1}; } + virtual void add_special_paths(std::vector& out_candidate_paths) const override + { +#if defined(_WIN32) const auto& program_files = System::get_program_files_platform_bitness(); - if (const auto pf = program_files.get()) candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe"); + if (const auto pf = program_files.get()) out_candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe"); const auto& program_files_32_bit = System::get_program_files_32_bit(); if (const auto pf = program_files_32_bit.get()) - candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe"); - - const CmakeVersionProvider version_provider{}; - const std::vector candidates_with_versions = version_provider.get_versions(candidate_paths); - const auto maybe_path = find_first_with_sufficient_version(candidates_with_versions, TOOL_DATA.version); - if (const auto p = maybe_path.get()) + out_candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe"); +#endif + } + virtual Optional get_version(const fs::path& path_to_exe) const override + { + const std::string cmd = Strings::format(R"("%s" --version)", path_to_exe.u8string()); + const auto rc = System::cmd_execute_and_capture_output(cmd); + if (rc.exit_code != 0) { - return *p; + return nullopt; } - return fetch_tool(paths, Tools::CMAKE, TOOL_DATA, version_provider); + /* Sample output: +cmake version 3.10.2 + +CMake suite maintained and supported by Kitware (kitware.com/cmake). + */ + return StringRange::find_exactly_one_enclosed(rc.output, "cmake version ", "\n").to_string(); } - } + }; static fs::path get_7za_path(const VcpkgPaths& paths) { #if defined(_WIN32) - static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "7zip"); + static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "7zip").value_or_exit(VCPKG_LINE_INFO); if (!paths.get_filesystem().exists(TOOL_DATA.exe_path)) { return fetch_tool(paths, "7zip", TOOL_DATA); @@ -300,195 +302,131 @@ namespace vcpkg #endif } - namespace Ninja + struct NinjaProvider : ToolProvider { - struct NinjaVersionProvider : VersionProvider - { - Optional get_version(const fs::path& path_to_exe) const override - { - const std::string cmd = Strings::format(R"("%s" --version)", path_to_exe.u8string()); - const auto rc = System::cmd_execute_and_capture_output(cmd); - if (rc.exit_code != 0) - { - return nullopt; - } + std::string m_exe = "ninja"; - /* Sample output: - 1.8.2 - */ - return rc.output; - } - }; + virtual const std::string& tool_data_name() const override { return m_exe; } + virtual const std::string& exe_stem() const override { return m_exe; } + virtual std::array default_min_version() const override { return {3, 5, 1}; } - static PathAndVersion get_path(const VcpkgPaths& paths) + virtual Optional get_version(const fs::path& path_to_exe) const override { - if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) - { - return {"ninja", "0"}; - } - - static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "ninja"); - - std::vector candidate_paths; - candidate_paths.push_back(TOOL_DATA.exe_path); - const std::vector from_path = paths.get_filesystem().find_from_PATH("ninja"); - candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); - - const NinjaVersionProvider version_provider{}; - const std::vector candidates_with_versions = version_provider.get_versions(candidate_paths); - const auto maybe_path = find_first_with_sufficient_version(candidates_with_versions, TOOL_DATA.version); - if (const auto p = maybe_path.get()) + const std::string cmd = Strings::format(R"("%s" --version)", path_to_exe.u8string()); + const auto rc = System::cmd_execute_and_capture_output(cmd); + if (rc.exit_code != 0) { - return *p; + return nullopt; } - return fetch_tool(paths, Tools::NINJA, TOOL_DATA, version_provider); + /* Sample output: +1.8.2 + */ + return rc.output; } - } + }; - namespace Nuget + struct NuGetProvider : ToolProvider { - struct NugetVersionProvider : VersionProvider - { - Optional get_version(const fs::path& path_to_exe) const override - { - const std::string cmd = Strings::format(R"("%s")", path_to_exe.u8string()); - const auto rc = System::cmd_execute_and_capture_output(cmd); - if (rc.exit_code != 0) - { - return nullopt; - } + std::string m_exe = "nuget"; - /* Sample output: - NuGet Version: 4.6.2.5055 - usage: NuGet [args] [options] - Type 'NuGet help ' for help on a specific command. - - [[[List of available commands follows]]] - */ - return StringRange::find_exactly_one_enclosed(rc.output, "NuGet Version: ", "\n").to_string(); - } - }; + virtual const std::string& tool_data_name() const override { return m_exe; } + virtual const std::string& exe_stem() const override { return m_exe; } + virtual std::array default_min_version() const override { return {4, 6, 2}; } - static PathAndVersion get_path(const VcpkgPaths& paths) + virtual Optional get_version(const fs::path& path_to_exe) const override { - static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "nuget"); - - std::vector candidate_paths; - candidate_paths.push_back(TOOL_DATA.exe_path); - const std::vector from_path = paths.get_filesystem().find_from_PATH("nuget"); - candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); - - const NugetVersionProvider version_provider{}; - const std::vector candidates_with_versions = version_provider.get_versions(candidate_paths); - const auto maybe_path = find_first_with_sufficient_version(candidates_with_versions, TOOL_DATA.version); - if (const auto p = maybe_path.get()) + const std::string cmd = Strings::format(R"("%s")", path_to_exe.u8string()); + const auto rc = System::cmd_execute_and_capture_output(cmd); + if (rc.exit_code != 0) { - return *p; + return nullopt; } - return fetch_tool(paths, Tools::NUGET, TOOL_DATA, version_provider); + /* Sample output: +NuGet Version: 4.6.2.5055 +usage: NuGet [args] [options] +Type 'NuGet help ' for help on a specific command. + +[[[List of available commands follows]]] + */ + return StringRange::find_exactly_one_enclosed(rc.output, "NuGet Version: ", "\n").to_string(); } - } + }; - namespace Git + struct GitProvider : ToolProvider { - struct GitVersionProvider : VersionProvider - { - Optional get_version(const fs::path& path_to_exe) const override - { - const std::string cmd = Strings::format(R"("%s" --version)", path_to_exe.u8string()); - const auto rc = System::cmd_execute_and_capture_output(cmd); - if (rc.exit_code != 0) - { - return nullopt; - } + std::string m_exe = "git"; - /* Sample output: - 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); - } - }; + virtual const std::string& tool_data_name() const override { return m_exe; } + virtual const std::string& exe_stem() const override { return m_exe; } + virtual std::array default_min_version() const override { return {2, 7, 4}; } - static PathAndVersion get_path(const VcpkgPaths& paths) + virtual void add_special_paths(std::vector& out_candidate_paths) const { - static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "git"); - - std::vector candidate_paths; #if defined(_WIN32) - candidate_paths.push_back(TOOL_DATA.exe_path); -#endif - const std::vector from_path = paths.get_filesystem().find_from_PATH("git"); - candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); - const auto& program_files = System::get_program_files_platform_bitness(); - if (const auto pf = program_files.get()) candidate_paths.push_back(*pf / "git" / "cmd" / "git.exe"); + if (const auto pf = program_files.get()) out_candidate_paths.push_back(*pf / "git" / "cmd" / "git.exe"); const auto& program_files_32_bit = System::get_program_files_32_bit(); - if (const auto pf = program_files_32_bit.get()) candidate_paths.push_back(*pf / "git" / "cmd" / "git.exe"); + if (const auto pf = program_files_32_bit.get()) + out_candidate_paths.push_back(*pf / "git" / "cmd" / "git.exe"); +#endif + } - const GitVersionProvider version_provider{}; - const std::vector candidates_with_versions = version_provider.get_versions(candidate_paths); - const auto maybe_path = find_first_with_sufficient_version(candidates_with_versions, TOOL_DATA.version); - if (const auto p = maybe_path.get()) + virtual Optional get_version(const fs::path& path_to_exe) const override + { + const std::string cmd = Strings::format(R"("%s" --version)", path_to_exe.u8string()); + const auto rc = System::cmd_execute_and_capture_output(cmd); + if (rc.exit_code != 0) { - return *p; + return nullopt; } - return fetch_tool(paths, Tools::GIT, TOOL_DATA, version_provider); + /* Sample output: +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); } - } + }; - namespace IfwInstallerBase + struct IfwInstallerBaseProvider : ToolProvider { - struct IfwInstallerBaseVersionProvider : VersionProvider - { - Optional get_version(const fs::path& path_to_exe) const override - { - const std::string cmd = Strings::format(R"("%s" --framework-version)", path_to_exe.u8string()); - const auto rc = System::cmd_execute_and_capture_output(cmd); - if (rc.exit_code != 0) - { - return nullopt; - } + std::string m_exe = ""; + std::string m_toolname = "installerbase"; - /* Sample output: - 3.1.81 - */ - return rc.output; - } - }; + virtual const std::string& tool_data_name() const override { return m_toolname; } + virtual const std::string& exe_stem() const override { return m_exe; } + virtual std::array default_min_version() const override { return {0, 0, 0}; } - static PathAndVersion get_path(const VcpkgPaths& paths) + virtual void add_special_paths(std::vector& out_candidate_paths) const { - static const ToolData TOOL_DATA = parse_tool_data_from_xml(paths, "installerbase"); - - std::vector candidate_paths; - candidate_paths.push_back(TOOL_DATA.exe_path); // TODO: Uncomment later // const std::vector from_path = Files::find_from_PATH("installerbase"); // candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); - // candidate_paths.push_back(fs::path(System::get_environment_variable("HOMEDRIVE").value_or("C:")) / "Qt" / - // "Tools" / "QtInstallerFramework" / "3.1" / "bin" / "installerbase.exe"); - // candidate_paths.push_back(fs::path(System::get_environment_variable("HOMEDRIVE").value_or("C:")) / "Qt" / - // "QtIFW-3.1.0" / "bin" / "installerbase.exe"); - - const IfwInstallerBaseVersionProvider version_provider{}; - const std::vector candidates_with_versions = version_provider.get_versions(candidate_paths); - const auto maybe_path = find_first_with_sufficient_version(candidates_with_versions, TOOL_DATA.version); - if (const auto p = maybe_path.get()) + // candidate_paths.push_back(fs::path(System::get_environment_variable("HOMEDRIVE").value_or("C:")) / + // "Qt" / "Tools" / "QtInstallerFramework" / "3.1" / "bin" / "installerbase.exe"); + // candidate_paths.push_back(fs::path(System::get_environment_variable("HOMEDRIVE").value_or("C:")) / + // "Qt" / "QtIFW-3.1.0" / "bin" / "installerbase.exe"); + } + + virtual Optional get_version(const fs::path& path_to_exe) const override + { + const std::string cmd = Strings::format(R"("%s" --framework-version)", path_to_exe.u8string()); + const auto rc = System::cmd_execute_and_capture_output(cmd); + if (rc.exit_code != 0) { - return *p; + return nullopt; } - return fetch_tool(paths, Tools::IFW_INSTALLER_BASE, TOOL_DATA, version_provider); + /* Sample output: +3.1.81 + */ + return rc.output; } - } + }; struct ToolCacheImpl final : ToolCache { @@ -506,12 +444,12 @@ namespace vcpkg tool == Tools::IFW_INSTALLER_BASE) return get_tool_pathversion(paths, tool).path; if (tool == Tools::IFW_BINARYCREATOR) - return IfwInstallerBase::get_path(paths).path.parent_path() / "binarycreator.exe"; + return get_tool_path(paths, Tools::IFW_INSTALLER_BASE).parent_path() / "binarycreator.exe"; if (tool == Tools::IFW_REPOGEN) - return IfwInstallerBase::get_path(paths).path.parent_path() / "repogen.exe"; + return get_tool_path(paths, Tools::IFW_INSTALLER_BASE).parent_path() / "repogen.exe"; // For other tools, we simply always auto-download them. - const ToolData tool_data = parse_tool_data_from_xml(paths, tool); + const ToolData tool_data = parse_tool_data_from_xml(paths, tool).value_or_exit(VCPKG_LINE_INFO); if (paths.get_filesystem().exists(tool_data.exe_path)) { return tool_data.exe_path; @@ -522,12 +460,33 @@ namespace vcpkg const PathAndVersion& get_tool_pathversion(const VcpkgPaths& paths, const std::string& tool) const { - return path_version_cache.get_lazy(tool, [&]() { - if (tool == Tools::CMAKE) return CMake::get_path(paths); - if (tool == Tools::GIT) return Git::get_path(paths); - if (tool == Tools::NINJA) return Ninja::get_path(paths); - if (tool == Tools::NUGET) return Nuget::get_path(paths); - if (tool == Tools::IFW_INSTALLER_BASE) return IfwInstallerBase::get_path(paths); + return path_version_cache.get_lazy(tool, [&]() -> PathAndVersion { + if (tool == Tools::CMAKE) + { + if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) + { + return {"cmake", "0"}; + } + return get_path(paths, CMakeProvider()); + } + if (tool == Tools::GIT) + { + if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) + { + return {"git", "0"}; + } + return get_path(paths, GitProvider()); + } + if (tool == Tools::NINJA) + { + if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) + { + return {"ninja", "0"}; + } + return get_path(paths, NinjaProvider()); + } + if (tool == Tools::NUGET) return get_path(paths, NuGetProvider()); + if (tool == Tools::IFW_INSTALLER_BASE) return get_path(paths, IfwInstallerBaseProvider()); Checks::exit_with_message(VCPKG_LINE_INFO, "Finding version for %s is not implemented yet.", tool); }); -- cgit v1.2.3 From ac1bed33add8890834bd97f7cdaa822bceb44a37 Mon Sep 17 00:00:00 2001 From: ivysnow Date: Tue, 18 Dec 2018 08:25:55 +0800 Subject: [libuv] fix for cmake target (#4803) * [libuv] fix for cmake target * [libuv] rename target to unofficial-libuv --- ports/libuv/CMakeLists.txt | 4 +++- ports/libuv/CONTROL | 2 +- ports/libuv/portfile.cmake | 7 +++++++ ports/libuv/unofficial-libuv-config.in.cmake | 7 +++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ports/libuv/unofficial-libuv-config.in.cmake diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt index c4b7c3882..0f46ec07e 100644 --- a/ports/libuv/CMakeLists.txt +++ b/ports/libuv/CMakeLists.txt @@ -60,7 +60,7 @@ else() # Assume some Linux variant add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX}) endif() -target_include_directories(libuv PUBLIC ./include PRIVATE ./src) +target_include_directories(libuv PUBLIC $ $ $) set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED) if(NOT UV_SKIP_HEADERS) @@ -71,7 +71,9 @@ if(NOT UV_SKIP_HEADERS) endif() install(TARGETS libuv + EXPORT libuv RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) +install(EXPORT libuv FILE unofficial-libuv-targets.cmake NAMESPACE unofficial::libuv:: DESTINATION share/unofficial-libuv) diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index e90eaa545..7a8a79098 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.24.0 +Version: 1.24.0-1 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 782d946c3..76077fc3d 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -18,8 +18,15 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libuv TARGET_PATH share/unofficial-libuv) vcpkg_copy_pdbs() +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake + @ONLY +) + file(READ ${CURRENT_PACKAGES_DIR}/include/uv.h UV_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}") diff --git a/ports/libuv/unofficial-libuv-config.in.cmake b/ports/libuv/unofficial-libuv-config.in.cmake new file mode 100644 index 000000000..7ff66b12c --- /dev/null +++ b/ports/libuv/unofficial-libuv-config.in.cmake @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-targets.cmake) -- cgit v1.2.3 From ae2b0639a322824e1b69afad6ae855230d16c948 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Mon, 17 Dec 2018 16:26:56 -0800 Subject: [graphqlparser] Use default library type for the platform instead of specifying SHARED (#4794) * Use default library type for the platform instead of specifying SHARED * [graphqlparser] Bump control version and slight cleanup * [vcpkg_find_acquire_program] Correct for previous corruption of CI --- ports/graphqlparser/CONTROL | 2 +- ports/graphqlparser/portfile.cmake | 20 ++------ ports/graphqlparser/win-cmake.patch | 66 ++++++++++++-------------- scripts/cmake/vcpkg_find_acquire_program.cmake | 3 ++ 4 files changed, 40 insertions(+), 51 deletions(-) diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL index 4a66842c0..0f6ed481e 100644 --- a/ports/graphqlparser/CONTROL +++ b/ports/graphqlparser/CONTROL @@ -1,3 +1,3 @@ Source: graphqlparser -Version: v0.7.0 +Version: 0.7.0 Description: A GraphQL query parser in C++ with C and C++ APIs diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake index 0e1414583..6e175fe6b 100644 --- a/ports/graphqlparser/portfile.cmake +++ b/ports/graphqlparser/portfile.cmake @@ -1,15 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) vcpkg_from_github( @@ -18,7 +6,7 @@ vcpkg_from_github( REF v0.7.0 SHA512 973292b164d0d2cfe453a2f01559dbdb1b9d22b6304f6a3aabf71e2c0a3e24ab69dfd72a086764ad5befecf0005620f8e86f552dacc324f9615a05f31de7cede HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/win-cmake.patch + PATCHES win-cmake.patch ) if(UNIX) @@ -28,7 +16,7 @@ if(UNIX) ) elseif(WIN32) vcpkg_find_acquire_program(PYTHON2) - vcpkg_find_acquire_program(FLEX) + vcpkg_find_acquire_program(FLEX) # vcpkg_find_acquire_program(BISON) get_filename_component(VCPKG_DOWNLOADS_PYTHON2_DIR "${PYTHON2}" DIRECTORY) @@ -47,5 +35,7 @@ endif() vcpkg_install_cmake() +vcpkg_copy_pdbs() + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphqlparser RENAME copyright) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/graphqlparser/copyright COPYONLY) diff --git a/ports/graphqlparser/win-cmake.patch b/ports/graphqlparser/win-cmake.patch index c71ba97ff..bd2f4c7c1 100644 --- a/ports/graphqlparser/win-cmake.patch +++ b/ports/graphqlparser/win-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4c8b3e..f19cda3 100644 +index c4c8b3e..3373d82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3,16 +3,37 @@ PROJECT(libgraphqlparser C CXX) +@@ -3,9 +3,26 @@ PROJECT(libgraphqlparser C CXX) SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") @@ -31,19 +31,7 @@ index c4c8b3e..f19cda3 100644 FIND_PACKAGE(PythonInterp 2 REQUIRED) IF (NOT PYTHON_VERSION_MAJOR EQUAL 2) - MESSAGE(FATAL_ERROR "Python 2 is required.") - ENDIF() - --FIND_PROGRAM(CTYPESGEN_FOUND ctypesgen.py) -+IF(UNIX) -+ SET(FLEX_COMPILE_FLAGS "--header-file=lexer.h") -+ELSEIF(WIN32) -+ SET(FLEX_COMPILE_FLAGS "--header-file=lexer.h --wincompat") -+ENDIF() - - FIND_PACKAGE(BISON 3) - FIND_PACKAGE(FLEX) -@@ -21,7 +42,7 @@ IF (BISON_FOUND) +@@ -21,7 +38,7 @@ IF (BISON_FOUND) ENDIF() IF(FLEX_FOUND) @@ -52,20 +40,27 @@ index c4c8b3e..f19cda3 100644 IF (BISON_FOUND) ADD_FLEX_BISON_DEPENDENCY(GraphQLScanner graphqlparser) ENDIF() -@@ -83,11 +104,8 @@ GENERATE_AST_FILE(cxx_json_visitor_header JsonVisitor.h.inc) +@@ -31,7 +48,7 @@ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/c) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - GENERATE_AST_FILE(cxx_json_visitor_impl JsonVisitor.cpp.inc) +-ADD_LIBRARY(graphqlparser SHARED ++ADD_LIBRARY(graphqlparser + JsonVisitor.cpp + ${CMAKE_CURRENT_BINARY_DIR}/Ast.h + ${CMAKE_CURRENT_BINARY_DIR}/Ast.cpp +@@ -87,7 +104,9 @@ ADD_SUBDIRECTORY(python) --ADD_SUBDIRECTORY(python) -- --OPTION(test "Build tests." OFF) -- - INSTALL(DIRECTORY c ${CMAKE_CURRENT_BINARY_DIR}/c DESTINATION include/graphqlparser + OPTION(test "Build tests." OFF) + +-INSTALL(DIRECTORY c ${CMAKE_CURRENT_BINARY_DIR}/c DESTINATION include/graphqlparser ++INSTALL(DIRECTORY c ${CMAKE_CURRENT_BINARY_DIR}/c ++ DESTINATION include/graphqlparser + CONFIGURATIONS Release FILES_MATCHING PATTERN "*.h" PATTERN "build" EXCLUDE) -@@ -103,9 +121,12 @@ INSTALL(FILES +@@ -103,9 +122,13 @@ INSTALL(FILES position.hh stack.hh syntaxdefs.h @@ -75,12 +70,13 @@ index c4c8b3e..f19cda3 100644 + INSTALL(TARGETS graphqlparser - LIBRARY DESTINATION lib) ++ ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin) if (UNIX) # generate pkgconfig file -@@ -116,16 +137,9 @@ if (UNIX) +@@ -116,6 +139,11 @@ if (UNIX) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libgraphqlparser.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") endif() @@ -90,15 +86,15 @@ index c4c8b3e..f19cda3 100644 + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb + DESTINATION bin) endif() + + IF (test) +@@ -126,6 +154,8 @@ IF (test) + ADD_CUSTOM_TARGET(memcheck + valgrind --leak-check=full --suppressions=./test/valgrind.supp --dsymutil=yes --error-exitcode=1 ./test/runTests >/dev/null + ) ++ else() ++ ADD_CUSTOM_TARGET(runTests ++ ./test/runTests >/dev/null) + endif() - --IF (test) -- ADD_SUBDIRECTORY(test) -- -- if(UNIX) -- # setup valgrind -- ADD_CUSTOM_TARGET(memcheck -- valgrind --leak-check=full --suppressions=./test/valgrind.supp --dsymutil=yes --error-exitcode=1 ./test/runTests >/dev/null -- ) -- endif() -- --ENDIF() + ENDIF() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index ebe46b335..b6cfc4aab 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -153,6 +153,9 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4" AND SUBDIR STREQUAL "win_flex-2.5.16") + file(REMOVE_RECURSE "${PATHS}") + endif() else() set(PROGNAME flex) set(APT_PACKAGE_NAME flex) -- cgit v1.2.3 From 411d1332ada32750ae9993654cf38b9e3dd2c72d Mon Sep 17 00:00:00 2001 From: OWenT Date: Tue, 18 Dec 2018 08:28:13 +0800 Subject: add libcopp (#4918) * add libcopp * [libcopp] Disable ninja due to asm issue. Tweak/install usage file. Prefer static linking over CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS. Use vcpkg_fixup_cmake_targets. --- ports/libcopp/CONTROL | 3 +++ ports/libcopp/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/libcopp/usage | 5 +++++ 3 files changed, 38 insertions(+) create mode 100644 ports/libcopp/CONTROL create mode 100644 ports/libcopp/portfile.cmake create mode 100644 ports/libcopp/usage diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL new file mode 100644 index 000000000..35fca9b7e --- /dev/null +++ b/ports/libcopp/CONTROL @@ -0,0 +1,3 @@ +Source: libcopp +Version: 1.1.0-1 +Description: A cross-platfrom coroutine library for C++ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake new file mode 100644 index 000000000..85b2de09c --- /dev/null +++ b/ports/libcopp/portfile.cmake @@ -0,0 +1,30 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO owt5008137/libcopp + REF 1.1.0 + SHA512 27b444d158281786154830c6e216e701ba0301af1d7a08873b33e27ce3d2db6ddb4753239878633f4c2aed9f759b46f961408a2eb7b50b5d445c3531c1fa9546 + HEAD_REF v2 +) + +# Use libcopp's own build process, skipping examples and tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # PREFER_NINJA # Disabled because Ninja does not invoke masm correctly for this project +) +vcpkg_install_cmake() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/libcopp) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp) +file(COPY ${SOURCE_PATH}/BOOST_LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp/copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libcopp/usage b/ports/libcopp/usage new file mode 100644 index 000000000..4593a42ad --- /dev/null +++ b/ports/libcopp/usage @@ -0,0 +1,5 @@ +The package libcopp provides CMake integration: + + find_package(Libcopp CONFIG REQUIRED) + target_include_directories(main PRIVATE ${Libcopp_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${Libcotask_LIBRARIES} ${Libcopp_LIBRARIES}) -- cgit v1.2.3 From ffbff8caabd2fa7e853df18e9d04c391fcc06076 Mon Sep 17 00:00:00 2001 From: Todor Prokopov Date: Tue, 18 Dec 2018 02:30:27 +0200 Subject: Wt Linux fixes (#4927) * [harfbuzz] Fix build on Linux * [cairo] Fix build on Linux * [pango] Fix build on Linux * [wt] Fix build on Linux * [wt] Fix linking with -lcrypto --- ports/cairo/CMakeLists.txt | 3 ++- ports/cairo/CONTROL | 2 +- ports/harfbuzz/CONTROL | 2 +- ports/harfbuzz/glib-cmake.patch | 6 ++++-- ports/pango/CMakeLists.txt | 2 ++ ports/pango/CONTROL | 2 +- ports/wt/0004-link-ssl.patch | 46 +++++++++++++++++++++++++++++++++++++++++ ports/wt/CONTROL | 2 +- ports/wt/portfile.cmake | 8 ++++++- 9 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 ports/wt/0004-link-ssl.patch diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index 137dba7f3..9fc476539 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -160,6 +160,7 @@ endif() set(CMAKE_DEBUG_POSTFIX "d") +find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) find_package(Freetype REQUIRED) @@ -176,7 +177,7 @@ add_definitions( -DHAVE_FT_GET_X11_FONT_FORMAT=1) # additional features for macOS -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +if((CMAKE_SYSTEM_NAME STREQUAL "Darwin") OR (CMAKE_SYSTEM_NAME STREQUAL "Linux")) add_definitions( -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 2f182e84b..365fe38e7 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,4 +1,4 @@ Source: cairo -Version: 1.15.8-3 +Version: 1.15.8-4 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, glib, freetype, fontconfig diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index f3c58ee6e..32d70f5ec 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 1.8.4-2 +Version: 1.8.4-3 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, ragel Default-Features: ucdn diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch index cdd7f48a6..ddbc96712 100644 --- a/ports/harfbuzz/glib-cmake.patch +++ b/ports/harfbuzz/glib-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c52731..8305f27 100644 +index 2d6e77e8..36e4b4e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -314,22 +314,12 @@ endif () +@@ -306,22 +306,14 @@ endif () if (HB_HAVE_GLIB) add_definitions(-DHAVE_GLIB) @@ -15,6 +15,8 @@ index 3c52731..8305f27 100644 - 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(unofficial-iconv REQUIRED) + find_package(unofficial-glib CONFIG REQUIRED) list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc) diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index 71b5f9fed..cc21d3eee 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -14,9 +14,11 @@ endif() add_definitions(-DHAVE_CONFIG_H) include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR}) +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") # find libintl find_path(LIBINTL_INCLUDE_DIR libintl.h) find_library(LIBINTL_LIBRARY NAMES libintl intl) +endif() # find glib find_path(GLIB_INCLUDE_DIR glib.h) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index e7b365e0b..9b176290b 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,4 +1,4 @@ Source: pango -Version: 1.40.11-2 +Version: 1.40.11-3 Description: Text and font handling library. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static) diff --git a/ports/wt/0004-link-ssl.patch b/ports/wt/0004-link-ssl.patch new file mode 100644 index 000000000..8579223dc --- /dev/null +++ b/ports/wt/0004-link-ssl.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt +index c5f7bbc8..6e2c2f4d 100644 +--- a/cmake/WtFindSsl.txt ++++ b/cmake/WtFindSsl.txt +@@ -121,6 +121,16 @@ ELSEIF(APPLE) + /usr/local/lib + NO_DEFAULT_PATH + ) ++ FIND_LIBRARY(CRYPTO_LIB ++ NAMES ++ crypto ++ PATHS ++ ${SSL_PREFIX}/lib ++ ${SSL_PREFIX}/lib/VC ++ /usr/lib ++ /usr/local/lib ++ NO_DEFAULT_PATH ++ ) + ELSE (WIN32) + FIND_LIBRARY(SSL_LIB + NAMES +@@ -131,6 +141,15 @@ ELSE (WIN32) + /usr/lib + /usr/local/lib + ) ++ FIND_LIBRARY(CRYPTO_LIB ++ NAMES ++ crypto ++ PATHS ++ ${SSL_PREFIX}/lib ++ ${SSL_PREFIX}/lib/VC ++ /usr/lib ++ /usr/local/lib ++ ) + ENDIF (WIN32) + + IF(SSL_LIB +@@ -144,7 +163,7 @@ IF(SSL_LIB + ENDIF(SSL_TOO_LIB) + ELSE(WIN32) + SET(SSL_FOUND true) +- SET(SSL_LIBRARIES ${SSL_LIB} -lcrypto) ++ SET(SSL_LIBRARIES ${SSL_LIB} ${CRYPTO_LIB}) + ENDIF(WIN32) + ENDIF(SSL_LIB + AND SSL_INCLUDE_DIRS) diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index ff99b10b5..a66c39f42 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,4 @@ Source: wt -Version: 4.0.4 +Version: 4.0.4-2 Description: Wt is a C++ library for developing web applications Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 614480168..0ac9fef61 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 0001-boost-1.66.patch 0002-link-glew.patch 0003-disable-boost-autolink.patch + 0004-link-ssl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) @@ -36,13 +37,18 @@ vcpkg_configure_cmake( -DUSE_SYSTEM_SQLITE3=ON -DUSE_SYSTEM_GLEW=ON + + -DCMAKE_INSTALL_DIR=share ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/wt) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/wt) # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/var) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/var) + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wt RENAME copyright) vcpkg_copy_pdbs() -- cgit v1.2.3 From 5290e22966827c715ecea1282f4c05233412d5dd Mon Sep 17 00:00:00 2001 From: Jason Juang Date: Mon, 17 Dec 2018 16:32:13 -0800 Subject: [alembic] update to 1.7.10 (#4916) --- ports/alembic/CONTROL | 2 +- ports/alembic/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index a2aefabec..59a6580ba 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,4 +1,4 @@ Source: alembic -Version: 1.7.9 +Version: 1.7.10 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/ diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 295afa34a..7e2bc233f 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic - REF 1.7.9 - SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2 + REF 1.7.10 + SHA512 e98ffaedb98dbc5c53fe9703d3063bb118d32c83c47e3af04c8fc96237034b02fe0fc2c628ca82bdd0e0ef17d9375f4f48e0022ce33380b9ad91970539611ced HEAD_REF master ) -- cgit v1.2.3 From 8ba6cbec0dfc6c8d692136d27c74f98387233641 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 18 Dec 2018 08:41:17 +0800 Subject: [docs] Fix #4932 (#4982) --- docs/users/integration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/users/integration.md b/docs/users/integration.md index fbaea41d9..10f5574c1 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -50,7 +50,7 @@ The `CMAKE_TOOLCHAIN_FILE` setting simply must be set before the `project()` dir ```cmake if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") endif() -- cgit v1.2.3 From c094d3133c0b7776c74e1463d64cc079c9960068 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 17 Dec 2018 16:44:08 -0800 Subject: Update release version or commit to latest for below ports (#4957) * [botan][caf][celero][docopt][glbinding][nanodbc][sfgui]Update release version or commit to latest * [sfml] Add find_dependency(Freetype) --- ports/botan/CONTROL | 2 +- ports/botan/portfile.cmake | 6 +- ports/caf/CONTROL | 2 +- ports/caf/openssl-version-override.patch | 12 +- ports/caf/portfile.cmake | 11 +- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 +- ports/docopt/CONTROL | 2 +- ports/docopt/portfile.cmake | 4 +- ports/glbinding/CONTROL | 2 +- ports/glbinding/portfile.cmake | 4 +- ports/nanodbc/0001_cmake.patch | 23 -- ports/nanodbc/0002_msvc14_codecvt.patch | 34 --- ports/nanodbc/0003_export_def.patch | 417 ------------------------------- ports/nanodbc/0004_unicode.patch | 33 --- ports/nanodbc/CONTROL | 2 +- ports/nanodbc/portfile.cmake | 25 +- ports/sfgui/CONTROL | 2 +- ports/sfgui/portfile.cmake | 7 +- ports/sfml/CONTROL | 2 +- ports/sfml/portfile.cmake | 4 +- 21 files changed, 35 insertions(+), 565 deletions(-) delete mode 100644 ports/nanodbc/0001_cmake.patch delete mode 100644 ports/nanodbc/0002_msvc14_codecvt.patch delete mode 100644 ports/nanodbc/0003_export_def.patch delete mode 100644 ports/nanodbc/0004_unicode.patch diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 5582c3a7a..3961c2ccb 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,3 +1,3 @@ Source: botan -Version: 2.8.0 +Version: 2.9.0 Description: A cryptography library written in C++11 diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 200d00f9f..f405b8f45 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(BOTAN_VERSION 2.8.0) +set(BOTAN_VERSION 2.9.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF cb14e9ce95bcaae2ada7ffe96ef0cce6a2b38593 - SHA512 3d8fbf1c65e2b0259f225db46ffa4a7eb989a518b230574e94f82dc13afd7dc32cfe6a8a0127e7dd0dea30e06f3946db78db50e107937382eff8ed823e996dc3 + REF 0129d3172ec419beb90a2b3487f6385a35da0742 + SHA512 a8328df5ad2693a96935d1d2202ddd6678a5ba9c63a8159acbe56f1c884fa5faaa71339e8f56284cfd00574a9b4f91bdb1fb22c36c8e899d9b4cbe881f4867d3 HEAD_REF master ) diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL index e9b8cd0bf..6f39010be 100644 --- a/ports/caf/CONTROL +++ b/ports/caf/CONTROL @@ -1,4 +1,4 @@ Source: caf -Version: 0.15.7 +Version: 0.16.2 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/openssl-version-override.patch b/ports/caf/openssl-version-override.patch index bccbd6ca4..5a0337134 100644 --- a/ports/caf/openssl-version-override.patch +++ b/ports/caf/openssl-version-override.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7b75f7..794af1d 100644 +index 2d908e8..d270297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -545,6 +545,9 @@ if(NOT CAF_NO_OPENSSL) +@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL) message(STATUS "Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.") set(CAF_NO_OPENSSL yes) + elseif(CAF_OPENSSL_VERSION_OVERRIDE) -+ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) -+ add_optional_caf_lib(openssl) ++ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) ++ add_optional_caf_lib(openssl) else() - # Check if openssl headers and library versions match - set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) + if(NOT CMAKE_CROSSCOMPILING) + # Check if openssl headers and library versions match diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index aecd84116..ae5e24c1b 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -8,14 +8,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF 0.15.7 - SHA512 ff0fa205ad71677b84fa09a2e6ce6bb6d1bc9b790bbbc3ac51505467402ff61a218528004212efa2063c798cc512972d318a2c9423067ee51cef719de2b6b186 + REF 2cc4377715afc3d3c35848f9d59b9e6876afd875 + SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/openssl-version-override.patch + PATCHES + openssl-version-override.patch ) vcpkg_configure_cmake( diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 2afd57484..aa90dad66 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,3 +1,3 @@ Source: celero -Version: 2.4.0 +Version: 2.4.0-1 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index f9288fb8e..61dbec10e 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF v2.4.0 - SHA512 4ba9f26bcda85bea00de27a6e8166f874f2c3852f74c54c089373caf71e1c066ac771fda73799d84c4c7a20986a71fd7a3b101b7b8972b9797ab3e8ed7918c30 + REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3 + SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7 HEAD_REF master ) diff --git a/ports/docopt/CONTROL b/ports/docopt/CONTROL index 0fc6d09c8..b6599438c 100644 --- a/ports/docopt/CONTROL +++ b/ports/docopt/CONTROL @@ -1,3 +1,3 @@ Source: docopt -Version: 2018-04-16-2 +Version: 2018-11-01 Description: Command line arguments parser that will make you smile (C++11 port). diff --git a/ports/docopt/portfile.cmake b/ports/docopt/portfile.cmake index 5076bf742..ec3a764d6 100644 --- a/ports/docopt/portfile.cmake +++ b/ports/docopt/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO docopt/docopt.cpp - REF 4f491249e6def236937dbfac7602852e7d99aff8 - SHA512 d3a61f8d8a8c11723064f3405f03eb838a2ac9aa574f86771b1db89a2dd81996b639215fe5d4465343b893bf71502da178c7af8d883c112c1e45f43c17d473b7 + REF 7476f8e56b4650aaeafb4e1cda2e5d8f01fddd97 + SHA512 6765e8a3a834ad75bd87effee5ac7e174482039d26015346b95d7d64e4e0097cc3f1f2e6fd9e3e5970bf4c5719095c0a3e5edfac18217913dc88fbe569d37ae8 HEAD_REF master PATCHES 001-fix-unresolved-symbol.patch diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL index d225e60c8..9671eda4b 100644 --- a/ports/glbinding/CONTROL +++ b/ports/glbinding/CONTROL @@ -1,3 +1,3 @@ Source: glbinding -Version: 3.0.2-3 +Version: 3.0.2-4 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 64063bc73..d7a896723 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/glbinding - REF v3.0.2 - SHA512 524ad20a11af7d8ee1764f53326b43efb3b3dbd6c64d1539f4d9fa2bcb7b58a6bd6caf460d6944aed4fd7439b82536d8f28a0f0f51c14c62c2f0c73baab9afcb + REF d7a1873ad741fb13a9c6dcbae93d0cda45a11933 + SHA512 70848d8ddad3e2ddfc54549ed3cdde569991858135140b30b50fa6e92c5aec6e3dd235418e091456f9b68da2fad09fbef117dedac7b48c26bcab62b6f0fa791f HEAD_REF master PATCHES force-system-install.patch ) diff --git a/ports/nanodbc/0001_cmake.patch b/ports/nanodbc/0001_cmake.patch deleted file mode 100644 index 36d57be0e..000000000 --- a/ports/nanodbc/0001_cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f4aa71..94edd95 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -201,9 +201,16 @@ endif() - if(NANODBC_INSTALL) - install(FILES src/nanodbc.h DESTINATION include) - if(NANODBC_STATIC) -- install(TARGETS nanodbc ARCHIVE DESTINATION lib) -+ install( -+ TARGETS nanodbc -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) - else() -- install(TARGETS nanodbc LIBRARY DESTINATION lib) -+ install( -+ TARGETS nanodbc -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) - endif() - message(STATUS "Target install: Turned on") - else() diff --git a/ports/nanodbc/0002_msvc14_codecvt.patch b/ports/nanodbc/0002_msvc14_codecvt.patch deleted file mode 100644 index ae499bcf9..000000000 --- a/ports/nanodbc/0002_msvc14_codecvt.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/nanodbc.cpp b/src/nanodbc.cpp -index 8e02d4a..2e42b91 100644 ---- a/src/nanodbc.cpp -+++ b/src/nanodbc.cpp -@@ -209,10 +209,11 @@ namespace - out = utf_to_utf(in.c_str(), in.c_str() + in.size()); - #else - #if defined(_MSC_VER) && (_MSC_VER == 1900) -- // Workaround for confirmed bug in VS2015. -- // See: https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -- auto p = reinterpret_cast(in.data()); -- out = std::wstring_convert, wide_char_t>().to_bytes(p, p + in.size()); -+ // Workaround for confirmed bug in VS2015. See: -+ // https://connect.microsoft.com/VisualStudio/Feedback/Details/1403302 -+ // https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -+ auto p = reinterpret_cast(in.data()); -+ out = std::wstring_convert, unsigned short>().to_bytes(p, p + in.size()); - #else - out = std::wstring_convert, wide_char_t>().to_bytes(in); - #endif -@@ -226,9 +227,10 @@ namespace - using boost::locale::conv::utf_to_utf; - out = utf_to_utf(in.c_str(), in.c_str() + in.size()); - #elif defined(_MSC_VER) && (_MSC_VER == 1900) -- // Workaround for confirmed bug in VS2015. -- // See: https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -- auto s = std::wstring_convert, wide_char_t>().from_bytes(in); -+ // Workaround for confirmed bug in VS2015. See: -+ // https://connect.microsoft.com/VisualStudio/Feedback/Details/1403302 -+ // https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -+ auto s = std::wstring_convert, unsigned short>().from_bytes(in); - auto p = reinterpret_cast(s.data()); - out.assign(p, p + s.size()); - #else diff --git a/ports/nanodbc/0003_export_def.patch b/ports/nanodbc/0003_export_def.patch deleted file mode 100644 index 3dd3649ae..000000000 --- a/ports/nanodbc/0003_export_def.patch +++ /dev/null @@ -1,417 +0,0 @@ -diff --git a/src/nanodbc.cpp b/src/nanodbc.cpp -index 8e02d4a..0483660 100644 ---- a/src/nanodbc.cpp -+++ b/src/nanodbc.cpp -@@ -3253,10 +3253,10 @@ unsigned long statement::parameter_size(short param) const - - // We need to instantiate each form of bind() for each of our supported data types. - #define NANODBC_INSTANTIATE_BINDS(type) \ -- template void statement::bind(short, const type*, param_direction); /* 1-ary */ \ -- template void statement::bind(short, const type*, std::size_t, param_direction); /* n-ary */ \ -- template void statement::bind(short, const type*, std::size_t, const type*, param_direction); /* n-ary, sentry */ \ -- template void statement::bind(short, const type*, std::size_t, const bool*, param_direction) /* n-ary, flags */ \ -+ template NANODBC_API void statement::bind(short, const type*, param_direction); /* 1-ary */ \ -+ template NANODBC_API void statement::bind(short, const type*, std::size_t, param_direction); /* n-ary */ \ -+ template NANODBC_API void statement::bind(short, const type*, std::size_t, const type*, param_direction); /* n-ary, sentry */ \ -+ template NANODBC_API void statement::bind(short, const type*, std::size_t, const bool*, param_direction) /* n-ary, flags */ \ - /**/ - - // The following are the only supported instantiations of statement::bind(). -@@ -3875,112 +3875,112 @@ result::operator bool() const - } - - // The following are the only supported instantiations of result::get_ref(). --template void result::get_ref(short, string_type::value_type&) const; --template void result::get_ref(short, short&) const; --template void result::get_ref(short, unsigned short&) const; --template void result::get_ref(short, int32_t&) const; --template void result::get_ref(short, uint32_t&) const; --template void result::get_ref(short, int64_t&) const; --template void result::get_ref(short, uint64_t&) const; --template void result::get_ref(short, float&) const; --template void result::get_ref(short, double&) const; --template void result::get_ref(short, string_type&) const; --template void result::get_ref(short, date&) const; --template void result::get_ref(short, timestamp&) const; -- --template void result::get_ref(const string_type&, string_type::value_type&) const; --template void result::get_ref(const string_type&, short&) const; --template void result::get_ref(const string_type&, unsigned short&) const; --template void result::get_ref(const string_type&, int32_t&) const; --template void result::get_ref(const string_type&, uint32_t&) const; --template void result::get_ref(const string_type&, int64_t&) const; --template void result::get_ref(const string_type&, uint64_t&) const; --template void result::get_ref(const string_type&, float&) const; --template void result::get_ref(const string_type&, double&) const; --template void result::get_ref(const string_type&, string_type&) const; --template void result::get_ref(const string_type&, date&) const; --template void result::get_ref(const string_type&, timestamp&) const; -+template NANODBC_API void result::get_ref(short, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(short, short&) const; -+template NANODBC_API void result::get_ref(short, unsigned short&) const; -+template NANODBC_API void result::get_ref(short, int32_t&) const; -+template NANODBC_API void result::get_ref(short, uint32_t&) const; -+template NANODBC_API void result::get_ref(short, int64_t&) const; -+template NANODBC_API void result::get_ref(short, uint64_t&) const; -+template NANODBC_API void result::get_ref(short, float&) const; -+template NANODBC_API void result::get_ref(short, double&) const; -+template NANODBC_API void result::get_ref(short, string_type&) const; -+template NANODBC_API void result::get_ref(short, date&) const; -+template NANODBC_API void result::get_ref(short, timestamp&) const; -+ -+template NANODBC_API void result::get_ref(const string_type&, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, short&) const; -+template NANODBC_API void result::get_ref(const string_type&, unsigned short&) const; -+template NANODBC_API void result::get_ref(const string_type&, int32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, uint32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, int64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, uint64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, float&) const; -+template NANODBC_API void result::get_ref(const string_type&, double&) const; -+template NANODBC_API void result::get_ref(const string_type&, string_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, date&) const; -+template NANODBC_API void result::get_ref(const string_type&, timestamp&) const; - - // The following are the only supported instantiations of result::get_ref() with fallback. --template void result::get_ref(short, const string_type::value_type&, string_type::value_type&) const; --template void result::get_ref(short, const short&, short&) const; --template void result::get_ref(short, const unsigned short&, unsigned short&) const; --template void result::get_ref(short, const int32_t&, int32_t&) const; --template void result::get_ref(short, const uint32_t&, uint32_t&) const; --template void result::get_ref(short, const int64_t&, int64_t&) const; --template void result::get_ref(short, const uint64_t&, uint64_t&) const; --template void result::get_ref(short, const float&, float&) const; --template void result::get_ref(short, const double&, double&) const; --template void result::get_ref(short, const string_type&, string_type&) const; --template void result::get_ref(short, const date&, date&) const; --template void result::get_ref(short, const timestamp&, timestamp&) const; -- --template void result::get_ref(const string_type&, const string_type::value_type&, string_type::value_type&) const; --template void result::get_ref(const string_type&, const short&, short&) const; --template void result::get_ref(const string_type&, const unsigned short&, unsigned short&) const; --template void result::get_ref(const string_type&, const int32_t&, int32_t&) const; --template void result::get_ref(const string_type&, const uint32_t&, uint32_t&) const; --template void result::get_ref(const string_type&, const int64_t&, int64_t&) const; --template void result::get_ref(const string_type&, const uint64_t&, uint64_t&) const; --template void result::get_ref(const string_type&, const float&, float&) const; --template void result::get_ref(const string_type&, const double&, double&) const; --template void result::get_ref(const string_type&, const string_type&, string_type&) const; --template void result::get_ref(const string_type&, const date&, date&) const; --template void result::get_ref(const string_type&, const timestamp&, timestamp&) const; -+template NANODBC_API void result::get_ref(short, const string_type::value_type&, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(short, const short&, short&) const; -+template NANODBC_API void result::get_ref(short, const unsigned short&, unsigned short&) const; -+template NANODBC_API void result::get_ref(short, const int32_t&, int32_t&) const; -+template NANODBC_API void result::get_ref(short, const uint32_t&, uint32_t&) const; -+template NANODBC_API void result::get_ref(short, const int64_t&, int64_t&) const; -+template NANODBC_API void result::get_ref(short, const uint64_t&, uint64_t&) const; -+template NANODBC_API void result::get_ref(short, const float&, float&) const; -+template NANODBC_API void result::get_ref(short, const double&, double&) const; -+template NANODBC_API void result::get_ref(short, const string_type&, string_type&) const; -+template NANODBC_API void result::get_ref(short, const date&, date&) const; -+template NANODBC_API void result::get_ref(short, const timestamp&, timestamp&) const; -+ -+template NANODBC_API void result::get_ref(const string_type&, const string_type::value_type&, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, const short&, short&) const; -+template NANODBC_API void result::get_ref(const string_type&, const unsigned short&, unsigned short&) const; -+template NANODBC_API void result::get_ref(const string_type&, const int32_t&, int32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const uint32_t&, uint32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const int64_t&, int64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const uint64_t&, uint64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const float&, float&) const; -+template NANODBC_API void result::get_ref(const string_type&, const double&, double&) const; -+template NANODBC_API void result::get_ref(const string_type&, const string_type&, string_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, const date&, date&) const; -+template NANODBC_API void result::get_ref(const string_type&, const timestamp&, timestamp&) const; - - // The following are the only supported instantiations of result::get(). --template string_type::value_type result::get(short) const; --template short result::get(short) const; --template unsigned short result::get(short) const; --template int32_t result::get(short) const; --template uint32_t result::get(short) const; --template int64_t result::get(short) const; --template uint64_t result::get(short) const; --template float result::get(short) const; --template double result::get(short) const; --template string_type result::get(short) const; --template date result::get(short) const; --template timestamp result::get(short) const; -- --template string_type::value_type result::get(const string_type&) const; --template short result::get(const string_type&) const; --template unsigned short result::get(const string_type&) const; --template int32_t result::get(const string_type&) const; --template uint32_t result::get(const string_type&) const; --template int64_t result::get(const string_type&) const; --template uint64_t result::get(const string_type&) const; --template float result::get(const string_type&) const; --template double result::get(const string_type&) const; --template string_type result::get(const string_type&) const; --template date result::get(const string_type&) const; --template timestamp result::get(const string_type&) const; -+template NANODBC_API string_type::value_type result::get(short) const; -+template NANODBC_API short result::get(short) const; -+template NANODBC_API unsigned short result::get(short) const; -+template NANODBC_API int32_t result::get(short) const; -+template NANODBC_API uint32_t result::get(short) const; -+template NANODBC_API int64_t result::get(short) const; -+template NANODBC_API uint64_t result::get(short) const; -+template NANODBC_API float result::get(short) const; -+template NANODBC_API double result::get(short) const; -+template NANODBC_API string_type result::get(short) const; -+template NANODBC_API date result::get(short) const; -+template NANODBC_API timestamp result::get(short) const; -+ -+template NANODBC_API string_type::value_type result::get(const string_type&) const; -+template NANODBC_API short result::get(const string_type&) const; -+template NANODBC_API unsigned short result::get(const string_type&) const; -+template NANODBC_API int32_t result::get(const string_type&) const; -+template NANODBC_API uint32_t result::get(const string_type&) const; -+template NANODBC_API int64_t result::get(const string_type&) const; -+template NANODBC_API uint64_t result::get(const string_type&) const; -+template NANODBC_API float result::get(const string_type&) const; -+template NANODBC_API double result::get(const string_type&) const; -+template NANODBC_API string_type result::get(const string_type&) const; -+template NANODBC_API date result::get(const string_type&) const; -+template NANODBC_API timestamp result::get(const string_type&) const; - - // The following are the only supported instantiations of result::get() with fallback. --template string_type::value_type result::get(short, const string_type::value_type&) const; --template short result::get(short, const short&) const; --template unsigned short result::get(short, const unsigned short&) const; --template int32_t result::get(short, const int32_t&) const; --template uint32_t result::get(short, const uint32_t&) const; --template int64_t result::get(short, const int64_t&) const; --template uint64_t result::get(short, const uint64_t&) const; --template float result::get(short, const float&) const; --template double result::get(short, const double&) const; --template string_type result::get(short, const string_type&) const; --template date result::get(short, const date&) const; --template timestamp result::get(short, const timestamp&) const; -- --template string_type::value_type result::get(const string_type&, const string_type::value_type&) const; --template short result::get(const string_type&, const short&) const; --template unsigned short result::get(const string_type&, const unsigned short&) const; --template int32_t result::get(const string_type&, const int32_t&) const; --template uint32_t result::get(const string_type&, const uint32_t&) const; --template int64_t result::get(const string_type&, const int64_t&) const; --template uint64_t result::get(const string_type&, const uint64_t&) const; --template float result::get(const string_type&, const float&) const; --template double result::get(const string_type&, const double&) const; --template string_type result::get(const string_type&, const string_type&) const; --template date result::get(const string_type&, const date&) const; --template timestamp result::get(const string_type&, const timestamp&) const; -+template NANODBC_API string_type::value_type result::get(short, const string_type::value_type&) const; -+template NANODBC_API short result::get(short, const short&) const; -+template NANODBC_API unsigned short result::get(short, const unsigned short&) const; -+template NANODBC_API int32_t result::get(short, const int32_t&) const; -+template NANODBC_API uint32_t result::get(short, const uint32_t&) const; -+template NANODBC_API int64_t result::get(short, const int64_t&) const; -+template NANODBC_API uint64_t result::get(short, const uint64_t&) const; -+template NANODBC_API float result::get(short, const float&) const; -+template NANODBC_API double result::get(short, const double&) const; -+template NANODBC_API string_type result::get(short, const string_type&) const; -+template NANODBC_API date result::get(short, const date&) const; -+template NANODBC_API timestamp result::get(short, const timestamp&) const; -+ -+template NANODBC_API string_type::value_type result::get(const string_type&, const string_type::value_type&) const; -+template NANODBC_API short result::get(const string_type&, const short&) const; -+template NANODBC_API unsigned short result::get(const string_type&, const unsigned short&) const; -+template NANODBC_API int32_t result::get(const string_type&, const int32_t&) const; -+template NANODBC_API uint32_t result::get(const string_type&, const uint32_t&) const; -+template NANODBC_API int64_t result::get(const string_type&, const int64_t&) const; -+template NANODBC_API uint64_t result::get(const string_type&, const uint64_t&) const; -+template NANODBC_API float result::get(const string_type&, const float&) const; -+template NANODBC_API double result::get(const string_type&, const double&) const; -+template NANODBC_API string_type result::get(const string_type&, const string_type&) const; -+template NANODBC_API date result::get(const string_type&, const date&) const; -+template NANODBC_API timestamp result::get(const string_type&, const timestamp&) const; - - } // namespace nanodbc - -diff --git a/src/nanodbc.h b/src/nanodbc.h -index f4e7b3d..2bfc6a8 100644 ---- a/src/nanodbc.h -+++ b/src/nanodbc.h -@@ -164,6 +164,16 @@ namespace nanodbc - #define NANODBC_NOEXCEPT noexcept - #endif - -+#pragma warning(disable: 4275) -+#pragma warning(disable: 4251) -+#ifdef nanodbc_EXPORTS -+ /* We are building this library */ -+ #define NANODBC_API __declspec(dllexport) -+#else -+ /* We are using this library */ -+ #define NANODBC_API __declspec(dllimport) -+#endif -+ - // 8888888888 888 888 888 888 d8b - // 888 888 888 888 888 Y8P - // 888 888 888 888 888 -@@ -188,16 +198,17 @@ namespace nanodbc - - //! \brief Type incompatible. - //! \see exceptions --class type_incompatible_error : public std::runtime_error -+class NANODBC_API type_incompatible_error : public std::runtime_error - { - public: - type_incompatible_error(); - const char* what() const NANODBC_NOEXCEPT; - }; - -+ - //! \brief Accessed null data. - //! \see exceptions --class null_access_error : public std::runtime_error -+class NANODBC_API null_access_error : public std::runtime_error - { - public: - null_access_error(); -@@ -206,7 +217,7 @@ public: - - //! \brief Index out of range. - //! \see exceptions --class index_range_error : public std::runtime_error -+class NANODBC_API index_range_error : public std::runtime_error - { - public: - index_range_error(); -@@ -215,7 +226,7 @@ public: - - //! \brief Programming logic error. - //! \see exceptions --class programming_error : public std::runtime_error -+class NANODBC_API programming_error : public std::runtime_error - { - public: - explicit programming_error(const std::string& info); -@@ -224,7 +235,7 @@ public: - - //! \brief General database error. - //! \see exceptions --class database_error : public std::runtime_error -+class NANODBC_API database_error : public std::runtime_error - { - public: - //! \brief Creates a runtime_error with a message describing the last ODBC error generated for the given handle and handle_type. -@@ -298,7 +309,7 @@ struct timestamp - //! \brief A resource for managing transaction commits and rollbacks. - //! - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. --class transaction -+class NANODBC_API transaction - { - public: - //! \brief Begin a transaction on the given connection object. -@@ -361,7 +372,7 @@ private: - // MARK: Statement - - - //! \brief Represents a statement on the database. --class statement -+class NANODBC_API statement - { - public: - //! \brief Provides support for retrieving output/return parameters. -@@ -734,7 +745,7 @@ private: - // MARK: Connection - - - //! \brief Manages and encapsulates ODBC resources such as the connection and environment handles. --class connection -+class NANODBC_API connection - { - public: - //! \brief Create new connection object, initially not connected. -@@ -903,7 +914,7 @@ class catalog; - //! - //! \see statement::execute(), statement::execute_direct() - //! \note result objects may be copied, however all copies will refer to the same underlying ODBC result set. --class result -+class NANODBC_API result - { - public: - //! Empty result set. -@@ -1023,7 +1034,7 @@ public: - //! \param column position. - //! \throws database_error, index_range_error, type_incompatible_error, null_access_error - template -- T get(short column) const; -+ T get(short column) const; - - //! \brief Gets data from the given column of the current rowset. - //! If the data is null, fallback is returned instead. -@@ -1139,7 +1150,7 @@ private: - // "Y88P" - // MARK: Catalog - - --class catalog -+class NANODBC_API catalog - { - public: - -@@ -1319,7 +1330,7 @@ private: - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result, transaction --result execute( -+result NANODBC_API execute( - connection& conn - , const string_type& query - , long batch_operations = 1 -@@ -1333,7 +1344,7 @@ result execute( - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result, transaction --void just_execute( -+void NANODBC_API just_execute( - connection& conn - , const string_type& query - , long batch_operations = 1 -@@ -1346,7 +1357,7 @@ void just_execute( - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result --result execute(statement& stmt, long batch_operations = 1); -+result NANODBC_API execute(statement& stmt, long batch_operations = 1); - - //! \brief Execute the previously prepared query now and without creating result object. - //! \param stmt The prepared statement that will be executed. -@@ -1355,7 +1366,7 @@ result execute(statement& stmt, long batch_operations = 1); - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result --void just_execute(statement& stmt, long batch_operations = 1); -+void NANODBC_API just_execute(statement& stmt, long batch_operations = 1); - - //! \brief Execute the previously prepared query now. - //! Executes within the context of a transaction object and commits the transaction directly after execution. -@@ -1364,7 +1375,7 @@ void just_execute(statement& stmt, long batch_operations = 1); - //! \throws database_error - //! \return A result set object. - //! \see open(), prepare(), execute(), result, transaction --result transact(statement& stmt, long batch_operations); -+result NANODBC_API transact(statement& stmt, long batch_operations); - - //! \brief Execute the previously prepared query now and without creating result object. - //! Executes within the context of a transaction object and commits the transaction directly after execution. -@@ -1373,7 +1384,7 @@ result transact(statement& stmt, long batch_operations); - //! \throws database_error - //! \return A result set object. - //! \see open(), prepare(), execute(), result, transaction --void just_transact(statement& stmt, long batch_operations); -+void NANODBC_API just_transact(statement& stmt, long batch_operations); - - //! \brief Prepares the given statement to execute on it associated connection. - //! If the statement is not open throws programming_error. -@@ -1382,7 +1393,7 @@ void just_transact(statement& stmt, long batch_operations); - //! \param timeout The number in seconds before query timeout. Default is 0 indicating no timeout. - //! \see open() - //! \throws database_error, programming_error --void prepare(statement& stmt, const string_type& query, long timeout = 0); -+void NANODBC_API prepare(statement& stmt, const string_type& query, long timeout = 0); - - //! @} - diff --git a/ports/nanodbc/0004_unicode.patch b/ports/nanodbc/0004_unicode.patch deleted file mode 100644 index a4def235c..000000000 --- a/ports/nanodbc/0004_unicode.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/nanodbc.cpp b/src/nanodbc.cpp -index 8e02d4a..c408af7 100644 ---- a/src/nanodbc.cpp -+++ b/src/nanodbc.cpp -@@ -90,7 +90,7 @@ - typedef std::u32string wide_string_type; - #define NANODBC_CODECVT_TYPE std::codecvt_utf8 - #else -- typedef std::u16string wide_string_type; -+ typedef std::wstring wide_string_type; - #define NANODBC_CODECVT_TYPE std::codecvt_utf8_utf16 - #endif - typedef wide_string_type::value_type wide_char_t; -diff --git a/src/nanodbc.h b/src/nanodbc.h -index f4e7b3d..bb7bacd 100644 ---- a/src/nanodbc.h -+++ b/src/nanodbc.h -@@ -127,13 +127,13 @@ namespace nanodbc - - //! @} - --// You must explicitly request Unicode support by defining NANODBC_USE_UNICODE at compile time. -+#define NANODBC_USE_UNICODE 1 - #ifndef DOXYGEN - #ifdef NANODBC_USE_UNICODE - #ifdef NANODBC_USE_IODBC_WIDE_STRINGS - typedef std::u32string string_type; - #else -- typedef std::u16string string_type; -+ typedef std::wstring string_type; - #endif - #else - typedef std::string string_type; diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index ef676937e..075bd4d82 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -1,3 +1,3 @@ Source: nanodbc -Version: 2.12.4-2 +Version: 2.12.4-3 Description: A small C++ wrapper for the native C ODBC API. diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index ff90b4b19..7014c7eac 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -2,33 +2,16 @@ include(vcpkg_common_functions) # Only static libraries are supported. # See https://github.com/nanodbc/nanodbc/issues/13 -if(VCPKG_USE_HEAD_VERSION) # v2.13 - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -else() # v2.12.4 - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() - +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanodbc/nanodbc - REF v2.12.4 - SHA512 b9a924516b2a777e5f1497774997672320548722ed53413b0a7ad5d503e2f8ca1099f5059a912b7aae410928f4c4edcdfd02e4cfbf415976cd222697b354b4e6 + REF fe1d590991da30dc9cb71676c4d80cb2d9acb49e + SHA512 9c7e638b15b3c7ce418374c22a76be4f3f5901e7736938a8b0549b312bb7fa80bc8d34b2a52242a5b94196bb0994481a36e043a4f71cdc1d9af778915d017ac2 HEAD_REF master ) -# Legacy, remove at release of v2.13 -if(NOT VCPKG_USE_HEAD_VERSION) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch - ${CMAKE_CURRENT_LIST_DIR}/0002_msvc14_codecvt.patch - ${CMAKE_CURRENT_LIST_DIR}/0003_export_def.patch - ${CMAKE_CURRENT_LIST_DIR}/0004_unicode.patch -) -endif() -# /Legacy - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/sfgui/CONTROL b/ports/sfgui/CONTROL index 59a7cdab3..da3ee41a9 100644 --- a/ports/sfgui/CONTROL +++ b/ports/sfgui/CONTROL @@ -1,4 +1,4 @@ Source: sfgui -Version: 0.3.2-2 +Version: 0.4.0 Description: simple and fast graphical user interface library Build-Depends: sfml diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake index 66ce7d830..16eeb5618 100644 --- a/ports/sfgui/portfile.cmake +++ b/ports/sfgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO TankOs/SFGUI - REF 0.3.2 - SHA512 cd97e421695f6189995c1b7a4180e3738bf785abae37d3eb51ac6d687a88a26a1f088863b37e065edaff6ba43eea379e423b31118324c4daa65dba0b3e904869 + REF 0.4.0 + SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-sfml-targets.patch" ) @@ -27,9 +27,6 @@ vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright) -file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Modules/FindSFGUI.cmake ${CURRENT_PACKAGES_DIR}/share/sfgui/FindSFGUI.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake/Modules) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index 371300221..8fcda5bc1 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,4 +1,4 @@ Source: sfml -Version: 2.5.1 +Version: 2.5.1-1 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 22ab3b8a3..a25c5628b 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -32,9 +32,9 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SFML) vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") FILE(READ ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake SFML_CONFIG) - FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES true)\n${SFML_CONFIG}") + FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") endif() # move sfml-main to manual link dir -- cgit v1.2.3 From b2996e1fd48842446a64443d057c576f819bda00 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Mon, 17 Dec 2018 16:45:09 -0800 Subject: Support custom Android NDK, better ABI specification (#4986) --- scripts/toolchains/android.cmake | 13 ++++++++++++- toolsrc/src/vcpkg/base/system.cpp | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 893463056..69192aeca 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,11 +1,22 @@ set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") set(CMAKE_SYSTEM_NAME Android CACHE STRING "") -set(ANDROID_ABI x86_64 CACHE STRING "") set(ANDROID_TOOLCHAIN clang CACHE STRING "") set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "") set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") +if (VCPKG_TARGET_TRIPLET STREQUAL "arm64-android") + set(ANDROID_ABI arm64-v8a CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET STREQUAL "arm-android") + set(ANDROID_ABI armeabi-v7a CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET STREQUAL "x64-android") + set(ANDROID_ABI x86_64 CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET STREQUAL "x86-android") + set(ANDROID_ABI x86 CACHE STRING "") +else() + message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}") +endif() + if(DEFINED ENV{ANDROID_NDK_HOME}) set(ANDROID_NDK_HOME $ENV{ANDROID_NDK_HOME}) else() diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index 9c72f8401..8aa1db53c 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -170,6 +170,8 @@ namespace vcpkg::System L"NVCUDASAMPLES_ROOT", // Enables find_package(Vulkan) in CMake. Environmental variable generated by Vulkan SDK installer L"VULKAN_SDK", + // Enable targeted Android NDK + L"ANDROID_NDK_HOME", }; std::wstring env_cstr; -- cgit v1.2.3 From 00777f41f7cf4deec10ad7302e25263c2ea826a2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 18 Dec 2018 14:54:59 +0100 Subject: Fix for #4902 having testing enabled seems to mess up builds if other dependencies are available --- ports/eigen3/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4e32d4e10..b8c5a2b5d 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF OPTIONS_RELEASE -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3 OPTIONS_DEBUG -- cgit v1.2.3 From ccff8ab94ed1294d306d977b0bf25e8e9140a0d8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 18 Dec 2018 12:46:19 -0800 Subject: [tinyxml] Modernize and bump control version --- ports/tinyxml/CONTROL | 2 +- ports/tinyxml/portfile.cmake | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL index 3d97a3312..f1075e38e 100644 --- a/ports/tinyxml/CONTROL +++ b/ports/tinyxml/CONTROL @@ -1,3 +1,3 @@ Source: tinyxml -Version: 2.6.2-2 +Version: 2.6.2-3 Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs. diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake index dcd1fcc08..1d4e6131b 100644 --- a/ports/tinyxml/portfile.cmake +++ b/ports/tinyxml/portfile.cmake @@ -1,23 +1,22 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml) - vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz" FILENAME "tinyxml_2_6_2.tar.gz" SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF 2.6.2 PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch - ${CMAKE_CURRENT_LIST_DIR}/0002_export_tinyxml.patch + 0001_use_stl.patch + 0002_export_tinyxml.patch ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA -- cgit v1.2.3 From 533b53b834e900ed914723023c1faa625cfd678f Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 18 Dec 2018 14:39:50 -0800 Subject: [aubio] get latest aubio to resolve ffmpeg build issue --- ports/aubio/CMakeLists.txt | 1 + ports/aubio/CONTROL | 2 +- ports/aubio/portfile.cmake | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index a405a48de..3e65666eb 100644 --- a/ports/aubio/CMakeLists.txt +++ b/ports/aubio/CMakeLists.txt @@ -62,6 +62,7 @@ target_link_libraries(aubio PUBLIC ${LIBLZMA_LIBRARIES} ws2_32.lib Secur32.lib + bcrypt.lib ) if(BUILD_TOOLS) diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index 74178f95a..5c699e1dc 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -1,4 +1,4 @@ Source: aubio -Version: 0.4.6-967e4041f-2 +Version: 0.4.8 Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio. Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index d0480dd9b..fec30f57c 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -3,8 +3,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd7 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aubio/aubio - REF 967e4041f21d7eec9db319db98a37489aa19460c - SHA512 76ab82bc509350fb3fe0cee5806c6f8af72a6ce97b4aba887d8f66f13f924eebea12fbdfeab9c1f201c6141d703336ebbf13813f54c8d0fa20507e048d15b2cd + REF 0.4.8 + SHA512 0422ec9ceb645dd5cdb1ca8b17f552edf9197dbf9c929ca75aacfb89f092c02db8b6d2b8aec567ddc1df5b310770de77cd941b45ed74700c3d3584924f39b576 HEAD_REF master ) -- cgit v1.2.3 From 1a1dc41907d3edff00b8acf2f4a5d1b243cc6466 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 18 Dec 2018 15:22:58 -0800 Subject: [crc32c] bump dash number in control file to force the test system to pick it up --- ports/crc32c/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/crc32c/CONTROL b/ports/crc32c/CONTROL index 71fb14bb9..ada730a7d 100644 --- a/ports/crc32c/CONTROL +++ b/ports/crc32c/CONTROL @@ -1,3 +1,3 @@ Source: crc32c -Version: 1.0.6 +Version: 1.0.6-1 Description: CRC32C implementation with support for CPU-specific acceleration instructions. -- cgit v1.2.3 From 9a72b227cd11404f1bc09eb093028b795cbef1bd Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 18 Dec 2018 16:12:19 -0800 Subject: [antlr4] move to vcpkg_extract_source_archive_ex --- ports/antlr4/CONTROL | 2 +- ports/antlr4/portfile.cmake | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index 2254d4d80..900f2622e 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7.1-1 +Version: 4.7.1-2 Description: ANother Tool for Language Recognition \ No newline at end of file diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 886a1ab64..de3e2f634 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -5,7 +5,6 @@ endif() include(vcpkg_common_functions) set(VERSION 4.7.1) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime) vcpkg_download_distfile(ARCHIVE URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip" @@ -20,11 +19,11 @@ vcpkg_download_distfile(LICENSE SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src - PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -36,14 +35,14 @@ else() endif() vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/antlr4cpp-vs2015.vcxproj + PROJECT_PATH ${SOURCE_PATH}/runtime/antlr4cpp-vs2015.vcxproj DEBUG_CONFIGURATION ${DEBUG_CONFIG} RELEASE_CONFIGURATION ${RELEASE_CONFIG} ) file (MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -FILE(COPY ${SOURCE_PATH}/src/ +FILE(COPY ${SOURCE_PATH}/runtime/src/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") @@ -51,9 +50,9 @@ file (MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug/lib) -file(COPY ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib +file(COPY ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(COPY ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib +file(COPY ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -67,12 +66,12 @@ else() ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin) endif() -- cgit v1.2.3 From afdca9165c739760d58e29b4a25ef10d470a1aaf Mon Sep 17 00:00:00 2001 From: Patrick Geltinger Date: Wed, 19 Dec 2018 02:13:57 +0100 Subject: [sqlite3] Update to SQLite 3.26.0 because of "Magellan" vulnerability (#4995) The Tencent Blade Team has discovered a remote code execution vulnerability in SQLite, which was fixed in SQLite release 3.26.0. --- ports/sqlite3/CONTROL | 2 +- ports/sqlite3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index 91ea02a14..38a874439 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,5 +1,5 @@ Source: sqlite3 -Version: 3.25.2 +Version: 3.26.0 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. Feature: tool diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index b2422aecc..d2a078d29 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) -set(SQLITE_VERSION 3250200) -set(SQLITE_HASH f87b4ab405f85df85b5d63e9e28c4db76202dc2d5461e0d0c626fa7521570d89a1122403c037704859ecb58ac1747ebf4b3c8a2f3a3c3d8492e8060df92e379f) +set(SQLITE_VERSION 3260000) +set(SQLITE_HASH ba089abd16857a65fc6cf26558a0d3e6f20c278b8df451b357eea5154f8ccd5645c9cfdb30d0fd4fe64f19dd2f876a6cc4a28455b7b013770c2ce9a607171107) vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2018/sqlite-amalgamation-${SQLITE_VERSION}.zip" -- cgit v1.2.3 From 87fa0fc83880505344b4ec392741c52f6c4f002c Mon Sep 17 00:00:00 2001 From: Nicolai Grodzitski Date: Wed, 19 Dec 2018 04:38:59 +0300 Subject: Upgrade RESTinio v.0.4.8.4. (#4992) --- ports/restinio/CONTROL | 2 +- ports/restinio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL index 1e0ad1d52..5b41dfb39 100644 --- a/ports/restinio/CONTROL +++ b/ports/restinio/CONTROL @@ -1,4 +1,4 @@ Source: restinio -Version: 0.4.8 +Version: 0.4.8.4 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests. Build-Depends: asio, fmt, http-parser diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 2ce2b7263..7acf213b7 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO sobjectizerteam/restinio-0.4 - REF v.0.4.8 - SHA512 da44a6df47f68294b1f26241d63ab282b16a8111580959ea5d69e18d9faca68fe9932451d07c4cd5732d5ac4e6fab6550842fd6bac6385a622fb618b4a916975 + REF v.0.4.8.4 + SHA512 de3461ad5b4315d2b5846063cb69d57a14da29f80652d38a6fe96d27d05586d76363053af3284db97c0c9c6da02038960f2812697737eb23a02006e491fb57f7 ) vcpkg_configure_cmake( -- cgit v1.2.3 From d40eb181742082f25c1de6a829552174ae0350d7 Mon Sep 17 00:00:00 2001 From: Pavel Mach Date: Wed, 19 Dec 2018 02:47:01 +0100 Subject: [zxing] ZXing library port added. (#4854) * ZXing library port added. * ZXing dependency to opencv[webp] added. * [zxing-cpp] Rename from zxing. Use full ref. Only require opencv[core]. * [tiff] Disable zstd dependency. Todo: add feature. * [zxing-cpp] Disable optional iconv reference --- ports/tiff/CONTROL | 2 +- ports/tiff/portfile.cmake | 1 + ports/zxing-cpp/CONTROL | 4 ++++ ports/zxing-cpp/portfile.cmake | 43 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 ports/zxing-cpp/CONTROL create mode 100644 ports/zxing-cpp/portfile.cmake diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 866437737..45499f1fd 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.10 +Version: 4.0.10-1 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 13d8ac7bc..92ba3963c 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_configure_cmake( -DBUILD_TESTS=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF + -Dzstd=OFF ${TIFF_CXX_TARGET} ) diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL new file mode 100644 index 000000000..52dfd95b2 --- /dev/null +++ b/ports/zxing-cpp/CONTROL @@ -0,0 +1,4 @@ +Source: zxing-cpp +Version: 3.3.3-2 +Build-Depends: opencv[core] +Description: Barcode detection and decoding library. diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake new file mode 100644 index 000000000..405210d9c --- /dev/null +++ b/ports/zxing-cpp/portfile.cmake @@ -0,0 +1,43 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO glassechidna/zxing-cpp + REF 5aad4744a3763d814df98a18886979893e638274 + SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/zxing/cmake" TARGET_PATH share/zxing) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/zxing) +if (WIN32) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing) +else(WIN32) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing) +endif(WIN32) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/zxing) + +vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/zxing) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/zxing) + +# Handle copyright +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/zxing-cpp) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/zxing-cpp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/zxing-cpp/COPYING ${CURRENT_PACKAGES_DIR}/share/zxing-cpp/copyright) -- cgit v1.2.3 From 224300c2387cb959bbbec5623f5fa017142d3733 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 18 Dec 2018 22:30:26 -0800 Subject: [grpc] Change portfile to trigger build --- ports/grpc/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 4b307a87a..c73a7492d 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -81,3 +81,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() +# \ No newline at end of file -- cgit v1.2.3 From d02acf43936912ad2e33053d8d217ade08a64476 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 19 Dec 2018 17:50:38 +0800 Subject: [libsodium] Fix #3374, #3385 --- ports/libsodium/portfile.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index ff473b525..d4bad9e7c 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -22,18 +22,20 @@ else() set(LIBSODIUM_DEBUG_CONFIGURATION Debug) endif() -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj - RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} -) - IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") SET(BUILD_ARCH "Win32") ELSE() SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) ENDIF() +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj + RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} + OPTIONS + /p:ForceImportBeforeCppTargets=${SOURCE_PATH}/builds/msvc/properties/${BUILD_ARCH}.props +) + file(INSTALL ${SOURCE_PATH}/src/libsodium/include/sodium.h DESTINATION ${CURRENT_PACKAGES_DIR}/include -- cgit v1.2.3 From cb1b311535bd9c68cc458f328fd7116d720c0dd2 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 19 Dec 2018 20:01:14 +0800 Subject: [libsodium] Fix static build --- ports/libsodium/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index d4bad9e7c..29e6d1f9d 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -47,6 +47,12 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/include/sodium/export.h _contents) + string(REPLACE "#ifdef SODIUM_STATIC" "#if 1 //#ifdef SODIUM_STATIC" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/sodium/export.h "${_contents}") +endif () + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(INSTALL ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll -- cgit v1.2.3 From 2cad8b53dd8bc6968de516aea97882219092e52f Mon Sep 17 00:00:00 2001 From: krismattheus Date: Wed, 19 Dec 2018 15:32:03 +0100 Subject: [pthreads] add version resource and fix problem with PTW32_ARCH when compiling resource. Signed-off-by: krismattheus --- ports/pthreads/CMakeLists.txt | 4 ++-- ports/pthreads/CONTROL | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt index 7ae6bcc34..70317b460 100644 --- a/ports/pthreads/CMakeLists.txt +++ b/ports/pthreads/CMakeLists.txt @@ -28,6 +28,7 @@ set(PTHREAD_SHARED_SOURCES sync.c tsd.c attr.C + version.rc ) set(PTHREAD_STATIC_SOURCES autostatic.c @@ -169,8 +170,7 @@ set(PTHREAD_STATIC_SOURCES -option(PTW32_ARCH "x32") -add_definitions(-DPTW32_ARCH=${PTW32_ARCH} -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) +add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) if(BUILD_SHARED_LIBS) set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES}) diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index ab02fb415..53b710f2a 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,3 +1,3 @@ Source: pthreads -Version: 2.9.1-2 +Version: 2.9.1-3 Description: pthreads for windows -- cgit v1.2.3 From 222c629af4bdf4739ab0a50c375aa2875b83641f Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Wed, 19 Dec 2018 14:53:21 -0500 Subject: Change to 0/1 instead of OFF/ON On newer CMake's, the following errors are reported: ``` CMake Warning (dev) at .... /vcpkg/installed/x64-osx/share/c-ares/c-ares-config.cmake:32 (if): if given arguments: "ON" An argument named "ON" appears in a conditional statement. Policy CMP0012 is not set: if() recognizes numbers and boolean constants. Run "cmake --help-policy CMP0012" for policy details. Use the cmake_policy command to set the policy and suppress this warning. ``` Which corresponds to the following configured code: ``` if(ON) set(c-ares_STATIC_LIBRARY c-ares::cares_static) endif() ``` --- ports/c-ares/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index bf704304e..999c3553e 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -13,11 +13,11 @@ vcpkg_from_github( ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(CARES_STATIC ON) - set(CARES_SHARED OFF) + set(CARES_STATIC 1) + set(CARES_SHARED 0) else() - set(CARES_STATIC OFF) - set(CARES_SHARED ON) + set(CARES_STATIC 0) + set(CARES_SHARED 1) endif() vcpkg_configure_cmake( -- cgit v1.2.3 From d5656ef104ce531a1c75d286147ba323b76aa427 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 14:57:09 -0800 Subject: [grpc] update patch for uwp --- ports/grpc/fix-uwp.patch | 257 ++++++++++++++++++++++++++-------------------- ports/grpc/portfile.cmake | 2 +- 2 files changed, 149 insertions(+), 110 deletions(-) diff --git a/ports/grpc/fix-uwp.patch b/ports/grpc/fix-uwp.patch index f479e4c59..81b79d1e0 100644 --- a/ports/grpc/fix-uwp.patch +++ b/ports/grpc/fix-uwp.patch @@ -1,109 +1,148 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59fd818e3..774ee2f725 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -89,6 +89,9 @@ if(UNIX) - endif() - if(WIN32) - set(_gRPC_PLATFORM_WINDOWS ON) -+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ set(_gRPC_PLATFORM_UWP ON) -+ endif() - endif() - - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -@@ -155,6 +158,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) - # ``.proto`` files - # - function(protobuf_generate_grpc_cpp) -+ if(_gRPC_PLATFORM_UWP) -+ return() -+ endif() -+ - if(NOT ARGN) - message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") - return() -@@ -189,6 +196,7 @@ function(protobuf_generate_grpc_cpp) - endforeach() - endfunction() - -+if(NOT _gRPC_PLATFORM_UWP) - add_custom_target(plugins - DEPENDS - grpc_cpp_plugin -@@ -218,6 +226,8 @@ add_custom_target(tools_cxx - add_custom_target(tools - DEPENDS tools_c tools_cxx) - -+endif() -+ - if (gRPC_BUILD_TESTS) - add_custom_target(buildtests_c) - add_dependencies(buildtests_c algorithm_test) -@@ -3661,7 +3671,6 @@ foreach(_hdr - DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" - ) - endforeach() --endif (gRPC_BUILD_CODEGEN) - - - if (gRPC_INSTALL) -@@ -3671,6 +3680,7 @@ if (gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif (gRPC_BUILD_CODEGEN) - - if (gRPC_BUILD_TESTS) - -@@ -3793,7 +3803,7 @@ foreach(_hdr - DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" - ) - endforeach() --endif (gRPC_BUILD_CODEGEN) -+ - - - if (gRPC_INSTALL) -@@ -3803,6 +3813,7 @@ if (gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif (gRPC_BUILD_CODEGEN) - - if (gRPC_BUILD_TESTS) - -diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -index 55efe0e9dd..f538f26edf 100644 ---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) { - - static void init_mu(void) { gpr_mu_init(&g_mu); } - -+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP -+ - static bool run_powershell() { - SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof(sa); -@@ -97,8 +99,12 @@ static bool run_powershell() { - CloseHandle(h); - return true; - } -+#endif - - bool grpc_alts_is_running_on_gcp() { -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+ g_is_on_compute_engine = false; -+#else - gpr_once_init(&g_once, init_mu); - gpr_mu_lock(&g_mu); - if (!g_compute_engine_detection_done) { -@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() { - g_compute_engine_detection_done = true; - } - gpr_mu_unlock(&g_mu); -+#endif - return g_is_on_compute_engine; - } - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b39e6f8..5d35293 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,9 @@ if(UNIX) + endif() + if(WIN32) + set(_gRPC_PLATFORM_WINDOWS ON) ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set(_gRPC_PLATFORM_UWP ON) ++ endif() + endif() + + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -107,6 +110,9 @@ if (MSVC) + add_definitions(/wd4267) + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619) ++ if(_gRPC_PLATFORM_UWP) ++ add_definitions(-DGRPC_ARES=0) ++ endif() + endif() + + if (gRPC_USE_PROTO_LITE) +@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # ``.proto`` files + # + function(protobuf_generate_grpc_cpp) ++ if(_gRPC_PLATFORM_UWP) ++ return() ++ endif() ++ + if(NOT ARGN) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") + return() +@@ -211,6 +221,7 @@ function(protobuf_generate_grpc_cpp) + endforeach() + endfunction() + ++if(NOT _gRPC_PLATFORM_UWP) + add_custom_target(plugins + DEPENDS + grpc_cpp_plugin +@@ -240,6 +251,8 @@ add_custom_target(tools_cxx + add_custom_target(tools + DEPENDS tools_c tools_cxx) + ++endif() ++ + if (gRPC_BUILD_TESTS) + add_custom_target(buildtests_c) + add_dependencies(buildtests_c algorithm_test) +@@ -3805,7 +3818,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + + if (gRPC_INSTALL) +@@ -3815,6 +3827,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_TESTS) + +@@ -3935,7 +3948,7 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) ++ + + + if (gRPC_INSTALL) +@@ -3945,6 +3958,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_TESTS) + +@@ -4916,7 +4930,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + + if (gRPC_INSTALL) +@@ -4926,6 +4939,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_TESTS) + +diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc +index 7e4b3c9..da67bde 100644 +--- a/src/core/lib/iomgr/resource_quota.cc ++++ b/src/core/lib/iomgr/resource_quota.cc +@@ -936,7 +936,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, + void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { + gpr_mu_lock(&resource_user->mu); + grpc_resource_quota* resource_quota = resource_user->resource_quota; +- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size); ++ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast(size)); + GPR_ASSERT(prior >= static_cast(size)); + bool was_zero_or_negative = resource_user->free_pool <= 0; + resource_user->free_pool += static_cast(size); +diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +index 55efe0e..f538f26 100644 +--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc ++++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) { + + static void init_mu(void) { gpr_mu_init(&g_mu); } + ++#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP ++ + static bool run_powershell() { + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); +@@ -97,8 +99,12 @@ static bool run_powershell() { + CloseHandle(h); + return true; + } ++#endif + + bool grpc_alts_is_running_on_gcp() { ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++ g_is_on_compute_engine = false; ++#else + gpr_once_init(&g_once, init_mu); + gpr_mu_lock(&g_mu); + if (!g_compute_engine_detection_done) { +@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() { + g_compute_engine_detection_done = true; + } + gpr_mu_unlock(&g_mu); ++#endif + return g_is_on_compute_engine; + } + diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index c73a7492d..77db34226 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -81,4 +81,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -# \ No newline at end of file +## \ No newline at end of file -- cgit v1.2.3 From 8b79329303a1b16ed10e52922cde7976f6abf1c3 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 15:52:22 -0800 Subject: [antlr4] change portfile to trigger testing --- ports/antlr4/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index de3e2f634..cda011c60 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -77,4 +77,5 @@ endif() file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/antlr4 RENAME copyright) -message(STATUS "Installing done") \ No newline at end of file +message(STATUS "Installing done") +# \ No newline at end of file -- cgit v1.2.3 From f6db046bed66288d5143247244ad1a59fcf1a495 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 16:09:39 -0800 Subject: [mpfr] fix version in CONTROL file --- ports/mpfr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index a7fcfdeaf..e9f4451be 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,4 +1,4 @@ Source: mpfr -Version: 3.1.6-3 +Version: 4.0.1 Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir -- cgit v1.2.3 From dd005656273d5d004ea7a74256a2cb9ca9f89dc7 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 16:38:14 -0800 Subject: [mpfr] update CMakeLists for new version --- ports/mpfr/CMakeLists.txt | 327 +++++++++++++++++++++++----------------------- ports/mpfr/gmp_printf.c | 6 - ports/mpfr/portfile.cmake | 1 - 3 files changed, 165 insertions(+), 169 deletions(-) delete mode 100644 ports/mpfr/gmp_printf.c diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index 7770b18fd..f0064666c 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -11,237 +11,240 @@ set(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR}) # Sources set(SRCS - src/gmp_printf.c - src/mpfr.h - src/mpf2mpfr.h - src/mpfr-gmp.h - src/mpfr-impl.h - src/mpfr-intmax.h - src/mpfr-longlong.h - src/mpfr-thread.h - src/exceptions.c - src/extract.c - src/uceil_exp2.c - src/uceil_log2.c - src/ufloor_log2.c + 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_2si.c src/div_2ui.c - src/div.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/exp.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/isinteger.c + src/int_ceil_log2.c src/isinf.c + src/isinteger.c src/isnan.c src/isnum.c - src/const_log2.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.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/printf.c - src/vasprintf.c - src/const_pi.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/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_rnd.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/rint.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/get_z_exp.c - src/swap.c - src/factorial.c - src/cosh.c - src/sinh.c - src/tanh.c - src/sinh_cosh.c - src/acosh.c - src/asinh.c - src/atanh.c - src/atan.c - src/cmp2.c - src/exp_2.c - src/asin.c - src/const_euler.c - src/cos.c - src/sin.c - src/tan.c - src/fma.c - src/fms.c - src/hypot.c - src/log1p.c - src/expm1.c - src/log2.c - src/log10.c - src/ui_pow.c - src/ui_pow_ui.c - src/minmax.c - src/dim.c - src/signbit.c - src/copysign.c - src/setsign.c - src/gmp_op.c - src/init2.c - src/acos.c - src/sin_cos.c - src/set_nan.c - src/set_inf.c - src/set_zero.c - src/powerof2.c - src/gamma.c - src/set_ld.c - src/get_ld.c - src/cbrt.c - src/volatile.c - src/fits_s.h - src/fits_sshort.c - src/fits_sint.c - src/fits_slong.c - src/fits_u.h - src/fits_ushort.c - src/fits_uint.c - src/fits_ulong.c - src/fits_uintmax.c - src/fits_intmax.c - src/get_si.c - src/get_ui.c - src/zeta.c - src/cmp_d.c - src/erf.c - src/inits.c - src/inits2.c - src/clears.c - src/sgn.c - src/check.c - src/sub1sp.c + src/vasprintf.c src/version.c - src/mpn_exp.c - src/mpfr-gmp.c - src/mp_clz_tab.c - src/sum.c - src/add1sp.c - src/free_cache.c - src/si_op.c - src/cmp_ld.c - src/set_ui_2exp.c - src/set_si_2exp.c - src/set_uj.c - src/set_sj.c - src/get_sj.c - src/get_uj.c - src/get_z.c - src/iszero.c - src/cache.c - src/sqr.c - src/int_ceil_log2.c - src/isqrt.c - src/strtofr.c - src/pow_z.c - src/logging.c - src/mulders.c - src/get_f.c - src/round_p.c - src/erfc.c - src/atan2.c - src/subnormal.c - src/const_catalan.c - src/root.c - src/gen_inverse.h - src/sec.c - src/csc.c - src/cot.c - src/eint.c - src/sech.c - src/csch.c - src/coth.c - src/round_near_x.c - src/constant.c - src/abort_prec_max.c - src/stack_interface.c - src/lngamma.c - src/zeta_ui.c - src/set_d64.c - src/get_d64.c - src/jn.c + src/volatile.c src/yn.c - src/rem1.c - src/get_patches.c - src/add_d.c - src/sub_d.c - src/d_sub.c - src/mul_d.c - src/div_d.c - src/d_div.c - src/li2.c - src/rec_sqrt.c - src/min_prec.c - src/buildopt.c - src/digamma.c - src/bernoulli.c - src/isregular.c - src/set_flt.c - src/get_flt.c - src/scale2.c - src/set_z_exp.c - src/ai.c - src/gammaonethird.c - src/ieee_floats.h - src/grandom.c) + src/zeta.c + src/zeta_ui.c) configure_file("src/mparam_h.in" "mparam.h") diff --git a/ports/mpfr/gmp_printf.c b/ports/mpfr/gmp_printf.c deleted file mode 100644 index 1ccb94c0c..000000000 --- a/ports/mpfr/gmp_printf.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include - -extern int __gmpfr_fprintf(const char *fmt, va_list argp) { - return fprintf(stderr, fmt, argp); -} diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 4b534ff0c..7e455041b 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -9,7 +9,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/test_stdarg.c DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From ded0d0141a13be84bec1f04ac34d5b72e7547164 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 20 Dec 2018 12:44:22 +0800 Subject: Fix static build --- ports/ponder/portfile.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake index ee0267b00..b85378ce3 100644 --- a/ports/ponder/portfile.cmake +++ b/ports/ponder/portfile.cmake @@ -21,12 +21,18 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ponder/cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/${PORT}/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/ponder - ${CURRENT_PACKAGES_DIR}/lib/ponder) + ${CURRENT_PACKAGES_DIR}/debug/lib/${PORT} + ${CURRENT_PACKAGES_DIR}/lib/${PORT}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp _contents) + string(REPLACE "ifndef PONDER_STATIC" "if 0 //ifndef PONDER_STATIC" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp "${_contents}") +endif() # Handle copyright -configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/ponder/copyright COPYONLY) +configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -- cgit v1.2.3 From 6e3bd45c671e16e9b5534114204cbc66bc4b74eb Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 23:45:38 -0800 Subject: [antlr4] fix copyright download name --- ports/antlr4/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index cda011c60..3663a9347 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_download_distfile(ARCHIVE # license not exist in antlr folder. vcpkg_download_distfile(LICENSE URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt - FILENAME "antlr4-copyright" + FILENAME "antlr4-copyright_${VERSION}" SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) -- cgit v1.2.3 From 3d164e3e4c19e54763fe34bcb9fe2e5bdcafc1d0 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 20 Dec 2018 15:00:34 -0800 Subject: [spdlog] add comment about patch --- ports/spdlog/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index f953af33d..c676c6467 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 HEAD_REF v1.x PATCHES - fmt-external-cmake-option.patch + fmt-external-cmake-option.patch # This patch is in the upstream project and can be removed next version update. ) vcpkg_configure_cmake( -- cgit v1.2.3 From bf4a864a73dfe0f68a70598c9f5087beca57f2c7 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 21 Dec 2018 00:42:50 -0800 Subject: [msys2] bump control version in msys dependant ports --- ports/ffmpeg/CONTROL | 2 +- ports/icu/CONTROL | 2 +- ports/libgd/CONTROL | 2 +- ports/libvpx/CONTROL | 2 +- ports/openal-soft/CONTROL | 2 +- ports/openssl-unix/CONTROL | 2 +- ports/x264/CONTROL | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 35b3e257e..ce69402dc 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.1 +Version: 4.1-1 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/icu/CONTROL b/ports/icu/CONTROL index 0cb924a2a..171eb1129 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,3 +1,3 @@ Source: icu -Version: 61.1-4 +Version: 61.1-5 Description: Mature and widely used Unicode and localization library. diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index a8373f515..d9eb37c75 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,4 +1,4 @@ Source: libgd -Version: 2.2.4-4 +Version: 2.2.4-5 Description: Open source code library for the dynamic creation of images by programmers. Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index fa1522629..77a44f195 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,3 +1,3 @@ Source: libvpx -Version: 1.7.0 +Version: 1.7.0-1 Description: The reference software implementation for the video coding formats VP8 and VP9. diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 6f16b26bd..cc30df1de 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,3 @@ Source: openal-soft -Version: 1.19.1 +Version: 1.19.1-1 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 28dc5da98..a7e532afe 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p-1 +Version: 1.0.2p-2 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 44b664142..66fda9bee 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,3 +1,3 @@ Source: x264 -Version: 157-303c484ec828ed0 +Version: 157-303c484ec828ed0-1 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format -- cgit v1.2.3 From 67ca08e9d3d0fb8097da84bc593a805f7169095f Mon Sep 17 00:00:00 2001 From: the-j0k3r <31389848+the-j0k3r@users.noreply.github.com> Date: Sat, 22 Dec 2018 09:16:18 +0000 Subject: [openssl] openssl-bump-to-1.0.2q-cve-fixes https://www.openssl.org/news/vulnerabilities.html --- ports/openssl-unix/CONTROL | 2 +- ports/openssl-unix/portfile.cmake | 4 ++-- ports/openssl-uwp/CONTROL | 2 +- ports/openssl-uwp/portfile.cmake | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 28dc5da98..59f686133 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p-1 +Version: 1.0.2q 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/portfile.cmake b/ports/openssl-unix/portfile.cmake index c877905bb..b0064cdf4 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -3,14 +3,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM endif() include(vcpkg_common_functions) -set(OPENSSL_VERSION 1.0.2p) +set(OPENSSL_VERSION 1.0.2q) vcpkg_find_acquire_program(PERL) vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 + SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 ) vcpkg_extract_source_archive_ex( diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index 4b4871f3c..02b19126a 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2l-winrt +Version: 1.0.2q-winrt 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-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index ef9801380..77264b3ec 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -19,7 +19,7 @@ endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2l_WinRT) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2q_WinRT) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) @@ -28,9 +28,9 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}") vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2l_WinRT.zip" - FILENAME "openssl-microsoft-1.0.2l_WinRT.zip" - SHA512 238b3daad7f1a2486e09d47e6d1bd4b0aa8e8a896358c6dfe11a77c2654da1b29d3c7612f9d200d5be5a020f33d96fe39cd75b99aa35aa4129feb756f7f98ee8 + URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2q_WinRT.zip" + FILENAME "openssl-microsoft-1.0.2q_WinRT.zip" + SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 6f398da24938ac65b4a1ccee70e7196e1b790730 Mon Sep 17 00:00:00 2001 From: LazyHamster Date: Tue, 1 Jan 2019 12:59:12 +0300 Subject: Updated libidn2 to version 2.0.5. --- ports/libidn2/CONTROL | 2 +- ports/libidn2/config.h | 6 +++--- ports/libidn2/portfile.cmake | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 46e81c7bf..8496bc396 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,4 @@ Source: libidn2 -Version: 2.0.4 +Version: 2.0.5 Build-Depends: libiconv 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/config.h b/ports/libidn2/config.h index 9e61bc8f2..5d5e6efcc 100644 --- a/ports/libidn2/config.h +++ b/ports/libidn2/config.h @@ -670,7 +670,7 @@ /* #undef PACKAGE_PACKAGER_VERSION */ /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libidn2 2.0.4" +#define PACKAGE_STRING "libidn2 @IDN2_VERSION@" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libidn2" @@ -679,7 +679,7 @@ #define PACKAGE_URL "https://www.gnu.org/software/libidn/#libidn2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.4" +#define PACKAGE_VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'ptrdiff_t'. */ @@ -771,7 +771,7 @@ /* Version number of package */ -#define VERSION "2.0.4" +#define VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wchar_t'. */ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 98892e2c0..9d02b7679 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -1,21 +1,21 @@ include(vcpkg_common_functions) -set(IDN2_VERSION 2.0.4) +set(IDN2_VERSION 2.0.5) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 + SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 ) vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) +configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) + function(simple_copy_template_header FILE_PATH BASE_NAME) if(NOT EXISTS ${FILE_PATH}/${BASE_NAME}.h) if(EXISTS ${FILE_PATH}/${BASE_NAME}.in.h) -- cgit v1.2.3 From d02df9d2550b0e43ddd12a7c035a1bdc7b37b01b Mon Sep 17 00:00:00 2001 From: Todor Prokopov Date: Mon, 7 Jan 2019 22:33:37 +0200 Subject: [entityx] Do not build shared library in addition to static one (#5006) --- ports/entityx/CONTROL | 2 +- ports/entityx/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index dacd86ee9..16dbcfc32 100644 --- a/ports/entityx/CONTROL +++ b/ports/entityx/CONTROL @@ -1,3 +1,3 @@ Source: entityx -Version: 1.2.0-2 +Version: 1.2.0-3 Description: EntityX - A fast, type-safe C++ Entity-Component system. diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index 5df7da6cd..bc6afccc3 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DENTITYX_BUILD_TESTING=false + -DENTITYX_BUILD_SHARED=0 ) vcpkg_install_cmake() -- cgit v1.2.3 From a0042b8a667f7d1a102eb042a4bcc82204ccccdf Mon Sep 17 00:00:00 2001 From: Aaron Ang Date: Mon, 7 Jan 2019 12:48:44 -0800 Subject: OpenVDB: Add `/bigobj` as compiler flag only for MSVC (#4948) * Only set `/bigobj` as C++ compiler flag for MSVC * [openvdb] Bump control version --- ports/openvdb/AddLinkageAndToolsChoice.patch | 8 ++++---- ports/openvdb/CONTROL | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/AddLinkageAndToolsChoice.patch index 3d155cbe4..57078be15 100644 --- a/ports/openvdb/AddLinkageAndToolsChoice.patch +++ b/ports/openvdb/AddLinkageAndToolsChoice.patch @@ -73,7 +73,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" ) - +IF ( OPENVDB_STATIC ) @@ -130,7 +130,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" ) +IF ( OPENVDB_BUILD_TOOLS ) @@ -142,7 +142,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" ) ADD_EXECUTABLE ( vdb_render ${VDB_RENDER_SOURCE_FILES} @@ -151,7 +151,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$:/bigobj>" ) -IF (NOT WIN32) ADD_EXECUTABLE ( vdb_view diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index 22c216b5c..e822bf04c 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,5 @@ Source: openvdb -Version: 5.0.0-1 +Version: 5.0.0-2 Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess Description: Sparse volume data structure and tools -- cgit v1.2.3 From a20ac0957a5834e6e6ee7905ec4a31c330567582 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Mon, 7 Jan 2019 15:52:45 -0500 Subject: [libiconv] Add mirror (#5056) --- ports/libiconv/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 7de4cac0e..4b84ecc5f 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -10,7 +10,7 @@ include(vcpkg_common_functions) set(LIBICONV_VERSION 1.15) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" + URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a ) @@ -43,4 +43,4 @@ vcpkg_copy_pdbs() file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) -vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) \ No newline at end of file +vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) -- cgit v1.2.3 From c82073fae400c3612db061cd4719f2677fecb56a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 7 Jan 2019 18:56:15 -0500 Subject: Update ECSUtil library to 1.0.2.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index c96e1b0b8..6335ac51e 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil -Version: 1.0.1.4 +Version: 1.0.2.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. Build-Depends: atlmfc diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0dc5fa8fa..dab2dd765 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -28,8 +28,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EMCECS/ecs-object-client-windows-cpp - REF v1.0.1.4 - SHA512 796ed227268cd92fce3eba2a842260d552222900b1df1261200032a7678a48776388dd566f408df2ee4dbc0cee39b70090d524a99e6741e0c8f92594d207761a + REF v1.0.2.1 + SHA512 4bb6c223ed562bdb239dc923ea0cfa7b78c1d61c7927017466c08207bffe638ecf3355d581c0a42d8bd966c38420e368b4762fc46a85c14bf071a1136e382451 HEAD_REF master PATCHES NoLibSyms.patch ) -- cgit v1.2.3 From 2d63525a154cf6aba8db2014792eec62087fe1e6 Mon Sep 17 00:00:00 2001 From: ivysnow Date: Tue, 8 Jan 2019 08:03:35 +0800 Subject: [vcpkg] add support for FreeBSD (#4917) * [vcpkg] add support for FreeBSD * [x64-freebsd] Remove triplet because it is not currently in the set of supported triplets --- scripts/bootstrap.sh | 2 ++ scripts/cmake/vcpkg_configure_cmake.cmake | 2 ++ scripts/cmake/vcpkg_find_acquire_program.cmake | 2 ++ scripts/vcpkgTools.xml | 20 ++++++++++++++++++++ toolsrc/src/vcpkg/metrics.cpp | 2 ++ toolsrc/src/vcpkg/tools.cpp | 4 +++- 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4bb428668..7a1b2777b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -123,6 +123,8 @@ fetchTool() os="linux" elif [ "$UNAME" = "Darwin" ]; then os="osx" + elif [ "$UNAME" = "FreeBSD" ]; then + os="freebsd" else echo "Unknown uname: $UNAME" return 1 diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 617fe1a0f..cf3fc7861 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 "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake") endif() list(APPEND _csc_OPTIONS diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b6cfc4aab..0c3a9bca2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -123,6 +123,8 @@ function(vcpkg_find_acquire_program VAR) set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx") + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") else() set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux") endif() diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 9378c7832..18ca741c2 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -21,6 +21,13 @@ ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f cmake-3.12.4-Linux-x86_64.tar.gz + + 3.12.4 + cmake-3.12.4-FreeBSD-x86_64/bin/cmake + https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz + b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 + cmake-3.12.4-FreeBSD-x86_64.tar.gz + 2.20.0 cmd\git.exe @@ -40,6 +47,12 @@ + + 2.7.4 + + + + 2.4.1 vswhere.exe @@ -94,4 +107,11 @@ acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3 ninja-mac-1.8.2.zip + + 1.8.2 + ninja + https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip + 56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86 + ninja-freebsd-1.8.2.zip + diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 2a73dba89..c34f30974 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -220,6 +220,8 @@ namespace vcpkg::Metrics "OSX", #elif defined(__linux__) "Linux", +#elif defined(__FreeBSD__) + "FreeBSD", #elif defined(__unix__) "Unix", #else diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 365271872..b713b2752 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -52,11 +52,13 @@ namespace vcpkg static constexpr StringLiteral OS_STRING = "osx"; #elif defined(__linux__) static constexpr StringLiteral OS_STRING = "linux"; +#elif defined(__FreeBSD__) + static constexpr StringLiteral OS_STRING = "freebsd"; #else return std::string("operating system is unknown"); #endif -#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) 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"###()###"}; -- cgit v1.2.3 From 5c2af38729e6747e581156d3be9043a00c40497e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 7 Jan 2019 19:06:19 -0500 Subject: ecsutil: fix hash --- ports/ecsutil/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index dab2dd765..2587d024d 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EMCECS/ecs-object-client-windows-cpp REF v1.0.2.1 - SHA512 4bb6c223ed562bdb239dc923ea0cfa7b78c1d61c7927017466c08207bffe638ecf3355d581c0a42d8bd966c38420e368b4762fc46a85c14bf071a1136e382451 + SHA512 63028ed304e2791f6f225d54ef6a83cc4e4f10efd6736a2f05d9648c5abf697a60055823f6dfd151e67f2a172e0a2720a162d1f10fda241483c3b5adc7035365 HEAD_REF master PATCHES NoLibSyms.patch ) -- cgit v1.2.3 From 75675059bfdaf3ca197ce78d881d4968a5da5877 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 8 Jan 2019 15:42:41 -0500 Subject: Upgrade google-cloud-cpp to v0.5.0. (#5096) This time with less patches! --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/include-protobuf.patch | 13 ------------- ports/google-cloud-cpp/portfile.cmake | 14 +++++--------- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 ports/google-cloud-cpp/include-protobuf.patch diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 5689f78bb..8be4a8c33 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.4.0 +Version: 0.5.0 Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch deleted file mode 100644 index d0e3529c7..000000000 --- a/ports/google-cloud-cpp/include-protobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:56:34.029389338 -0500 -+++ a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:57:18.461259917 -0500 -@@ -53,6 +53,10 @@ - # Configure the location of proto files, particulary the googleapis protos. - list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" - "${PROJECT_SOURCE_DIR}") -+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto) -+if(PROTO_INCLUDE_DIR) -+ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}") -+endif() - - # Include the functions to compile proto files. - include(CompileProtos) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 54fa6d483..94e227c4f 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -1,17 +1,13 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.4.0 - SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a + REF v0.5.0 + SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5 HEAD_REF master - PATCHES include-protobuf.patch ) set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97) @@ -29,7 +25,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=vcpkg + -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF ) -- cgit v1.2.3 From 46825bf4d445a8e251ee026deb43645bc68af130 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 9 Jan 2019 05:01:33 +0800 Subject: [uriparser] Update to 0.9.1 to fix #5086 (#5094) --- ports/uriparser/CONTROL | 2 +- ports/uriparser/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL index 4777fe8e9..d14b93ded 100644 --- a/ports/uriparser/CONTROL +++ b/ports/uriparser/CONTROL @@ -1,3 +1,3 @@ Source: uriparser -Version: 0.9.0 +Version: 0.9.1 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index 8061a6221..342269c78 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser - REF uriparser-0.9.0 - SHA512 d0a317fa55531f75b0e7ec712ea36f8e36a8cf72fdb4f959f3df7cc7c519d09752b194579a4f288bcea56d7be105da3d79dd8323960e74daff93f1dad2b5085d + REF uriparser-0.9.1 + SHA512 5a553bc503b345bd81ad8bcfa25ab1e0f0ea0a0446a0c4beba9129d128d24de418efd10f04f8814b4f8864f6e219b5b9b938934edea76e78c0235428e5062636 HEAD_REF master ) -- cgit v1.2.3 From fbabe0797ca1dd40e69fbbafe79e8cb456f19072 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 8 Jan 2019 16:03:57 -0500 Subject: [cppgraphqlgen] Update to version 1.0.0 (#5017) * [cppgraphqlgen] Update to version 0.7 * [cppgraphqlgen] Update to 1.0.0 --- ports/cppgraphqlgen/CONTROL | 2 +- ports/cppgraphqlgen/portfile.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 7eaa3d6be..5e51572cc 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen -Version: 0.6 +Version: 1.0.0 Build-Depends: pegtl, rapidjson Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 70ff81070..926a4ecd2 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,17 +3,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cppgraphqlgen - REF v0.6 - SHA512 cc2596f5cd975377fcc9432eee11973e2ff044c244c3ac13c3f45549874c2fe0ac5c48bccb96813b48a1b7c940bb54decc194d9eb358c6ae39d1288b9ce58b01 + REF v1.0.0 + SHA512 3756c31063dc86d1c37d3cb709221b2b6e7dda5f3405d7586e4f395fd4915b1088c0305b116164c615846413042857fd688e61ef36c5c2aab218cfab8f16370c HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 + OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen + OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen ) vcpkg_install_cmake() -- cgit v1.2.3 From 6ce206c785d0881f21e2f9e53bb03ce946db23a6 Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Wed, 9 Jan 2019 00:02:25 +0100 Subject: [fmilib] fmilib not building on x64-windows (#4999) * fix fmilib not building on x64-windows * [fmilib] bump dash version in control file This will force a rebuild when updating * only search for MSVC generator on windows --- ports/fmilib/CONTROL | 2 +- ports/fmilib/portfile.cmake | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL index 859098e30..aa6b868d5 100644 --- a/ports/fmilib/CONTROL +++ b/ports/fmilib/CONTROL @@ -1,3 +1,3 @@ Source: fmilib -Version: 2.0.3 +Version: 2.0.3-1 Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/ diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index df72dd7ee..5692b7d12 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -69,6 +69,36 @@ SET(OPTIONS file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}) +if (WIN32) + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013 ARM") + + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015 ARM") + + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017 ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017") + else() + message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") + endif() + +endif() + foreach(BUILDTYPE "rel" "dbg") message("Building ${TARGET_TRIPLET}-${BUILDTYPE}...") @@ -81,10 +111,12 @@ foreach(BUILDTYPE "rel" "dbg") file(REMOVE_RECURSE ${BUILD_DIR}) file(MAKE_DIRECTORY ${BUILD_DIR}) - if(RELEASE_BUILD) - SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}) - else() - SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}/debug) + SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}) + if(WIN32) + SET(OPTIONS ${OPTIONS} -G ${GENERATOR}) + endif() + if(NOT RELEASE_BUILD) + STRING(APPEND FMILIB_INSTALL_PREFIX "/debug") endif() # Step 1: Configure -- cgit v1.2.3 From 751db7b568c3bb94084d033fd82e5b6dcd443825 Mon Sep 17 00:00:00 2001 From: Jelani Brandon Date: Tue, 8 Jan 2019 15:26:06 -0800 Subject: Update Azure IoTHub packages for new release (#5000) * Update Azure IoTHub packages for new release * [azure-c-shared-utility] Avoid double expanding variables --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/no-double-expand-cmake.patch | 13 +++++++++++++ ports/azure-c-shared-utility/portfile.cmake | 5 +++-- ports/azure-iot-sdk-c/CONTROL | 2 +- 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/portfile.cmake | 4 ++-- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 4 ++-- 10 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 ports/azure-c-shared-utility/no-double-expand-cmake.patch diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index c5e51adaf..51efe3f6f 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,4 +1,4 @@ Source: azure-c-shared-utility -Version: 1.1.11-1 +Version: 1.1.11-3 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/no-double-expand-cmake.patch b/ports/azure-c-shared-utility/no-double-expand-cmake.patch new file mode 100644 index 000000000..3775ad6b5 --- /dev/null +++ b/ports/azure-c-shared-utility/no-double-expand-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 190ea87..a434cee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -264,7 +264,7 @@ if(${use_applessl}) + include_directories(./pal/ios-osx/) + endif() + +-if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0")) ++if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0")) + # Windows added support for UNIX domain sockets to the OS and SDK + # in the Oct 2018 update (10.0.17763.0, aka RS5) + add_definitions(-DAF_UNIX_ON_WINDOWS) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 838528ce4..cc4514dfe 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3 - SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1 + REF 1d622902d7842f94193fc394987f2b4e978bb700 + SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 HEAD_REF master + PATCHES no-double-expand-cmake.patch ) vcpkg_configure_cmake( diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 9c9410bfe..0164d44a0 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-iot-sdk-c -Version: 1.2.11-1 +Version: 1.2.12-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 6ec8ba3eb..2b1ef492c 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF acff8b1677150cb165a7b111745144cf8fab76cc - SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28 + REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 + SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 8f5f63c08..062c02bef 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uamqp-c -Version: 1.2.11-1 +Version: 1.2.11-2 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 0f7591099..b7ee41625 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa - SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58 + REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 + SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 HEAD_REF master ) diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index de34ba4dd..64834510d 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF ed7d104c4ab96aaa68e429066953874f12be70eb - SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f + REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed + SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 HEAD_REF master ) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 9a5f5e030..407844601 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.11-1 +Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index cb14cfaa8..6bfb77f89 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF ff05514c9b4742ae8d7785719a399a7fe6eac09b - SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081 + REF 3205eb26401e9c6639100934e8fb75b75275760d + SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c HEAD_REF master ) -- cgit v1.2.3 From bd547e5e39c775a0c3332559e015441d62ff2aa4 Mon Sep 17 00:00:00 2001 From: Victor Romero Sanchez Date: Tue, 8 Jan 2019 16:07:42 -0800 Subject: [libidn2] Use vcpkg_extract_source_archive_ex --- ports/libidn2/CONTROL | 2 +- ports/libidn2/portfile.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 8496bc396..2fc289034 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,4 @@ Source: libidn2 -Version: 2.0.5 +Version: 2.0.5-1 Build-Depends: libiconv 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 9d02b7679..85cc9e6ce 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -2,14 +2,18 @@ include(vcpkg_common_functions) set(IDN2_VERSION 2.0.5) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${IDN2_VERSION} +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) -- cgit v1.2.3 From 6d206d570030bcf6422dc1fe502a4281cef7414d Mon Sep 17 00:00:00 2001 From: Alenas Date: Wed, 9 Jan 2019 18:41:28 +0200 Subject: [easyloggingpp] updated to 9.96.7 updated easyloggingpp --- ports/easyloggingpp/CONTROL | 2 +- ports/easyloggingpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/easyloggingpp/CONTROL b/ports/easyloggingpp/CONTROL index 3f462dfbd..9e2427ff9 100644 --- a/ports/easyloggingpp/CONTROL +++ b/ports/easyloggingpp/CONTROL @@ -1,3 +1,3 @@ Source: easyloggingpp -Version: 9.96.5-1 +Version: 9.96.7 Description: Easylogging++ is a single header efficient logging library for C++ applications. \ No newline at end of file diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index ecb678746..8294e0a81 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO muflihun/easyloggingpp - REF v9.96.5 - SHA512 51493693095df03f8772174a8ec4fc681832319bd723224a544539efdcf73c7653d3973ec0ae0cd004e496bf98c105c278e4a72694ebf34b207c658b3225a87b + REF v9.96.7 + SHA512 53ee637cd7462fac542170a81a9a206f3418dd8bc9e1f25d1d13dadef630e0fdf2880d71079808ebc49d36a7dbca7b5cdb76ad37b722c66b4b3d3efc8b5d2f35 HEAD_REF master ) -- cgit v1.2.3 From 10762b8b1045f8f3f7fcf0e5c2172a1c5a41766b Mon Sep 17 00:00:00 2001 From: Alenas Date: Wed, 9 Jan 2019 18:41:28 +0200 Subject: [easyloggingpp] updated to 9.96.7 updated easyloggingpp --- ports/easyloggingpp/CONTROL | 2 +- ports/easyloggingpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/easyloggingpp/CONTROL b/ports/easyloggingpp/CONTROL index 3f462dfbd..9e2427ff9 100644 --- a/ports/easyloggingpp/CONTROL +++ b/ports/easyloggingpp/CONTROL @@ -1,3 +1,3 @@ Source: easyloggingpp -Version: 9.96.5-1 +Version: 9.96.7 Description: Easylogging++ is a single header efficient logging library for C++ applications. \ No newline at end of file diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index ecb678746..8294e0a81 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO muflihun/easyloggingpp - REF v9.96.5 - SHA512 51493693095df03f8772174a8ec4fc681832319bd723224a544539efdcf73c7653d3973ec0ae0cd004e496bf98c105c278e4a72694ebf34b207c658b3225a87b + REF v9.96.7 + SHA512 53ee637cd7462fac542170a81a9a206f3418dd8bc9e1f25d1d13dadef630e0fdf2880d71079808ebc49d36a7dbca7b5cdb76ad37b722c66b4b3d3efc8b5d2f35 HEAD_REF master ) -- cgit v1.2.3 From 6ca4f2ff9c1b41e91f183872bca71657176c48cd Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 9 Jan 2019 12:20:36 -0500 Subject: fixed v1.0.2.1: incorrect version was tagged --- ports/ecsutil/disable-setversion.patch | 36 ---------------------------------- ports/ecsutil/portfile.cmake | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 ports/ecsutil/disable-setversion.patch diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch deleted file mode 100644 index 2899a0108..000000000 --- a/ports/ecsutil/disable-setversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj -index 05c5726..f8ac64e 100644 ---- a/ECSUtil/ECSUtil.vcxproj -+++ b/ECSUtil/ECSUtil.vcxproj -@@ -274,7 +274,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -361,7 +360,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -445,7 +443,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -541,7 +538,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2587d024d..2a50f185f 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EMCECS/ecs-object-client-windows-cpp REF v1.0.2.1 - SHA512 63028ed304e2791f6f225d54ef6a83cc4e4f10efd6736a2f05d9648c5abf697a60055823f6dfd151e67f2a172e0a2720a162d1f10fda241483c3b5adc7035365 + SHA512 0d85f8c61f8b4644b75bbd64e1d2e705bb09b0790b4011f6c26dee8d068f44bf6be562161489368de66dcd801ee71cc6dc40921cac0a01858137e7683cfb117e HEAD_REF master PATCHES NoLibSyms.patch ) -- cgit v1.2.3 From 2b2d6edfdeb4b28cf6f35d18cad8134e681f43c3 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 10 Jan 2019 01:29:24 +0800 Subject: [cli11] Update to 1.6.2 (#5093) --- ports/cli11/CONTROL | 2 +- ports/cli11/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index 5174d7037..1e75d2a70 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,3 @@ Source: cli11 -Version: 1.6.1 +Version: 1.6.2 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index bda9fa2b3..08fb83dc9 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.6.1 - SHA512 df12510bb78823908535a68af65fb8ea0b8b33b362e0b5f2cfa91223db7ebd9e71a55dfe31902c5d10e29c02a9bb59be58f8c69da7a9b4ab456ace64f200ac93 + REF v1.6.2 + SHA512 0160323a7a87ecdf5cff081a4270a30977b87f0592041d8fde84ec655b28cdbc40813567f95df375a4f6f953b60a638deacfb3cc5dec562c4d348dcc532f0ab7 HEAD_REF master ) -- cgit v1.2.3 From 7d31d1b0ebacb942002ea7c507320a724b847788 Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 9 Jan 2019 20:38:44 +0300 Subject: sobjectizer-v5.5.24 and so5extra-v1.2.2 (#5100) --- ports/so5extra/CONTROL | 2 +- ports/so5extra/portfile.cmake | 4 ++-- ports/sobjectizer/CONTROL | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL index 41bed72c8..e40d92945 100644 --- a/ports/so5extra/CONTROL +++ b/ports/so5extra/CONTROL @@ -1,4 +1,4 @@ Source: so5extra -Version: 1.2.1 +Version: 1.2.2 Description: A set of additional tools for SObjectizer framework. Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 3d21def42..6fdc213d7 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 1.2.1) +set(VERSION 1.2.2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so_5_extra-${VERSION}/dev/so_5_extra) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/so_5_extra/so_5_extra-${VERSION}.zip/download" FILENAME "so_5_extra-${VERSION}.zip" - SHA512 84294839c800571e98e5599a16609c955296bb10ad90261c5600d3eb13fd1dfc08a7a895e89ad48b3547c9ebe28cd49c944158849a4f1d8e693d8d2259e94100 + SHA512 957b8953f172cc2ea996fe1bd4e4979b0e3fd5fe8d2abff810ff3800c061e4bf5e2935e6bf190d0385621a182a7a623598959716451d9ad5a8f0f14faed725e2 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index ca08ad3a4..33dee9141 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.23 +Version: 5.5.24 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 5ca178ef5..c79f5adfa 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.23) +set(VERSION 5.5.24) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 61c2b9e42d88eafef67b38a1b517af7cbda131835d8ae60c914bd89d21e84801278292064c7ad823c0b31a376b0db68f1ee4a7e87892c2f166c39e8068d86122 + SHA512 d33b5660fb6d7b1182d68069bb86782dd7632071723762875d88dd6d67353f6913b25e0574d87e06b86f472608631f59c3e26dc9c67cda9f8223454ae758b524 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From c4fee273cf5d45c855d73ae09008b3ed0f34dd09 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 9 Jan 2019 09:48:30 -0800 Subject: Update urdfdom_headers to version 1.0.2 (#5067) --- ports/urdfdom-headers/CONTROL | 2 +- ports/urdfdom-headers/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL index 0b967f459..9e53e9b2f 100644 --- a/ports/urdfdom-headers/CONTROL +++ b/ports/urdfdom-headers/CONTROL @@ -1,3 +1,3 @@ Source: urdfdom-headers -Version: 1.0.0-2 +Version: 1.0.2 Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF. diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake index eb2c9020e..7d11936ec 100644 --- a/ports/urdfdom-headers/portfile.cmake +++ b/ports/urdfdom-headers/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF 1.0.0 - SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a + REF 1.0.2 + SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867 HEAD_REF master ) -- cgit v1.2.3 From 11286693b0745dc97246170e06d9e1547a8ce0fd Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Wed, 9 Jan 2019 20:52:58 +0300 Subject: [asio] Update to 1.12.2 (#5050) --- ports/asio/CONTROL | 2 +- ports/asio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL index 295b01db8..6ba9e4318 100644 --- a/ports/asio/CONTROL +++ b/ports/asio/CONTROL @@ -1,3 +1,3 @@ Source: asio -Version: 1.12.1-1 +Version: 1.12.2 Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach. diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 60d329ed8..bd5f5af2a 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-12-1 - SHA512 e335eea05c27a72faae95dd5d5ca997ac8bb144cd5fb68e5538129ea6afb3b4d88e2be1c31a1effdbbbe4c93e07ee274a7e5817453c29faf56abf9ab692b2dd6 + REF asio-1-12-2 + SHA512 7c2e213ff154bb2e5776b37906d437a62206f973316c94706e6d42e3c2f0866e7d97f3e40225ab5f28bf2c4a33fa0b38a4b75421aef86ddf9f2da0811caa2d00 HEAD_REF master ) -- cgit v1.2.3 From bb1bb1c94a72b891883efa6522791620ef3bbc0f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 14 Dec 2018 17:00:47 -0800 Subject: Updates 2018.12.14 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/asmjit/CONTROL | 2 +- ports/asmjit/portfile.cmake | 4 ++-- ports/catch2/CONTROL | 2 +- ports/catch2/portfile.cmake | 4 ++-- ports/chakracore/CONTROL | 2 +- ports/chakracore/portfile.cmake | 4 ++-- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 4 ++-- ports/dimcli/CONTROL | 2 +- ports/dimcli/portfile.cmake | 4 ++-- ports/directxmesh/CONTROL | 2 +- ports/directxmesh/portfile.cmake | 4 ++-- ports/directxtex/CONTROL | 2 +- ports/directxtex/portfile.cmake | 4 ++-- ports/directxtk/CONTROL | 2 +- ports/directxtk/portfile.cmake | 4 ++-- ports/discord-rpc/CONTROL | 2 +- ports/discord-rpc/portfile.cmake | 4 ++-- ports/doctest/CONTROL | 2 +- ports/doctest/portfile.cmake | 4 ++-- ports/eastl/CONTROL | 2 +- ports/eastl/portfile.cmake | 4 ++-- ports/exprtk/CONTROL | 2 +- ports/exprtk/portfile.cmake | 4 ++-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/forest/CONTROL | 2 +- ports/forest/portfile.cmake | 4 ++-- ports/libpng/CONTROL | 2 +- ports/libpng/portfile.cmake | 4 ++-- ports/libwebsockets/CONTROL | 2 +- ports/libwebsockets/portfile.cmake | 4 ++-- ports/mbedtls/CONTROL | 2 +- ports/mbedtls/portfile.cmake | 4 ++-- ports/ms-gsl/CONTROL | 2 +- ports/ms-gsl/portfile.cmake | 4 ++-- ports/parson/CONTROL | 2 +- ports/parson/portfile.cmake | 4 ++-- ports/protobuf/CONTROL | 2 +- ports/protobuf/portfile.cmake | 5 +++-- ports/protobuf/version-rc-msvc.patch | 16 ++++++++++++++++ ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 ++-- ports/rocksdb/CONTROL | 2 +- ports/rocksdb/portfile.cmake | 4 ++-- ports/rs-core-lib/CONTROL | 2 +- ports/rs-core-lib/portfile.cmake | 4 ++-- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 4 ++-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 ++-- ports/unicorn-lib/CONTROL | 2 +- ports/unicorn-lib/portfile.cmake | 4 ++-- ports/unicorn/CONTROL | 2 +- ports/unicorn/portfile.cmake | 4 ++-- ports/wt/CONTROL | 2 +- ports/wt/portfile.cmake | 4 ++-- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 4 ++-- ports/zeromq/CONTROL | 2 +- ports/zeromq/portfile.cmake | 4 ++-- 63 files changed, 110 insertions(+), 93 deletions(-) create mode 100644 ports/protobuf/version-rc-msvc.patch diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 95191fcf0..e6a265d6b 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-11-08-1 +Version: 2018-12-14 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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index cc70f7250..2e2488845 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 070f6e47b33a2909d039e620c873204f78809492 - SHA512 84bc7b17519d3cae471f0e2602ed32111e99d20abfdff26f1e36fd712ff9013b9768b3d37b9179dc40cb1b4a350da1b6955a881c5300ea9b608f97a3101c2762 + REF 389ec3f906f018661a5308458d623d01f96d7b23 + SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911 HEAD_REF master ) diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index f4a9931f8..0c64640ca 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,3 +1,3 @@ Source: asmjit -Version: 2018-11-08 +Version: 2018-12-14 Description: Complete x86/x64 JIT and Remote Assembler for C++ diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index 5d2e7b230..cfd1ed034 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 771d66b301e60ebc3ffa69b11765622c547df6ab - SHA512 02ae822a33d50810fc0833b647bd6c29851b147ae4e388fd29d54567e6ed928173b961d3f3f323b243719092c2947bd6f374bc5d6051817e8153688868473830 + REF 3092065f148d951df281d3f0f1b4922e580b3930 + SHA512 4557bcbbe5b49e2303cfccc2ef9acdb59281a13fe9efe28ac49711736dd45db856f9f67aa9ebcf841e631fc83b8b7e14eee08e3a56d6f982fcc24e23b70b7cc5 HEAD_REF master ) diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index de2d71c35..15a9da60a 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.4.2 +Version: 2.5.0 Description: A modern, header-only test framework for unit testing. Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index b36595d2c..f6ed65251 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.4.2 - SHA512 7422c5c114d93b57cac5596e573d0993ecc6db37708df3491d346bb3aad7a1ee1d1008689ae7b8ef4b0b4fa41aa66566580f807778ae2e4f278687d6fe7aa38b + REF v2.5.0 + SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 HEAD_REF master ) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 005059909..7277d6832 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.11.2 +Version: 1.11.4 Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 43bb1606c..aff3cb1ca 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore - REF v1.11.2 - SHA512 6261a7028bf398703a610d9ad42b6bde7c6309d2997c7cfaa785c1fbcf582adbbbe60756bbe411af1d6e1d26ac9acca5cbe734608885d8b5f2881819477292b7 + REF v1.11.4 + SHA512 903336fae63573991c539fd1652dd2a61c580845aca21253bce76efd884fb7d575c8bb1d91818112a6ba7c69cdcb1847175d9f09080cdc599c0afb3d36f474e2 HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 9d8704ea1..8a04a83bf 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.4.1 +Version: 2.4.2 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 70b397e45..3baed452d 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.4.1 + REF v.2.4.2 HEAD_REF master - SHA512 b0582a158024a13c9d6779e4e6a37487bb8c18b3e91f8fa56a6d0ee3dbaede2567f00c29432f41ca8e3845e98566375b285fb674721225705f6ade91894db081) + SHA512 dc27e7c0b06cd619c4270a91d830dbd3e0dfea851e04d7aab46fe9f2131e4b3717f73ac53bc4d70497ff2efe3bee1ae693e621d993cd63735d00368a362833f3) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index b1526996e..e9d17c122 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,3 @@ Source: dimcli -Version: 4.0.1-1 +Version: 4.1.0 Description: C++ command line parser toolkit diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index f66120c5e..6362aa987 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v4.0.1 - SHA512 e36008eed42997c467ef7f4780cacd7eb8acebeb48be56445914c0ae125c5dbf29a172e1fb2f9490a6f21db8f6de5fa0420f499aff996ee148ec3a5bef0adba5 + REF v4.1.0 + SHA512 5de010b5abfda9e6996bba8c621e03ae0cf81dbc2f69cd859e2ebf7b1706c451f7f8e142299784646d89ca3c3e5803e8711215680b8bdb8eb663158bff3b4f3d HEAD_REF master ) set(staticCrt OFF) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 728f61b5f..d8e03d986 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,3 +1,3 @@ Source: directxmesh -Version: oct2018 +Version: nov2018 Description: DirectXMesh geometry processing library \ No newline at end of file diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 81adb18b6..31b74abea 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF oct2018 - SHA512 eb96fa3104932650bff3b051005e84f1eb52c135085ec1f4f56b7bbd99300ca600721cd18c3a9c8d4334e3280369df7d1d92ab6556fc82c72e1a54d04853331a + REF nov2018 + SHA512 b1abeabd81c7d6c12adfea1ca8d563aa7c22ba1a64aa7a49b7839c0788922cec604a041dddbd3aca6a3b7c8412b1117dfee9c1163862de10757a7747669017ed HEAD_REF master ) diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 05edc2238..d86662ef2 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,3 +1,3 @@ Source: directxtex -Version: oct2018 +Version: nov2018 Description: DirectXTex texture processing library \ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index a5d6deca5..93eb8d6d1 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF oct2018 - SHA512 6bb395c92ca60af03fb3b86dd64542feb0a633b49386a438d0e73f108a4af60913bd695a1c90069eeb83df4ec49289e1a8ae3ac131ddca372eb6dd20d14590d7 + REF nov2018 + SHA512 bcf721820e0a4069b7b1daac44d776b2c69a6ebdc0a817fb2e1fcd94938df8b3fbabc1827c28050d0db4b26cc42a011987f50b7db04487a7075741b34ddb58a8 HEAD_REF master ) diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 100f7f99a..c3e9b194c 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,3 +1,3 @@ Source: directxtk -Version: oct2018b +Version: nov2018 Description: A collection of helper classes for writing DirectX 11.x code in C++. diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 2e6267bad..16828462e 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF oct2018b - SHA512 d9eb0d0537dd6638bfe089bbaa77ad4c4065d43c53143686e60b8c62814f1c7a0fc9a0361a418b1f0fa0881faa14c92c604fffb6670dd8c1260e67d56fea9bab + REF nov2018 + SHA512 ee696245c914c1ede99c12d301e15f3d70ae7a0375b6c6f94afcbb1fd1a80844d1cd053a87f66c2008394a1b8f1165db0e835344a0311f0a8418c32aff9f592a HEAD_REF master ) diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index b6af1dc98..e4d98f524 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,4 +1,4 @@ Source: discord-rpc -Version: 3.3.0-2 +Version: 3.4.0 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. Build-Depends: rapidjson diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 1dd6d3001..b4d191bf8 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO discordapp/discord-rpc - REF v3.3.0 - SHA512 8bb2674edefabf75670ceca29364d69e2002152bff9fe55757f4cda03544b4d827ff33595d98e6d8acdc73ca61cef8ab8054ad0a1ffc905cb26496068b15025f + REF v3.4.0 + SHA512 ca981b833aff5f21fd629a704deadd8e3fb5423d959ddb75e381313f6462d984c567671b10c8f031905c08d85792ddbe2dddc402ba2613c42de9e80fc68d0d51 HEAD_REF master PATCHES disable-downloading.patch ) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 07885a75d..65ac705dd 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.0.1 +Version: 2.2.0 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index a84d9a21d..fffe1bb30 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.0.1 - SHA512 bbd676c8485d9bee4be3f2f6bdd0f72bced09767427533c8de3ea46b298182acaeff64e42683a4283512edd81bb444880b229e65f3296bb4afc8b5b93c03b970 + REF 2.2.0 + SHA512 edf35be338194c7abfb991e6bcc766fe9badc1cc0f21dd7147a6a42ecf451ef6a4eaa1e63b46337fb14a8ed9b107fd381e1b3b502039d7d23476b3f52b12d89c HEAD_REF master ) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 5674e0345..cb7704c8a 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl -Version: 3.12.04 +Version: 3.12.07 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. diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index c090f0fa8..4d61ff01f 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 3.12.04 - SHA512 99e8fdc5fb589410187f3538b6f491bc6f988babcb29b74be90a938ba6c94ad1b16d55ff62ddcf5ae539c67f473d43a6af581278b8b39d0d8686b0161dd0e5cf + REF 3.12.07 + SHA512 d7ae29661ef8dbf13f9b8d195c5088992f23d3ca4751249385e8068f034dd687e178b2aac0f228b354e9019f0ea69f377a7b20aacb5d2b23a98b8032437f9f25 HEAD_REF master ) diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL index d00c2aaae..2ba795fa7 100644 --- a/ports/exprtk/CONTROL +++ b/ports/exprtk/CONTROL @@ -1,3 +1,3 @@ Source: exprtk -Version: 2018-10-11 +Version: 2018-12-14 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake index a863941af..dea82b4d5 100644 --- a/ports/exprtk/portfile.cmake +++ b/ports/exprtk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/exprtk - REF 9836f21d07b1bf799e6877324268708f61c01f73 - SHA512 44acb6e835dc215d4338ff4c2b3444373a93475ece15b3f1bfdc0781f7c28992af7c289644bf9557d041f78c7435f5907e4ba606321aab17faee6f4a70562065 + REF d89d2f5f46fbd33372c81e8ad4b997fa84569fae + SHA512 bad42b83a0f1d8142ceafac862ec62dafc040fa8293bfbca29e49afdc8dca1000fc43537a5cf28d1dae00f5e86516899bd37f996975fbbccdd6a8298d1adb359 ) file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 1711bda03..89862610c 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.11.26.00 +Version: 2018.12.10.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index c66599f7e..aab53792b 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.11.26.00 - SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac + REF v2018.12.10.00 + SHA512 d571c08f764a7670b8313336d52c02190d001085385ce92073823887fe435945a821f623b8009e846435e3461bed2dbc58427bd3960a90469461d38386bb76b9 HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL index ceae2bbda..05a8bd84e 100644 --- a/ports/forest/CONTROL +++ b/ports/forest/CONTROL @@ -1,3 +1,3 @@ Source: forest -Version: 9.0.6 +Version: 10.1.1 Description: Template library of tree data structures diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index c1f0db881..b618233f5 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest - REF 9.0.6 - SHA512 7cb6f25226bbd543332599d5ad2b8e13df6f06342ea12b58ed123ffd81d1362e10c2e01ff95132f7b25431a3ae984bee5cfb86852aa222e1fad1f4e6928f76bc + REF 10.1.1 + SHA512 145f60bc202c7a0ab0dad514e08606ace45780855f71d9ba6a9461c5242b751a3fefa25101387f797ecc53198cd792859927b6bd2c2aa4a1f114a311d0b74e26 HEAD_REF master ) diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index e16f6b1c8..7f3de459d 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.35-1 +Version: 1.6.36 Build-Depends: zlib Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index ef82635af..01edce90d 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glennrp/libpng - REF v1.6.35 - SHA512 1b6e2664bd80726e8f6ef7ea4f23d311a883841086a4a60700dfd11621130808c24487c744c8a942219980eb29b244e81965aebfc4ab7f637693f537f4e8e148 + REF v1.6.36 + SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d HEAD_REF master ) diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index fdc4e7a55..449b34fc5 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,4 +1,4 @@ Source: libwebsockets -Version: 3.0.1 +Version: 3.1.0 Build-Depends: zlib, openssl Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server. diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 7d95b5add..b869fcc2a 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets - REF v3.0.1 - SHA512 ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304 + REF v3.1.0 + SHA512 e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c HEAD_REF master PATCHES 0001-Fix-UWP.patch diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 04cb1003c..0a4183cb7 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,3 +1,3 @@ Source: mbedtls -Version: 2.13.1 +Version: 2.15.1 Description: An open source, portable, easy to use, readable and flexible SSL library diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 59d067f11..fa87630a4 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -5,8 +5,8 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF mbedtls-2.13.1 - SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b + REF mbedtls-2.15.1 + SHA512 361bac49bc179c020855a59140a3e9e31ec9e89ebde9d630e9f3491cdfdf466c8dc2313276d6b257a7728784f5478bdcfd14d26e81f90d432bad2e9a94151fc2 HEAD_REF master ) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index 8d6d02147..c782ee097 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-11-08 +Version: 2018-12-14 Description: Microsoft implementation of the Guidelines Support Library \ No newline at end of file diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index a130f9a35..1b0711977 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF c02ddae4bcff82b17826fe3127e835f5aa54b485 - SHA512 5fcb67d410a46a4e202c367bae59b1dd4f4220ac2b75a70bc34503612a616b2792e74a18b50901656d18a031cc32cf42da8673d3412ccfe8a236daa54eae44c7 + REF 0f68d133fa6fd2973951b8aaab481e34bbfd2cf4 + SHA512 1aa8116a75dd6ffd3a879dcf52f804e1d67e03bac3788559441ddebe2db6fd43a362bfa5ddac36954848555ba1e7fccb2d26b6060a9e171a04497ea551402b42 HEAD_REF master ) diff --git a/ports/parson/CONTROL b/ports/parson/CONTROL index 1210c7e2e..614ff7243 100644 --- a/ports/parson/CONTROL +++ b/ports/parson/CONTROL @@ -1,3 +1,3 @@ Source: parson -Version: 2018-09-18 +Version: 2018-12-14 Description: a lighweight json library written in C diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake index cfc1d861e..16c5578f1 100644 --- a/ports/parson/portfile.cmake +++ b/ports/parson/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kgabis/parson - REF 0a1896939faff5f69e179637fc49f678ff0128ba - SHA512 cb982ce7dbbe0b5a4d08a28a459e9dce5347f90d75b0a37c56698f5b79ad37aa0bd22fe6b6d5c8a6fda2dd83b072605486581360b8ed3591012ebaa1e1518fc6 + REF 302fba9cbb31ffc523bf10a1ce705040194c289d + SHA512 ecc1594fe6e27b8919ccdaf3c7e082d0d47aa5e20aec52235762b9cab8e371adec5a1760f4ea36405bf97cfb587d2bcbd81221f97a9d39290673e2ce61f5a49f HEAD_REF master ) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index c2be8e0f3..89719093c 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.6.1-4 +Version: 3.6.1.3 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 1dc7e6cf5..31f1b3819 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -3,12 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/protobuf - REF v3.6.1 - SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 + REF v3.6.1.3 + SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e HEAD_REF master PATCHES fix-uwp.patch disable-lite.patch + version-rc-msvc.patch ) if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") diff --git a/ports/protobuf/version-rc-msvc.patch b/ports/protobuf/version-rc-msvc.patch new file mode 100644 index 000000000..b24a862d9 --- /dev/null +++ b/ports/protobuf/version-rc-msvc.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/protoc.cmake b/cmake/protoc.cmake +index 9bf6f5a..b58a12a 100644 +--- a/cmake/protoc.cmake ++++ b/cmake/protoc.cmake +@@ -2,9 +2,11 @@ set(protoc_files + ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc + ) + ++if(MSVC) + set(protoc_rc_files + ${CMAKE_CURRENT_BINARY_DIR}/version.rc + ) ++endif() + + add_executable(protoc ${protoc_files} ${protoc_rc_files}) + target_link_libraries(protoc libprotobuf libprotoc) diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 6e82bc86e..4a92b4835 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-11-01-1 +Version: 2018-12-14 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index b5689944b..b1ecb3f0e 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF d9cebde0175aa1ffd38aab9a395a038464d55ce7 - SHA512 820ebc96f6cc583e50bdd637b8bf6b4e8ef6be5a74a49174bf845d037f0dd21ee3b1fbc220bc3cbbd6987205195b6c0990040f43da723f90038a20690a7553ff + REF e7c832772ec55f495927bfa4526d2fc17f0381be + SHA512 d79b5f5a5b97cc1f305abcf3799b00e335ba74c7c73b347b231e4796f45821398f952336dc94011fd8347de8c0e5af78b6cfa61387df002c1ba5e34954ec64c9 HEAD_REF master ) diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 9f70efb78..94bcc35fd 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.15.10 +Version: 5.17.2 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 0d124361b..2b2013190 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v5.15.10 - SHA512 3faef43cc343c20e044f92af7cd9eae9783612d888bfe17b7d0ae6812090088f43a128e5686600ec56f5a88c100eaa893b2551f8c32df793a4ccd94330c07037 + REF v5.17.2 + SHA512 c9f9bff747d0d2c97f8adb71d6a3bd5dc206c2fc567a47d0400abac61fec7f2a386d16cda5447bcf592cca006fd6d4c5ae1a68d122e2e2a03d3ebcc002dae147 HEAD_REF master PATCHES 0001-disable-gtest.patch diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 564b25807..34eaa31db 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2018-10-25 +Version: 2018-12-14 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index a3eddc38d..13f0b9ed2 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 5e2e7bb8663d078957a2f6994d9f1e3d4cf50601 - SHA512 d159b11c650572e486ce8376c03e688b5448fdf00d956edf141106d2e1173d86faf0eda843da69687a6f79eb443017dfe0fb1d9f70284444bfda7006d78aee38 + REF 23ed1ddc676c74f19c333ebbe5dafe68ad3118f3 + SHA512 2b1b0ddb13ba258ce82cb659ca989cb96e9a72ba242df01de7963de50671d6ac6ab93b0e8bb05fa030970e7efb7b894fa4daa7778d77ebb930cba96da3a55317 HEAD_REF master ) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 8aa6dee78..94126c5e7 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2018_U6 +Version: 2019_U3 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index a4e912742..09398ae92 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/tbb - REF 2018_U6 - SHA512 efcd020a24fa41e07ff9232098cecce42ceec5882849bc30edc29ead1694fcc8820a0defb307e0a065c1db1d649a731e13d8cb6fd6f927b4bd3bdc46de0d1709 + REF 2019_U3 + SHA512 b6eaaea95658c4d49e6894811eb9ca38541820462bf1b606db16ca697af4329a94627d8ae01a73f2b07567280865b3ea92ca0ce091fa95dd3551cebbdd35976d HEAD_REF tbb_2018 ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index d52f25eba..076c7dbfa 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-11-01 +Version: 2018-12-14 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 9fb495c84..1635579b8 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 92be4f312b88eac0a4ac450eda29fd20de11b1f0 - SHA512 0c1c7eb30fc63efa483cd9970305b5285c7d6f57151a9e0f602ff757b05cede3adb13688c5d1436c05ffd4bd142ca7676db8e35cbf4d38e9112033f6a2e77ff4 + REF 2b7365c54f823013cc6a4760798051b22743c103 + SHA512 439d4860f029e083c2f9da5b87f3b6119f34da085fb8000020b4bb17195838f6ea029157ce8537176024a9dec6c163ba5495b59e66eefc344fbbb4b323d2f334 HEAD_REF master ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index 29f822e70..c6ecb0a3f 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2018-10-25 +Version: 2018-12-14 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index 009d54cbe..76e9ccb9b 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 40da6ff4c2af8a393674513285f00ada5960e79c - SHA512 39657646ea04777fb083a049d4fa8e48a57808817d718f0f7f942d3c19da1249341f9010ab00466a33d64d5a196ff35a8bd5f8ffe24230903b3c7e83b4273c59 + REF a4015d502f462ad5ba1003a51edcbd07400c14d2 + SHA512 bfdfe4062c17a5d0d1971f1482ddbc28f4d041c7bcc173350e5b2210ad466c2e5496d3a548e31fa1e1f83c12bd8d646e766cf3b8388d13d3782af50a189fb47d HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index bd863c73e..ab167b4da 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2018-10-25 +Version: 2018-12-14 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 849726575..f734e1386 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 873fffc505b29c6179a8aece18b7e331e5f879e8 - SHA512 7fce35aaee00871ee7ab0517a51ef65f7e748252ac2a97a07ee18a04dcc733b5470fd6de8e0bc433c4bbecd47b8269b33871ba7df64975600d52b3ece15715ea + REF 536c4e77c4350fac3e5c2b9b57d8c16f69b934d3 + SHA512 295a88381fbb765d3ffb6a8e58a85c9385a978e49957ad35db828952c0144e392abab77f529ea12aa62b7e495e75df8f02b032f8fd8b87502517d7e46b889e3c HEAD_REF master ) diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index a66c39f42..5db330a5c 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,4 @@ Source: wt -Version: 4.0.4-2 +Version: 4.0.5 Description: Wt is a C++ library for developing web applications Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 0ac9fef61..3c2e70962 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF 4.0.4 - SHA512 7f9fee9b1c145adb610bf9b0860867a2f09699a1c914418938955c5648b3207db361ec48b3afe9e6faa6cc0b5874bedd44481fdd8adb8fc558cfc3dc17369ee7 + REF 4.0.5 + SHA512 5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924 HEAD_REF master PATCHES 0001-boost-1.66.patch diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index af985fa67..c833a3e4a 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.1-2 +Version: 3.1.2 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 062238946..75663fb9a 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF v3.1.1 - SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95 + REF v3.1.2 + SHA512 c6f8a6065e837e145633ddbd0e10910f32009900e1f7155abe0ef53b6fc83dceb9eaf6c56369d13b6526e4b8bd6073bbcbdb790d667c0dab381b67ec5d567f6f HEAD_REF master PATCHES disable-platform-lib-dir.patch ) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index 84b0ad93c..ae33c6f68 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2018-11-01 +Version: 2018-12-14 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index ebff91236..2ae912e07 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF efc9a3021fb61ca92b9869f0ad8308d29a3ebfa3 - SHA512 04c2d94c497a0398243c1fc8c5e1bdcc3a9da873ccf688a9345db334d12e562c8131e7976fa2123fb8f760cc450bd0cfe33a486d1f31880b7d69379e10be7caa + REF ed8ed727c6f532f1a7d7bdf14b72aa83e2a4f0e9 + SHA512 32034fac0bc9f2d0c40e0d9e999200af43146b015ea3663da2d1f58e47da38f292fc03284e39e6c3e30311cd80f4787492e7d993e4d36fa1031e62a8d3dd3c35 HEAD_REF master ) -- cgit v1.2.3 From bdc430c8ec3925ee3de10be152a192459ef84ce1 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 18 Dec 2018 17:31:37 -0800 Subject: [protobuf] Fix protoc.exe on non-windows --- ports/protobuf/CONTROL | 2 +- ports/protobuf/portfile.cmake | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 89719093c..88bc7d3ee 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.6.1.3 +Version: 3.6.1.3-1 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 31f1b3819..32e8ccd91 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -106,9 +106,12 @@ if(CMAKE_HOST_WIN32) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe) endif() else() + file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*) + foreach(E IN LISTS EXECUTABLES) + file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) + endforeach() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) endif() -- cgit v1.2.3 From d931d74c11e3052c1396e3a7fa384fb02a7bdd20 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 8 Jan 2019 15:35:20 -0800 Subject: [wxwidgets] Disable cotire on OSX due to appleclang --- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index c833a3e4a..b922c1a24 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.2 +Version: 3.1.2-1 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 75663fb9a..7319f9749 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -8,6 +8,11 @@ vcpkg_from_github( PATCHES disable-platform-lib-dir.patch ) +set(OPTIONS) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -20,10 +25,13 @@ vcpkg_configure_cmake( -DwxUSE_LIBTIFF=sys -DwxUSE_STL=ON -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + ${OPTIONS} ) vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) -- cgit v1.2.3 From 0af8b7825aacb3144cec6e557db3356fa5a3e843 Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 10 Jan 2019 01:38:46 +0500 Subject: [ebml] Update to v1.3.6 (#5091) * [ebml] Update to v1.3.6 * [ebml] Cleanup --- ports/ebml/CMakeLists.txt | 132 -------------------------------------------- ports/ebml/CONTROL | 6 +- ports/ebml/EbmlConfig.cmake | 1 - ports/ebml/portfile.cmake | 82 ++++++++++----------------- 4 files changed, 33 insertions(+), 188 deletions(-) delete mode 100644 ports/ebml/CMakeLists.txt delete mode 100644 ports/ebml/EbmlConfig.cmake diff --git a/ports/ebml/CMakeLists.txt b/ports/ebml/CMakeLists.txt deleted file mode 100644 index 7d99a13a4..000000000 --- a/ports/ebml/CMakeLists.txt +++ /dev/null @@ -1,132 +0,0 @@ -cmake_minimum_required(VERSION 3.1.2) - -project(ebml VERSION 1.3.5) - -option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF) -option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF) - -include(GNUInstallDirs) - -set(libebml_SOURCES - src/Debug.cpp - src/EbmlBinary.cpp - src/EbmlContexts.cpp - src/EbmlCrc32.cpp - src/EbmlDate.cpp - src/EbmlDummy.cpp - src/EbmlElement.cpp - src/EbmlFloat.cpp - src/EbmlHead.cpp - src/EbmlMaster.cpp - src/EbmlSInteger.cpp - src/EbmlStream.cpp - src/EbmlString.cpp - src/EbmlSubHead.cpp - src/EbmlUInteger.cpp - src/EbmlUnicodeString.cpp - src/EbmlVersion.cpp - src/EbmlVoid.cpp - src/IOCallback.cpp - src/MemIOCallback.cpp - src/MemReadIOCallback.cpp - src/SafeReadIOCallback.cpp - src/StdIOCallback.cpp) - -set(libebml_PUBLIC_HEADERS - ebml/Debug.h - ebml/EbmlBinary.h - ebml/EbmlConfig.h - ebml/EbmlContexts.h - ebml/EbmlCrc32.h - ebml/EbmlDate.h - ebml/EbmlDummy.h - ebml/EbmlElement.h - ebml/EbmlEndian.h - ebml/EbmlFloat.h - ebml/EbmlHead.h - ebml/EbmlId.h - ebml/EbmlMaster.h - ebml/EbmlSInteger.h - ebml/EbmlStream.h - ebml/EbmlString.h - ebml/EbmlSubHead.h - ebml/EbmlTypes.h - ebml/EbmlUInteger.h - ebml/EbmlUnicodeString.h - ebml/EbmlVersion.h - ebml/EbmlVoid.h - ebml/IOCallback.h - ebml/MemIOCallback.h - ebml/MemReadIOCallback.h - ebml/SafeReadIOCallback.h - ebml/StdIOCallback.h) -if(WIN32) - list(APPEND libebml_SOURCES - src/platform/win32/WinIOCallback.cpp) - list(APPEND libebml_PUBLIC_HEADERS - src/platform/win32/WinIOCallback.h) -endif() - -set(libebml_C_PUBLIC_HEADERS ebml/c/libebml_t.h) - -add_library(ebml ${libebml_SOURCES} ${libebml_PUBLIC_HEADERS} ${libebml_C_PUBLIC_HEADERS}) -if(WIN32) - include(CheckIncludeFile) - check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H) - if(HAVE_WINAPIFAMILY_H) - target_compile_definitions(ebml PUBLIC HAVE_WINAPIFAMILY_H) - endif() -endif() -set_target_properties(ebml PROPERTIES - VERSION 4.0.0 - SOVERSION 4) -target_include_directories(ebml PUBLIC - $ - $) -if(MSVC) - target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS) -endif() -if(BUILD_SHARED_LIBS) - set_target_properties(ebml - PROPERTIES - DEFINE_SYMBOL "EBML_DLL_EXPORT" - C_VISIBILITY_PRESET hidden - VISIBILITY_INLINES_HIDDEN 1) - target_compile_definitions(ebml - PUBLIC EBML_DLL - PRIVATE EBML_DLL_EXPORT) -endif() - -install(TARGETS ebml - EXPORT EbmlTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -install(FILES ${libebml_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ebml) -install(FILES ${libebml_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ebml/c) - -if(NOT DISABLE_PKGCONFIG) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\$\{prefix\}") - set(libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") - set(PACKAGE_VERSION ${PROJECT_VERSION}) - configure_file(libebml.pc.in libebml.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libebml.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -endif() - -if(NOT DISABLE_CMAKE_CONFIG) - if(WIN32) - set(CMAKE_INSTALL_PACKAGEDIR cmake) - else() - set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - endif() - include(CMakePackageConfigHelpers) - write_basic_package_version_file(EbmlConfigVersion.cmake COMPATIBILITY SameMajorVersion) - install(EXPORT EbmlTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) - install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/EbmlConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/EbmlConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) -endif() diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL index e4872dd6a..1b3ec442a 100644 --- a/ports/ebml/CONTROL +++ b/ports/ebml/CONTROL @@ -1,3 +1,3 @@ -Source: ebml -Version: 1.3.5-1 -Description: a C++ libary to parse EBML files +Source: ebml +Version: 1.3.6-1 +Description: a C++ libary to parse EBML files diff --git a/ports/ebml/EbmlConfig.cmake b/ports/ebml/EbmlConfig.cmake deleted file mode 100644 index 5752fa632..000000000 --- a/ports/ebml/EbmlConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/EbmlTargets.cmake) diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 4b92f37bb..573801fb6 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -1,52 +1,30 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - -include(vcpkg_common_functions) - -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 Matroska-Org/libebml - REF release-1.3.5 - SHA512 ccfa58aebb8685b2dbbab7038ab7f7e0788dba2fc391abafad5a0e05c71c8f02c7e1e3521e1c59076057f9643737c2d96a4fffdeb7991214234f2db80c78254b - HEAD_REF master -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EbmlConfig.cmake DESTINATION ${SOURCE_PATH}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/export-endofstreamx.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DDISABLE_PKGCONFIG=1 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright) +include(vcpkg_common_functions) + +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 Matroska-Org/libebml + REF release-1.3.6 + SHA512 249ff2e9b381d827311eaec910962685243a3b65335c7bd404a35e11cd204c63bc7ea69787f0e27ea9c9144024e45867fd4ae7d30688a3695cd45fee1ce89ec9 + HEAD_REF master + PATCHES export-endofstreamx.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DDISABLE_PKGCONFIG=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright) -- cgit v1.2.3 From bbb68a2ec882df1fa76b21ba30d686f915e668a4 Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 10 Jan 2019 03:26:43 +0500 Subject: [matroska] Update to 1.4.9 (#5092) --- ports/matroska/CONTROL | 2 +- ports/matroska/MatroskaConfig.cmake | 1 - ports/matroska/portfile.cmake | 7 ++----- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 ports/matroska/MatroskaConfig.cmake diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL index cd688d697..04feb0dd4 100644 --- a/ports/matroska/CONTROL +++ b/ports/matroska/CONTROL @@ -1,4 +1,4 @@ Source: matroska -Version: 1.4.8 +Version: 1.4.9 Description: a C++ libary to parse Matroska files (.mkv and .mka) Build-Depends: ebml diff --git a/ports/matroska/MatroskaConfig.cmake b/ports/matroska/MatroskaConfig.cmake deleted file mode 100644 index e9a88bd49..000000000 --- a/ports/matroska/MatroskaConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/MatroskaTargets.cmake) diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index fd3624584..b89a1cb6e 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -19,14 +19,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libmatroska - REF release-1.4.8 - SHA512 3591508674ff69a185d143b4ce5c34a4c9913ad806ad94c6a96b694752f3e67b029037573564ab3bf5d9303a4b6c5fdd55865f140ab0d26df53b051b71957d0a + REF release-1.4.9 + SHA512 0c2e7324d62e1fc28b00a899f1d2fda88a3de474ea25c51624d716b869db72b4645b64cc434a0bdb7cefdd63b354de59920d4011889554f95a2905020b139fb1 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/MatroskaConfig.cmake DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja -- cgit v1.2.3 From 7578a485b181ded330b87cc72726f01e38ff7ed6 Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Wed, 9 Jan 2019 17:19:27 -0600 Subject: [pybind11] Upgrade to v2.2.4 (#5087) --- ports/pybind11/CONTROL | 2 +- ports/pybind11/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index 67fdaea5d..880d6c3b7 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,4 +1,4 @@ Source: pybind11 -Version: 2.2.3-1 +Version: 2.2.4 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) \ No newline at end of file diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 16a9b9726..55cfb1fa1 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.2.3 - SHA512 3a43b43f44ae4a6453fe3b875384acc868310177216938cb564536e6b73c56002743137e5f61cf4ecbd6c56e3b39476ebf06aea33d460581fc7d8ba7b2a22a67 + REF v2.2.4 + SHA512 6bddf5c885ff92a3e373bcedc6574dfefe8be9ebb6176c6c96d475457466c76bfb982c6df4066cb0fbead4b867f87dbc4fbc1605c80852635016f614330ce041 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/aliastemplates.patch -- cgit v1.2.3 From 3d23c3c0ea486d8e8024c97f56c8b802c9ba65fc Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Thu, 10 Jan 2019 12:25:07 +0300 Subject: [autobahn] Add autobahn-cpp header-only library for WAMP --- ports/autobahn/CONTROL | 4 ++++ ports/autobahn/portfile.cmake | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ports/autobahn/CONTROL create mode 100644 ports/autobahn/portfile.cmake diff --git a/ports/autobahn/CONTROL b/ports/autobahn/CONTROL new file mode 100644 index 000000000..7a08d9f96 --- /dev/null +++ b/ports/autobahn/CONTROL @@ -0,0 +1,4 @@ +Source: autobahn +Version: 18.4.1 +Build-Depends: websocketpp, msgpack, boost-asio, boost-thread +Description: WAMP for C++ in Boost/Asio https://crossbar.io/autobahn diff --git a/ports/autobahn/portfile.cmake b/ports/autobahn/portfile.cmake new file mode 100644 index 000000000..ea7094187 --- /dev/null +++ b/ports/autobahn/portfile.cmake @@ -0,0 +1,30 @@ +#header-only library +include(vcpkg_common_functions) + +set(USE_UPSTREAM OFF) +if("upstream" IN_LIST FEATURES) + set(USE_UPSTREAM ON) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO crossbario/autobahn-cpp + REF v18.4.1 + SHA512 a3325e06731698a2c5d8c233581f275a9b653e98b74e7382f83fc62111dec9d66bbd5803cc71e8b5125ecee6d380d3cf1c6e83926e06912888201c2aa4ab7a15 + HEAD_REF master +) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/autobahn) + +# Copy the header files +file(COPY "${SOURCE_PATH}/autobahn" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.hpp") +file(COPY "${SOURCE_PATH}/autobahn" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.ipp") + +set(PACKAGE_INSTALL_INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include") +set(PACKAGE_INIT " +macro(set_and_check) + set(\${ARGV}) +endmacro() +") + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/autobahn/copyright COPYONLY) -- cgit v1.2.3 From 5985b82b053cb9a371151485ea010a28ccce4e34 Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Thu, 10 Jan 2019 10:19:09 -0800 Subject: Fix typo of the source name in port.camke (#5098) --- ports/milerius-sfml-imgui/CONTROL | 2 +- ports/milerius-sfml-imgui/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/milerius-sfml-imgui/CONTROL b/ports/milerius-sfml-imgui/CONTROL index a9f8e9096..88eb539ef 100644 --- a/ports/milerius-sfml-imgui/CONTROL +++ b/ports/milerius-sfml-imgui/CONTROL @@ -1,4 +1,4 @@ Source: milerius-sfml-imgui -Version: 1.1 +Version: 1.1-1 Description: imgui dll for sfml usage Build-Depends: sfml (windows), imgui diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake index 1520d5e35..d4975da15 100644 --- a/ports/milerius-sfml-imgui/portfile.cmake +++ b/ports/milerius-sfml-imgui/portfile.cmake @@ -20,5 +20,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sfml-imgui) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfml-imgui) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/copyright) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright) -- cgit v1.2.3 From 4d2ffdfbcf9ed9239549d8620af59e0469e56a4d Mon Sep 17 00:00:00 2001 From: Nikolay Simakov Date: Thu, 10 Jan 2019 14:54:05 -0500 Subject: fixed building plplot with wxwidget feature on (#5089) * fixed builting plplot with wxwidget feature on * [plplot] Use vcpkg_extract_source_archive_ex --- ports/plplot/0001-findwxwidgets-fixes.patch | 59 +++++++++++++++++++++++++++++ ports/plplot/0002-wxwidgets-dev-fixes.patch | 12 ++++++ ports/plplot/CONTROL | 2 +- ports/plplot/portfile.cmake | 24 ++++++------ 4 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 ports/plplot/0001-findwxwidgets-fixes.patch create mode 100644 ports/plplot/0002-wxwidgets-dev-fixes.patch diff --git a/ports/plplot/0001-findwxwidgets-fixes.patch b/ports/plplot/0001-findwxwidgets-fixes.patch new file mode 100644 index 000000000..72b1d6c25 --- /dev/null +++ b/ports/plplot/0001-findwxwidgets-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake +index 4d3a2d1..eaaa358 100644 +--- a/cmake/modules/FindwxWidgets.cmake ++++ b/cmake/modules/FindwxWidgets.cmake +@@ -515,7 +515,16 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(_WX_ARCH _x64) + endif() + endif() +- if(BUILD_SHARED_LIBS) ++ if(VCPKG_TARGET_TRIPLET) ++ find_library(wxWidgets_LIB_DIR ++ NAMES ++ wxmsw31ud_core.lib ++ wxmsw31u_core.lib ++ PATHS ++ DOC "Path to wxWidgets libraries" ++ ) ++ get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY) ++ elseif(BUILD_SHARED_LIBS) + find_path(wxWidgets_LIB_DIR + NAMES + msw/wx/setup.h +@@ -571,6 +580,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(wxWidgets_DEFINITIONS WXUSINGDLL) + DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") + endif() ++ if(VCPKG_TARGET_TRIPLET) ++ set(wxWidgets_DEFINITIONS WXUSINGDLL) ++ endif(VCPKG_TARGET_TRIPLET) + + # Search for available configuration types. + foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) +@@ -582,6 +594,15 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + endif() + endforeach() + DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") ++ ++ if(VCPKG_TARGET_TRIPLET) ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(WX_CONFIGURATION "mswud") ++ else() ++ set(WX_CONFIGURATION "mswu") ++ endif() ++ set(WX_${WX_CONFIGURATION}_FOUND TRUE) ++ endif(VCPKG_TARGET_TRIPLET) + + if(WX_CONFIGURATION) + set(wxWidgets_FOUND TRUE) +@@ -616,7 +637,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) + + # Set wxWidgets lib setup include directory. +- if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) ++ if(VCPKG_TARGET_TRIPLET) ++ set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include") ++ elseif(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) + set(wxWidgets_INCLUDE_DIRS + ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) + else() diff --git a/ports/plplot/0002-wxwidgets-dev-fixes.patch b/ports/plplot/0002-wxwidgets-dev-fixes.patch new file mode 100644 index 000000000..707c64796 --- /dev/null +++ b/ports/plplot/0002-wxwidgets-dev-fixes.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp +index f025bd8..f5881b1 100644 +--- a/drivers/wxwidgets_dev.cpp ++++ b/drivers/wxwidgets_dev.cpp +@@ -31,6 +31,7 @@ + + // Headers needed for Rand + #ifdef WIN32 ++#define _WINSOCKAPI_ + // This include must occur before any other include of stdlib.h due to + // the #define _CRT_RAND_S + #define _CRT_RAND_S diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL index c278778b0..71bdb1a51 100644 --- a/ports/plplot/CONTROL +++ b/ports/plplot/CONTROL @@ -1,5 +1,5 @@ Source: plplot -Version: 5.13.0-1 +Version: 5.13.0-2 Build-Depends: freetype, zlib, libpng, bzip2 Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer. diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 7b35f0a15..c98c8253b 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -2,26 +2,28 @@ include(vcpkg_common_functions) set(PLPLOT_VERSION 5.13.0) set(PLPLOT_HASH 1d5cb5da17d4bde6d675585bff1f8dcb581719249a0b2687867e767703f8dab0870e7ea44b9549a497f4ac0141a3cabf6761c49520c0e2b26ffe581468512cbb) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/plplot-${PLPLOT_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/plplot/files/plplot/${PLPLOT_VERSION}%20Source/plplot-${PLPLOT_VERSION}.tar.gz/download" FILENAME "plplot-${PLPLOT_VERSION}.tar.gz" SHA512 ${PLPLOT_HASH} ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PLPLOT_VERSION} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/0001-findwxwidgets-fixes.patch" + "${CMAKE_CURRENT_LIST_DIR}/0002-wxwidgets-dev-fixes.patch" + "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch" +) set(BUILD_with_wxwidgets OFF) if("wxwidgets" IN_LIST FEATURES) set(BUILD_with_wxwidgets ON) endif() -# Patch build scripts -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -32,9 +34,7 @@ vcpkg_configure_cmake( -DPLPLOT_USE_QT5=OFF -DENABLE_ocaml=OFF -DPL_DOUBLE=ON - -DENABLE_wxwidgets=${ENABLE_wxwidgets} - -DPLD_wxpng=${ENABLE_wxwidgets} - -DPLD_wxwidgets=${ENABLE_wxwidgets} + -DPLD_wxwidgets=${BUILD_with_wxwidgets} -DENABLE_DYNDRIVERS=OFF -DDATA_DIR=${CURRENT_PACKAGES_DIR}/share/plplot OPTIONS_DEBUG @@ -51,6 +51,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/plplot) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe ${CURRENT_PACKAGES_DIR}/bin/pltek.exe + ${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe + ${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") -- cgit v1.2.3 From 1955e755b729fcc086fce76b82172a88ced22ca8 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Thu, 10 Jan 2019 15:51:21 -0500 Subject: [gettext] Add mirror (#5055) * [gettext] Add mirror * [gettext] http -> https for original download URL --- ports/gettext/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 7f0b6bc12..2a26817d7 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -8,7 +8,7 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" + URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-0.19.tar.gz" FILENAME "gettext-0.19.tar.gz" SHA512 a5db035c582ff49d45ee6eab9466b2bef918e413a882019c204a9d8903cb3770ddfecd32c971ea7c7b037c7b69476cf7c56dcabc8b498b94ab99f132516c9922 ) -- cgit v1.2.3 From b85954bc3be83eb3dcaea7ae7e70d107ea37d1c0 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 10 Jan 2019 17:12:29 -0500 Subject: v1.0.3.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 6335ac51e..a82e3ba45 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil -Version: 1.0.2.1 +Version: 1.0.3.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. Build-Depends: atlmfc diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2a50f185f..cc5a70854 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -28,8 +28,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EMCECS/ecs-object-client-windows-cpp - REF v1.0.2.1 - SHA512 0d85f8c61f8b4644b75bbd64e1d2e705bb09b0790b4011f6c26dee8d068f44bf6be562161489368de66dcd801ee71cc6dc40921cac0a01858137e7683cfb117e + REF v1.0.3.1 + SHA512 0bed2a0296dcb0ea952734feb44a9f35b01d1c6e08dc132cc2d006003df21e5e1a3070ab44f5c9e6986b230c292d62f695f7a06700e7ef8d50efc87f92d5814f HEAD_REF master PATCHES NoLibSyms.patch ) -- cgit v1.2.3 From 1fe5a31cd771313e38c46cd63ad3a33aa0acad90 Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Thu, 10 Jan 2019 14:22:39 -0800 Subject: Fix error C2169 (#5118) --- ports/libmupdf/CONTROL | 2 +- ports/libmupdf/Fix-error-C2169.patch | 12 ++++++++++++ ports/libmupdf/portfile.cmake | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/libmupdf/Fix-error-C2169.patch diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL index 36ae69488..df04d00a2 100644 --- a/ports/libmupdf/CONTROL +++ b/ports/libmupdf/CONTROL @@ -1,4 +1,4 @@ Source: libmupdf -Version: 1.12.0 +Version: 1.12.0-1 Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec Description: a lightweight PDF, XPS, and E-book library diff --git a/ports/libmupdf/Fix-error-C2169.patch b/ports/libmupdf/Fix-error-C2169.patch new file mode 100644 index 000000000..164ffe157 --- /dev/null +++ b/ports/libmupdf/Fix-error-C2169.patch @@ -0,0 +1,12 @@ +diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h +index 0552771..42fd037 100644 +--- a/include/mupdf/fitz/system.h ++++ b/include/mupdf/fitz/system.h +@@ -117,7 +117,6 @@ static __inline int signbit(double x) + #define isinf(x) (!_finite(x)) + #endif + +-#define hypotf _hypotf + #define atoll _atoi64 + + char *fz_utf8_from_wchar(const wchar_t *s); diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index b3618ea80..2af2327cc 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.12.0 SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da HEAD_REF master + PATCHES + "${CURRENT_PORT_DIR}/Fix-error-C2169.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -- cgit v1.2.3 From 0e08805a7b60e9c74cf1232cc28652d8761c88dc Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 10 Jan 2019 17:05:54 -0800 Subject: [openssl-uwp] Patch Configure script to set UNICODE --- ports/openssl-uwp/fix-uwp-configure-unicode.patch | 19 +++++++++++++++++++ ports/openssl-uwp/portfile.cmake | 12 ++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/openssl-uwp/fix-uwp-configure-unicode.patch diff --git a/ports/openssl-uwp/fix-uwp-configure-unicode.patch b/ports/openssl-uwp/fix-uwp-configure-unicode.patch new file mode 100644 index 000000000..a3b645ad1 --- /dev/null +++ b/ports/openssl-uwp/fix-uwp-configure-unicode.patch @@ -0,0 +1,19 @@ +diff --git a/Configure b/Configure +index 67df080..57a15d8 100644 +--- a/Configure ++++ b/Configure +@@ -598,12 +598,12 @@ my %table=( + # 'perl Configure VC-WINSTORE + "VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # 'perf Configure VC-WINUNIVERSAL +-"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINPHONE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINAPP -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", +-"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + # Unified CE target + "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index 77264b3ec..83eff7dcc 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -19,7 +19,6 @@ endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2q_WinRT) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) @@ -33,11 +32,12 @@ vcpkg_download_distfile(ARCHIVE SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-configure-unicode.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) -- cgit v1.2.3 From bcdabb33868787e3efb227bb2150f65d6acbd7f5 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 10 Jan 2019 17:42:56 -0800 Subject: Change CONTROL version --- ports/openssl-uwp/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index 02b19126a..1bfa6651a 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2q-winrt +Version: 1.0.2q-winrt-1 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. -- cgit v1.2.3 From dffdc492710b4263cc55935b2f36bd63d504edeb Mon Sep 17 00:00:00 2001 From: cDc Date: Fri, 11 Jan 2019 17:04:47 +0200 Subject: [TinyEXIF] Update to version 1.0.2 --- ports/tinyexif/CONTROL | 2 +- ports/tinyexif/namespace_tinyxml2.patch | 31 ------------------------------- ports/tinyexif/portfile.cmake | 6 ++---- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 ports/tinyexif/namespace_tinyxml2.patch diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index ce7162ae9..259421043 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.1-2 +Version: 1.0.2 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/namespace_tinyxml2.patch b/ports/tinyexif/namespace_tinyxml2.patch deleted file mode 100644 index d27c99c68..000000000 --- a/ports/tinyexif/namespace_tinyxml2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f22584b..1ba8329 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ if(BUILD_SHARED_LIBS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface - endif() - -- target_link_libraries(TinyEXIF tinyxml2) -+ target_link_libraries(TinyEXIF tinyxml2::tinyxml2) - set_target_properties(TinyEXIF PROPERTIES - COMPILE_DEFINITIONS "TINYEXIF_EXPORT" - VERSION "${GENERIC_LIB_VERSION}" -@@ -121,7 +121,7 @@ endif() - if(BUILD_STATIC_LIBS) - add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h) - -- target_link_libraries(TinyEXIFstatic tinyxml2) -+ target_link_libraries(TinyEXIFstatic tinyxml2::tinyxml2) - set_target_properties(TinyEXIFstatic PROPERTIES - OUTPUT_NAME TinyEXIF - VERSION "${GENERIC_LIB_VERSION}" -@@ -162,7 +162,7 @@ if(BUILD_DEMO) - target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT) - else(BUILD_STATIC_LIBS) - add_dependencies(TinyEXIFdemo TinyEXIFstatic) -- target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2) -+ target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2::tinyxml2) - endif() - endif() - diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 716415453..8464f2ec0 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -3,11 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF - REF 1.0.1 - SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23 + REF 1.0.2 + SHA512 956880ccd0ccdee80f438ee899c7a88e02cc3dd6f09b62cbc71b9597501f1c8e06a74cf837d3f231dbd0416c062cd05a9854f46a55671c06c01bbc9437442159 HEAD_REF master - PATCHES - namespace_tinyxml2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -- cgit v1.2.3 From 885ca2ce6cd1c9353f4a0f28f94547a1342a7ae2 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 11 Jan 2019 20:15:34 +0100 Subject: [libjpeg-turbo] use d suffix for debug libs (#4965) * use d suffix for debug libs, improve compatibility with official FindJPEG.cmake (cmake 3.13) * [libjpeg] fix also non-static case * [libjpeg-turbo] bump version * [libjpeg-turbo] fixes for regression on Linux/macOS * [libjpeg-turbo] fix regression in qt5-base * [linkjpeg-turbo] force CI test --- ports/libjpeg-turbo/CONTROL | 2 +- ports/libjpeg-turbo/portfile.cmake | 9 ++++++--- ports/qt5-base/portfile.cmake | 6 ++++-- ports/vxl/portfile.cmake | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index fa72d68b0..88f6e689a 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.5.3-1 +Version: 1.5.3-2 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 c077fd16c..002818c47 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -51,11 +51,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Rename libraries for static builds -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") endif() file(COPY diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b6d140f88..696ae0cb6 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -79,13 +79,14 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore ${CORE_OPTIONS} -mp -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + LIBJPEG_LIBS="-ljpeg" ZLIB_LIBS="-lzlib" LIBPNG_LIBS="-llibpng16" FREETYPE_LIBS="-lfreetype" PSQL_LIBS="-llibpq" OPTIONS_DEBUG + LIBJPEG_LIBS="-ljpegd" ZLIB_LIBS="-lzlibd" LIBPNG_LIBS="-llibpng16d" PSQL_LIBS="-llibpqd" @@ -100,8 +101,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") ${CORE_OPTIONS} -no-sqlite -no-opengl # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a" @@ -109,6 +110,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a" "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a" OPTIONS_DEBUG + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 75d89ee2d..9735f144b 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -47,4 +47,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# \ No newline at end of file -- cgit v1.2.3 From e4a767245a63261d5b0291d85c0bd5661f4287b7 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Fri, 11 Jan 2019 22:23:09 +0300 Subject: [nlohmann-json] Update to 3.5.0 (#5033) --- ports/nlohmann-json/CONTROL | 2 +- ports/nlohmann-json/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 1e628ba81..6d8f59edc 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,3 +1,3 @@ Source: nlohmann-json -Version: 3.4.0 +Version: 3.5.0 Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index d3926cab6..66096ce89 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_VERSION 3.4.0) +set(SOURCE_VERSION 3.5.0) vcpkg_download_distfile(HEADER URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp" FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp" - SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d + SHA512 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0 ) vcpkg_download_distfile(LICENSE -- cgit v1.2.3 From 57f7f49aba15b05d3093445bb813c1f5cfbbd6c5 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 14 Jan 2019 20:31:58 +0800 Subject: [spdlog] Update to 1.3.0 --- ports/spdlog/CONTROL | 2 +- ports/spdlog/disable-master-project-check.patch | 17 ++++ ports/spdlog/fmt-external-cmake-option.patch | 100 ------------------------ ports/spdlog/portfile.cmake | 7 +- 4 files changed, 21 insertions(+), 105 deletions(-) create mode 100644 ports/spdlog/disable-master-project-check.patch delete mode 100644 ports/spdlog/fmt-external-cmake-option.patch diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 8ff960a23..6214deb4d 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 1.2.1 +Version: 1.3.0 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/disable-master-project-check.patch b/ports/spdlog/disable-master-project-check.patch new file mode 100644 index 000000000..69f5882da --- /dev/null +++ b/ports/spdlog/disable-master-project-check.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1d9656..f8cb60c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,9 +46,9 @@ add_library(spdlog::spdlog ALIAS spdlog) + + # Check if spdlog is being used directly or via add_subdirectory + set(SPDLOG_MASTER_PROJECT OFF) +-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) +- set(SPDLOG_MASTER_PROJECT ON) +-endif() ++#if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) ++# set(SPDLOG_MASTER_PROJECT ON) ++#endif() + + option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT}) + option(SPDLOG_BUILD_BENCH "Build benchmarks" ${SPDLOG_MASTER_PROJECT}) diff --git a/ports/spdlog/fmt-external-cmake-option.patch b/ports/spdlog/fmt-external-cmake-option.patch deleted file mode 100644 index 635eb3b23..000000000 --- a/ports/spdlog/fmt-external-cmake-option.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc75346..5b3a5c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,6 +59,12 @@ cmake_dependent_option(SPDLOG_BUILD_TESTING - "BUILD_TESTING" OFF - ) - -+option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) -+ -+if(SPDLOG_FMT_EXTERNAL) -+ find_package(fmt REQUIRED CONFIG) -+endif() -+ - target_include_directories( - spdlog - INTERFACE -@@ -66,6 +72,11 @@ target_include_directories( - "$" - ) - -+if(SPDLOG_FMT_EXTERNAL) -+ target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL) -+ target_link_libraries(spdlog INTERFACE fmt::fmt) -+endif() -+ - set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include") - - if(SPDLOG_BUILD_EXAMPLES) -@@ -88,7 +99,8 @@ set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}") - set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake") --set(project_config "${PROJECT_NAME}Config.cmake") -+set(project_config "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") -+set(targets_config "${PROJECT_NAME}Targets.cmake") - set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc") - set(targets_export_name "${PROJECT_NAME}Targets") - set(namespace "${PROJECT_NAME}::") -@@ -101,6 +113,8 @@ write_basic_package_version_file( - - # configure pkg config file - configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY) -+# configure spdlogConfig.cmake file -+configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY) - - # install targets - install( -@@ -114,9 +128,9 @@ install( - DESTINATION "${include_install_dir}" - ) - --# install project version file -+# install project config and version file - install( -- FILES "${version_config}" -+ FILES "${project_config}" "${version_config}" - DESTINATION "${config_install_dir}" - ) - -@@ -126,19 +140,19 @@ install( - DESTINATION "${pkgconfig_install_dir}" - ) - --# install project config file -+# install targets config file - install( - EXPORT "${targets_export_name}" - NAMESPACE "${namespace}" - DESTINATION "${config_install_dir}" -- FILE ${project_config} -+ FILE ${targets_config} - ) - --# export build directory config file -+# export build directory targets file - export( - EXPORT ${targets_export_name} - NAMESPACE "${namespace}" -- FILE ${project_config} -+ FILE ${targets_config} - ) - - # register project in CMake user registry -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index ba0b36f..0b0fd11 100644 ---- a/cmake/Config.cmake.in -+++ b/cmake/Config.cmake.in -@@ -21,4 +21,11 @@ - # * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - # *************************************************************************/ - -+set(SPDLOG_FMT_EXTERNAL @SPDLOG_FMT_EXTERNAL@) -+ - include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") -+ -+if(SPDLOG_FMT_EXTERNAL) -+ include(CMakeFindDependencyMacro) -+ find_dependency(fmt CONFIG) -+endif() diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index c676c6467..ccc961b18 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,18 +3,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.2.1 - SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 + REF v1.3.0 + SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f HEAD_REF v1.x PATCHES - fmt-external-cmake-option.patch # This patch is in the upstream project and can be removed next version update. + disable-master-project-check.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DSPDLOG_BUILD_TESTING=OFF -DSPDLOG_FMT_EXTERNAL=ON ) -- cgit v1.2.3 From 6db1a55827acacdbad0c13f61fdd5eb961ace7ad Mon Sep 17 00:00:00 2001 From: pravic Date: Mon, 14 Jan 2019 23:09:51 +0300 Subject: [sciter] Update to 4.2.4.6184 (#4260) * [sciter] Update to 4.2.0.6064 * [sciter] Update to 4.2.1.6085 * [sciter] Update to 4.2.2.6090 * [sciter] Update to 4.2.3.6108 * [sciter] Update to 4.2.4.6184 * Update sciter to 4.2.6.9 --- ports/sciter/CONTROL | 2 +- ports/sciter/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL index fb49f7b36..c82708a73 100644 --- a/ports/sciter/CONTROL +++ b/ports/sciter/CONTROL @@ -1,4 +1,4 @@ Source: sciter -Version: 4.2.2 +Version: 4.2.6.9 Description: Sciter is an embeddable HTML/CSS/scripting engine. Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 2c5130421..8ae54344e 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) # header-only library set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION 8add927504c84d72833973a659e834081672237f) -set(SCITER_SHA 85aa711b51e7911f62162cf8c3b74e7693c92a02618e074ed24578da56cf7a589e8336a677b21e7359957bcd7357adfb5da54a9fafa12b7f0bee8e480115c84c) +set(SCITER_REVISION c926703b2cce972875e7f6379c525eef66c95986) +set(SCITER_SHA 9a87ce12db9b2ef1e3abce3e475a9413a8a9301bab3d17341c94d4281e3bf616347ba8a4089f756ec38fed311bb4ee9045c8f85d0c40039ed3c0b96413aceeb4) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH 64) -- cgit v1.2.3 From 531515c4caf68f8b282bc657cbd8e59313af52ed Mon Sep 17 00:00:00 2001 From: Corbin Date: Mon, 14 Jan 2019 14:02:47 -0800 Subject: [libass] Adding new port (#5026) Added libass control/portfile for vcpkg as requested here: https://github.com/Microsoft/vcpkg/issues/4678 --- ports/libass/CONTROL | 3 +++ ports/libass/portfile.cmake | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/libass/CONTROL create mode 100644 ports/libass/portfile.cmake diff --git a/ports/libass/CONTROL b/ports/libass/CONTROL new file mode 100644 index 000000000..0142a5e51 --- /dev/null +++ b/ports/libass/CONTROL @@ -0,0 +1,3 @@ +Source: libass +Version: 0.14.0 +Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake new file mode 100644 index 000000000..a7380a6e6 --- /dev/null +++ b/ports/libass/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libass/libass + REF 98727c3b78f44cb3bbc955fcf5d977ebd911d5ca + SHA512 d466108180cea598b817f89aa21a1021ed2a763580d9aad51b054aa120186af48ab4264907e49ddcb38479a28d87d5431751a28afee9cb83ad7623f002d99c57 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/libass/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From e86780d75ffb4476f58c725d40e2456eb503b766 Mon Sep 17 00:00:00 2001 From: Daniel Marshall Date: Mon, 14 Jan 2019 22:29:58 +0000 Subject: [fmt] Update to 5.3.0 (#5136) --- 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 14306b730..7a82286dd 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,3 +1,3 @@ Source: fmt -Version: 5.2.1 +Version: 5.3.0 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 a12f66c39..d36efcadc 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 5.2.1 - SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8 + REF 5.3.0 + SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8 HEAD_REF master ) -- cgit v1.2.3 From b4badcd56ae16129cf1faa2728c367b8cd035959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20de=20Jes=C3=BAs=20Medina=20R=C3=ADos?= Date: Mon, 14 Jan 2019 22:49:43 -0800 Subject: [x265] update to version 2.9 --- ports/x265/disable-install-pdb.patch | 25 +++++++++++++++++-------- ports/x265/portfile.cmake | 4 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ports/x265/disable-install-pdb.patch b/ports/x265/disable-install-pdb.patch index 4601f2728..1b58d287c 100644 --- a/ports/x265/disable-install-pdb.patch +++ b/ports/x265/disable-install-pdb.patch @@ -1,13 +1,22 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index e6d49c6..2409caa 100644 +index 33b6523..06e3193 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS) - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) - endif() +@@ -556,13 +556,13 @@ endif() install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) --if(WIN32) -+if(WIN32 AND 0) + if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) if(MSVC_IDE) - install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) - install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) +- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) +- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) ++ #install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) ++ #install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) + install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY) + install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY) + else() +- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) +- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) ++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) ++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) + install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY) + install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY) + endif() diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 0ab99b7d2..090a2db22 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO multicoreware/x265 - REF 2.7 - SHA512 fd2f43830bbe4fa0ac98ac6d8e3689d0a8a5142da9d67c0dd16fbbde40500c52a370c5c5a30e93195c2e998660a51abab76b09baed87378c9e366cf2f694f2b9 + REF 2.9 + SHA512 5bd9732b6af67e7f7c5b1e71d26acbd98fb98e9e81c6052cda2e1e9254e3eaaa28914805d3f8cd2535dd042022047e54f8ae49ea02269160b609d191a7d99e94 HEAD_REF master ) -- cgit v1.2.3 From 3d1e6ff7940a4baa753a261214d1e858008d9446 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 15 Jan 2019 18:25:04 +0800 Subject: [imgui] Update to 1.67 --- ports/imgui/CONTROL | 2 +- ports/imgui/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 46d927c9e..e3b447015 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.66b +Version: 1.67 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 756574d76..17ceb6890 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.66b - SHA512 894339a70f99c517d9306c49d861a43710b936e71067ddd322f5e771396f8e658a541111fcb00ce9010599f0ec9702d029d18b155199c7635129fd659ac13dbc + REF v1.67 + SHA512 c8b4e9eeafec480ec524d230d094ea40633945fd6afea7bea0fe84ee28db4d12351a0afcb02ad29aa16a054e94a914863a1eda5605fd80d79d3813fa75af0dce HEAD_REF master ) -- cgit v1.2.3 From 4b0b4c8c4f307cf4592b205d5a30f13a87d29aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20de=20Jes=C3=BAs=20Medina=20R=C3=ADos?= Date: Tue, 15 Jan 2019 06:33:15 -0800 Subject: [x265] Update version in CONTROL --- ports/x265/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 87e1867bd..537556763 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.7-1 +Version: 2.9-1 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. -- cgit v1.2.3 From b0a9ea582caa45f3a8a6145fd8ba34afe1c094a9 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Tue, 15 Jan 2019 14:07:20 -0800 Subject: [imgui] Fix SHA512 --- ports/imgui/CONTROL | 2 +- ports/imgui/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index e3b447015..376a3a103 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.67 +Version: 1.67-1 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 17ceb6890..e5aaa471c 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF v1.67 - SHA512 c8b4e9eeafec480ec524d230d094ea40633945fd6afea7bea0fe84ee28db4d12351a0afcb02ad29aa16a054e94a914863a1eda5605fd80d79d3813fa75af0dce + SHA512 14cca66a55597517d6e1cafa59897b8e8f482db0a31a73d87a3ca634a12afe9ece2f423c17ece802e23bb2c09322502b2b2c4318054fad03bd1c537031fd6f71 HEAD_REF master ) -- cgit v1.2.3 From fbd61bec7795df3927742a84602f624162f32f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 15 Jan 2019 22:34:25 -0200 Subject: Updated ecm to version 5.53.0 (#4939) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- ports/ecm/CONTROL | 2 +- ports/ecm/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index 6076cf714..610344134 100644 --- a/ports/ecm/CONTROL +++ b/ports/ecm/CONTROL @@ -1,3 +1,3 @@ Source: ecm -Version: 5.50.0 +Version: 5.53.0 Description: Extra CMake Modules (ECM), extra modules and scripts for CMake diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 325a6505c..27cbddc53 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF v5.50.0 - SHA512 625f934b97c56cceed44d8fa0e335fb1f593806e52b8bfd2fd467561b4de2528940add756a8e903bd5502e912422cc3835e65e047cc4c205d3b8629452627abd + REF v5.53.0 + SHA512 147dea1c8b3b0f01fca4330fa4200a0f67c1a21a999979c94669459e347c8292cd94cb18d431d55883fff9d6acd5820428de500fc3cd790aa9f17d54bceeadc3 HEAD_REF master ) -- cgit v1.2.3 From 269450283bbc246fa0b9fb52de3406caf36833b0 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Wed, 16 Jan 2019 01:40:00 +0100 Subject: [selene] Update to v0.2. (#4920) * [selene] Update to v0.2. * [selene] Simplify portfile slightly * [selene] Ensure the library is only built statically. --- ports/selene/CONTROL | 4 ++-- ports/selene/portfile.cmake | 18 +++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ports/selene/CONTROL b/ports/selene/CONTROL index ddf9e22ea..df460687e 100644 --- a/ports/selene/CONTROL +++ b/ports/selene/CONTROL @@ -1,4 +1,4 @@ Source: selene -Version: 0.1.1 -Description: A C++14 image representation, processing and I/O library. +Version: 0.2-1 +Description: A C++17 image representation, processing and I/O library. Build-Depends: zlib, libpng, libjpeg-turbo diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake index c292a64d1..e427c99c2 100644 --- a/ports/selene/portfile.cmake +++ b/ports/selene/portfile.cmake @@ -1,34 +1,26 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/selene-0.1.1) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(SELENE_EXPORT_SYMBOLS TRUE) -else() - set(SELENE_EXPORT_SYMBOLS FALSE) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kmhofmann/selene - REF v0.1.1 - SHA512 7738c7b803ae6178f0099b2db2148d20edeff01c524e108e724896201800d82d3852a1ab7d0bd697907673d7030c55c81411f77bb957a0ee3811c46d07104c3e + REF v0.2 + SHA512 9ec1c767541cbe0b349302b7db13a55869003a230669636b6bc37de01be833633be0741b80f58109140b9563b7a7f4c6a5b7ab46ecb142688170a47dba24bdc4 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=${SELENE_EXPORT_SYMBOLS} ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/selene") vcpkg_copy_pdbs() # Include files should not be duplicated into the /debug/include directory. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/selene RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/selene RENAME copyright) -- cgit v1.2.3 From 7d5a8997ea7d9297496f8ecaf2f8720402143401 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Tue, 15 Jan 2019 13:53:12 -0800 Subject: update angle build. --- ports/angle/CMakeLists.txt | 21 ++++++++++++++++++--- ports/angle/CONTROL | 2 +- ports/angle/portfile.cmake | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index d553c9dbb..2616b4d48 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(angle CXX) +project(angle) if(WIN32 AND NOT WINDOWS_STORE) set(WINDOWS_DESKTOP 1) @@ -45,13 +45,22 @@ include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include) ########## # angle::common if(WINDOWS_ANY) - set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac") + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix") elseif(LINUX) set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac") elseif(APPLE) set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win") endif() -file(GLOB ANGLE_COMMON_SOURCES "src/common/*.h" "src/common/*.inl" "src/common/*.cpp" "src/common/third_party/base/*.h") +file(GLOB ANGLE_COMMON_SOURCES + "src/common/*.h" + "src/common/*.inl" + "src/common/*.cpp" + "src/common/third_party/smhasher/src/*.h" + "src/common/third_party/smhasher/src/*.cpp" + "src/common/third_party/xxhash/*.h" + "src/common/third_party/xxhash/*.c" + "src/common/third_party/base/anglebase/*.h" + "src/common/third_party/base/anglebase/*.cc") list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}") add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES}) target_include_directories(angle_common PUBLIC src/common/third_party/base) @@ -71,6 +80,10 @@ file(GLOB TRANSLATOR_SOURCES "src/compiler/translator/glslang.y" "src/compiler/translator/*.h" "src/compiler/translator/*.cpp" + "src/compiler/translator/tree_util/*.h" + "src/compiler/translator/tree_util/*.cpp" + "src/compiler/translator/tree_ops/*.h" + "src/compiler/translator/tree_ops/*.cpp" "src/third_party/compiler/ArrayBoundsClamper.cpp" ) add_library(angle_translator STATIC ${TRANSLATOR_SOURCES}) @@ -221,6 +234,7 @@ elseif(WINDOWS_DESKTOP) angle::renderer::d3d angle::renderer::win32 angle::renderer::opengl + gdi32 ) else() set(LIBANGLE_RENDERER_PLATFORM ) @@ -260,6 +274,7 @@ target_compile_definitions(libGLESv2 PRIVATE -DLIBGLESV2_IMPLEMENTATION PUBLIC -DGL_GLEXT_PROTOTYPES + -DGL_API= -DGL_APICALL= -DEGLAPI= ) diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 46e3407e8..dc348c48d 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,5 +1,5 @@ Source: angle -Version: 2017-06-14-8d471f-5 +Version: 2019-01-14-c2ee2cc Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. Build-Depends: egl-registry diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index e21aa83bc..16179fee7 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -1,5 +1,15 @@ include(vcpkg_common_functions) +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU) +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU) +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU) +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) message(STATUS "ANGLE currently only supports being built as a dynamic library") set(VCPKG_LIBRARY_LINKAGE dynamic) @@ -12,9 +22,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/angle - REF 8d471f907d8d4ec1d46bc9366493bd76c11c1870 - SHA512 b4670caeeaa5d662bc82702eb5f620123812ea6b5d82f57a65df54ae25cdaa5c9ff0fdb592448b07569d9c09af3d3c51b0b2f135c5800d1845b425009656bf18 - HEAD_REF master + REF chromium/3672 + SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81 ) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} @@ -28,6 +37,8 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 + OPTIONS + -D${ANGLE_CPU_BITNESS}=1 ) vcpkg_install_cmake() -- cgit v1.2.3 From fca5cab9f094604b71c23ffd13fa7108c142d03b Mon Sep 17 00:00:00 2001 From: Han Hu Date: Wed, 16 Jan 2019 14:05:40 +0800 Subject: Port openmvg, included new ports of coin-or projects, lemon --- ports/clp/CMakeLists.txt | 143 +++++++++++++++++++++++++++++++++++++ ports/clp/CONTROL | 4 ++ ports/clp/Config.cmake.in | 5 ++ ports/clp/portfile.cmake | 46 ++++++++++++ ports/coinutils/CMakeLists.txt | 111 ++++++++++++++++++++++++++++ ports/coinutils/CONTROL | 3 + ports/coinutils/Config.cmake.in | 5 ++ ports/coinutils/portfile.cmake | 49 +++++++++++++ ports/lemon/CONTROL | 3 + ports/lemon/portfile.cmake | 47 ++++++++++++ ports/lemon/remove-directory.patch | 21 ++++++ ports/openmvg/CONTROL | 4 ++ ports/openmvg/fixcmake.patch | 119 ++++++++++++++++++++++++++++++ ports/openmvg/portfile.cmake | 101 ++++++++++++++++++++++++++ ports/osi/CMakeLists.txt | 112 +++++++++++++++++++++++++++++ ports/osi/CONTROL | 4 ++ ports/osi/Config.cmake.in | 5 ++ ports/osi/portfile.cmake | 45 ++++++++++++ 18 files changed, 827 insertions(+) create mode 100644 ports/clp/CMakeLists.txt create mode 100644 ports/clp/CONTROL create mode 100644 ports/clp/Config.cmake.in create mode 100644 ports/clp/portfile.cmake create mode 100644 ports/coinutils/CMakeLists.txt create mode 100644 ports/coinutils/CONTROL create mode 100644 ports/coinutils/Config.cmake.in create mode 100644 ports/coinutils/portfile.cmake create mode 100644 ports/lemon/CONTROL create mode 100644 ports/lemon/portfile.cmake create mode 100644 ports/lemon/remove-directory.patch create mode 100644 ports/openmvg/CONTROL create mode 100644 ports/openmvg/fixcmake.patch create mode 100644 ports/openmvg/portfile.cmake create mode 100644 ports/osi/CMakeLists.txt create mode 100644 ports/osi/CONTROL create mode 100644 ports/osi/Config.cmake.in create mode 100644 ports/osi/portfile.cmake diff --git a/ports/clp/CMakeLists.txt b/ports/clp/CMakeLists.txt new file mode 100644 index 000000000..1fbdb4ab8 --- /dev/null +++ b/ports/clp/CMakeLists.txt @@ -0,0 +1,143 @@ +cmake_minimum_required(VERSION 3.11) + +project(Clp LANGUAGES C CXX) + +set(PROJECT_VERSION 1.16.11) +set(PROJECT_VERSION_MAJOR 1) +set(PROJECT_VERSION_MINOR 16) +set(PROJECT_VERSION_PATCH 11) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake") +if(BUILD_SHARED_LIBS AND MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +endif(BUILD_SHARED_LIBS AND MSVC) +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif(MSVC) +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif(APPLE) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# options +option(BUILD_SHARED_LIBS "" ON) + +# +# 设置用于 install çš„å˜é‡ +# +# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR +include(GNUInstallDirs) + +# Include module with fuction 'write_basic_package_version_file' +include(CMakePackageConfigHelpers) + +# Layout. This works for all platforms: * /lib*/cmake/ * +# /lib*/ * /include/ +set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +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 "Coin::") + +# Packages +find_package(CoinUtils REQUIRED) +find_package(Osi REQUIRED) + +# Add sources +include_directories(Clp/src/) +include_directories(Clp/src/OsiClp) + +file(GLOB CLP_SOURCES + Clp/src/*.hpp + Clp/src/*.cpp + Clp/src/OsiClp/*.hpp + Clp/src/OsiClp/*.cpp) +file(GLOB CLP_REMOVE + Clp/src/ClpCholeskyMumps.cpp + Clp/src/ClpCholeskyUfl.cpp + Clp/src/ClpCholeskyWssmp.cpp + Clp/src/ClpCholeskyWssmpKKT.cpp + Clp/src/ClpMain.cpp + Clp/src/*Abc*.cpp + Clp/src/ClpCholeskyMumps.hpp + Clp/src/ClpCholeskyUfl.hpp + Clp/src/ClpCholeskyWssmp.hpp + Clp/src/ClpCholeskyWssmpKKT.hpp + Clp/src/ClpMain.hpp + Clp/src/*Abc*.hpp + Clp/src/*Abc*.h) +list(REMOVE_ITEM CLP_SOURCES ${CLP_REMOVE}) + +add_library(${PROJECT_NAME} ${CLP_SOURCES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC $) +target_compile_definitions(${PROJECT_NAME} + PUBLIC + -DHAVE_CMATH + -D_CRT_SECURE_NO_WARNINGS + -DCOIN_HAS_CLP) +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils Coin::Osi) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES + DESTINATION include) + +install(DIRECTORY Clp/src/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" + EXCLUDE) + +install(DIRECTORY Clp/src/OsiClp/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" + EXCLUDE) + +# +# Install Libraries +# +# Configure 'ConfigVersion.cmake' Use: * PROJECT_VERSION +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +# Configure 'Config.cmake' Use variables: * TARGETS_EXPORT_NAME * +# PROJECT_NAME +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${config_install_dir}") + +# Config * /lib/cmake/Foo/FooConfig.cmake * +# /lib/cmake/Foo/FooConfigVersion.cmake +install(FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}") + +# Config * /lib/cmake/Foo/FooTargets.cmake +install(EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}") diff --git a/ports/clp/CONTROL b/ports/clp/CONTROL new file mode 100644 index 000000000..ac9b4178f --- /dev/null +++ b/ports/clp/CONTROL @@ -0,0 +1,4 @@ +Source: clp +Version: 1.16.11-0 +Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available. +Build-Depends: coinutils, osi diff --git a/ports/clp/Config.cmake.in b/ports/clp/Config.cmake.in new file mode 100644 index 000000000..ec01d2e5b --- /dev/null +++ b/ports/clp/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/clp/portfile.cmake b/ports/clp/portfile.cmake new file mode 100644 index 000000000..08cf8af72 --- /dev/null +++ b/ports/clp/portfile.cmake @@ -0,0 +1,46 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Clp + REF releases/1.16.11 + SHA512 4291ab6c4985491c100fab265ebeace88623a691f87890ed7b9240b4b1111fb55043be4e0f226cfa0e565f593f4df4c3661c570a39189f17f48b6f710a10fffe +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(BUILD_SHARED_LIBS ON) +else() + set(BUILD_SHARED_LIBS OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Clp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clp RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME osi) diff --git a/ports/coinutils/CMakeLists.txt b/ports/coinutils/CMakeLists.txt new file mode 100644 index 000000000..953ab2b98 --- /dev/null +++ b/ports/coinutils/CMakeLists.txt @@ -0,0 +1,111 @@ +cmake_minimum_required(VERSION 3.11) + +project(CoinUtils LANGUAGES C CXX) + +set(PROJECT_VERSION 2.10.14) +set(PROJECT_VERSION_MAJOR 2) +set(PROJECT_VERSION_MINOR 10) +set(PROJECT_VERSION_PATCH 14) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake") +if(BUILD_SHARED_LIBS AND MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +endif(BUILD_SHARED_LIBS AND MSVC) +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif(MSVC) +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif(APPLE) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# options +option(BUILD_SHARED_LIBS "" ON) + +# +# 设置用于 install çš„å˜é‡ +# +# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR +include(GNUInstallDirs) + +# Include module with fuction 'write_basic_package_version_file' +include(CMakePackageConfigHelpers) + +# Layout. This works for all platforms: * /lib*/cmake/ * +# /lib*/ * /include/ +set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +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 "Coin::") + +# +# Add sources +# +include_directories(CoinUtils/src) + +file(GLOB UTILS_SOURCES + CoinUtils/src/*.hpp + CoinUtils/src/*.cpp + CoinUtils/src/*.h) +add_library(${PROJECT_NAME} ${UTILS_SOURCES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC $) +target_compile_definitions(${PROJECT_NAME} + PUBLIC + $ + $) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES + DESTINATION include) + +install(DIRECTORY CoinUtils/src/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp") + +# +# Install Libraries +# +# Configure 'ConfigVersion.cmake' Use: * PROJECT_VERSION +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +# Configure 'Config.cmake' Use variables: * TARGETS_EXPORT_NAME * +# PROJECT_NAME +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${config_install_dir}") + +# Config * /lib/cmake/Foo/FooConfig.cmake * +# /lib/cmake/Foo/FooConfigVersion.cmake +install(FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}") + +# Config * /lib/cmake/Foo/FooTargets.cmake +install(EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}") diff --git a/ports/coinutils/CONTROL b/ports/coinutils/CONTROL new file mode 100644 index 000000000..64573dfb9 --- /dev/null +++ b/ports/coinutils/CONTROL @@ -0,0 +1,3 @@ +Source: coinutils +Version: 2.10.14-0 +Description: CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project diff --git a/ports/coinutils/Config.cmake.in b/ports/coinutils/Config.cmake.in new file mode 100644 index 000000000..ec01d2e5b --- /dev/null +++ b/ports/coinutils/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/coinutils/portfile.cmake b/ports/coinutils/portfile.cmake new file mode 100644 index 000000000..59582e800 --- /dev/null +++ b/ports/coinutils/portfile.cmake @@ -0,0 +1,49 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/CoinUtils + REF releases/2.10.14 + SHA512 2d5108e096f126cf98750a4892ca4d946d0bad41b65f29001c116c5ad15aa4900c3091d163fa16b6a55f0518344c6681ad95bbc6efa431c77aaaaa751494c48b +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DBUILD_SHARED_LIBS=OFF + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CoinUtils") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/coinutils RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME coinutils) diff --git a/ports/lemon/CONTROL b/ports/lemon/CONTROL new file mode 100644 index 000000000..04fec505c --- /dev/null +++ b/ports/lemon/CONTROL @@ -0,0 +1,3 @@ +Source: lemon +Version: +Description: diff --git a/ports/lemon/portfile.cmake b/ports/lemon/portfile.cmake new file mode 100644 index 000000000..a7509bde4 --- /dev/null +++ b/ports/lemon/portfile.cmake @@ -0,0 +1,47 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lemon-1.3.1) +vcpkg_download_distfile(ARCHIVE + URLS "http://lemon.cs.elte.hu/pub/sources/lemon-1.3.1.tar.gz" + FILENAME "lemon-1.3.1.tar.gz" + SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038 +) +vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR} remove-directory.patch) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lemon RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME lemon) diff --git a/ports/lemon/remove-directory.patch b/ports/lemon/remove-directory.patch new file mode 100644 index 000000000..bda2c51ae --- /dev/null +++ b/ports/lemon/remove-directory.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03e1cc7..edbd05f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,11 +256,11 @@ ENDIF() + + ADD_SUBDIRECTORY(lemon) + IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) +- ADD_SUBDIRECTORY(contrib) +- ADD_SUBDIRECTORY(demo) +- ADD_SUBDIRECTORY(tools) +- ADD_SUBDIRECTORY(doc) +- ADD_SUBDIRECTORY(test) ++ # ADD_SUBDIRECTORY(contrib) ++ # ADD_SUBDIRECTORY(demo) ++ # ADD_SUBDIRECTORY(tools) ++ # ADD_SUBDIRECTORY(doc) ++ # ADD_SUBDIRECTORY(test) + ENDIF() + + CONFIGURE_FILE( diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL new file mode 100644 index 000000000..261fd901f --- /dev/null +++ b/ports/openmvg/CONTROL @@ -0,0 +1,4 @@ +Source: openmvg +Version: 1.4-0 +Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. +Build-Depends: coinutils, clp, osi, lemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib diff --git a/ports/openmvg/fixcmake.patch b/ports/openmvg/fixcmake.patch new file mode 100644 index 000000000..2ee976dd5 --- /dev/null +++ b/ports/openmvg/fixcmake.patch @@ -0,0 +1,119 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 654bebd..6d1c671 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -39,6 +39,10 @@ option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF) + # ============================================================================== + option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF) + ++if(OpenMVG_BUILD_SHARED AND MSVC) ++ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) ++endif(OpenMVG_BUILD_SHARED AND MSVC) ++ + # ============================================================================== + # OpenMVG version + # ============================================================================== +@@ -88,11 +92,11 @@ endif() + # ============================================================================== + # Check that submodule have been initialized and updated + # ============================================================================== +-if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) +- message(FATAL_ERROR +- "\n submodule(s) are missing, please update your repository:\n" +- " > git submodule update -i\n") +-endif() ++# if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) ++# message(FATAL_ERROR ++# "\n submodule(s) are missing, please update your repository:\n" ++# " > git submodule update -i\n") ++# endif() + + # ============================================================================== + # Additional cmake find modules +@@ -184,12 +188,12 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) + endif (OpenMVG_BUILD_OPENGL_EXAMPLES) + + # Dependencies install rules +-install( +- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ +- DESTINATION include/openMVG_dependencies +- COMPONENT headers +- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" +-) ++# install( ++# DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ ++# DESTINATION include/openMVG_dependencies ++# COMPONENT headers ++# FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" ++# ) + + # ============================================================================== + # --END-- SUBMODULE CONFIGURATION +diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake +index c997b87..74c3aae 100644 +--- a/src/cmakeFindModules/FindClp.cmake ++++ b/src/cmakeFindModules/FindClp.cmake +@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") + SET(CLP_INCLUDE_DIR ${CLP_DIR}) + + FIND_LIBRARY(CLP_LIBRARY NAMES Clp) +- FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver) +- FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp) ++ FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp) ++ FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp) + + # locate Clp libraries + IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY) +diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt +index 80b1fe6..cb396c7 100644 +--- a/src/openMVG/matching/CMakeLists.txt ++++ b/src/openMVG/matching/CMakeLists.txt +@@ -38,7 +38,7 @@ target_link_libraries(openMVG_matching + openMVG_features + Threads::Threads + ) +-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (NOT OpenMVG_USE_INTERNAL_FLANN) + target_link_libraries(openMVG_matching + PUBLIC + ${FLANN_LIBRARIES} +diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt +index 816a941..f0b7145 100644 +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -18,7 +18,7 @@ add_subdirectory(stlplus3) + set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE) + + # Add graph library +-if(DEFINED OpenMVG_USE_INTERNAL_LEMON) ++if(OpenMVG_USE_INTERNAL_LEMON) + add_subdirectory(lemon) + set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon) + set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon) +@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND) + add_subdirectory(vectorGraphics) + + # Add ceres-solver (A Nonlinear Least Squares Minimizer) +-if (DEFINED OpenMVG_USE_INTERNAL_CERES) ++if (OpenMVG_USE_INTERNAL_CERES) + add_subdirectory(cxsparse) + add_subdirectory(ceres-solver) + set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres) +@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES) + endif() + + # Add an Approximate Nearest Neighbor library +-if (DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (OpenMVG_USE_INTERNAL_FLANN) + set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp) + add_subdirectory(flann) + endif() +@@ -90,7 +90,7 @@ add_subdirectory(fast) + ## + # Install Header only libraries if necessary + ## +-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) ++if (OpenMVG_USE_INTERNAL_EIGEN) + #Configure Eigen install + set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen) + add_subdirectory(eigen) diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake new file mode 100644 index 000000000..fd91a237d --- /dev/null +++ b/ports/openmvg/portfile.cmake @@ -0,0 +1,101 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openMVG/openMVG + REF v1.4 + SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a +) + +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR} fixcmake.patch) + + +# remove some deps to prevent conflict +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/cxsparse) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/eigen) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/flann) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/jpeg) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/lemon) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/png) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/tiff) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/zlib) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OpenMVG_BUILD_SHARED ON) +else() + set(OpenMVG_BUILD_SHARED OFF) +endif() + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/src + # PREFER_NINJA # Disable this option if project cannot be built with Ninja + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + OPTIONS + -DOpenMVG_BUILD_SHARED=${OpenMVG_BUILD_SHARED} + -DOpenMVG_BUILD_DOC=OFF + -DOpenMVG_BUILD_EXAMPLES=OFF + -DOpenMVG_BUILD_SOFTWARES=OFF + -DOpenMVG_BUILD_GUI_SOFTWARES=OFF + # TODO, use packgeconfig.cmake file instead + -DEIGEN_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/ + -DCERES_DIR_HINTS=${CURRENT_INSTALLED_DIR}/ceres + -DFLANN_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/flann + -DLEMON_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/lemon + -DCOINUTILS_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin + -DCLP_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin + -DOSI_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin + -DOpenMVG_USE_INTERNAL_CLP=OFF + -DOpenMVG_USE_INTERNAL_COINUTILS=OFF + -DOpenMVG_USE_INTERNAL_OSI=OFF + -DOpenMVG_USE_INTERNAL_EIGEN=OFF + -DOpenMVG_USE_INTERNAL_CEREAL=OFF + -DOpenMVG_USE_INTERNAL_CERES=OFF + -DOpenMVG_USE_INTERNAL_FLANN=OFF + -DTARGET_ARCHITECTURE=core # disable instruction like avx + # OPTIONS_RELEASE -DOPTIMIZE=1 + OPTIONS_RELEASE + -DFLANN_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/flann_cpp.lib + OPTIONS_DEBUG + -DFLANN_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/flann_cpp-gd.lib +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH "share/openMVG/cmake") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data) +file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/lib/*.cmake) +file(REMOVE_RECURSE ${REMOVE_CMAKE}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +if(OpenMVG_BUILD_SHARED) + # release + file(GLOB DLL_FILES ${CURRENT_PACKAGES_DIR}/lib/*.dll) + file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${DLL_FILES}) + # debug + file(GLOB DLL_FILES ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) + file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE ${DLL_FILES}) +endif() +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME openmvg) diff --git a/ports/osi/CMakeLists.txt b/ports/osi/CMakeLists.txt new file mode 100644 index 000000000..ab061f169 --- /dev/null +++ b/ports/osi/CMakeLists.txt @@ -0,0 +1,112 @@ +cmake_minimum_required(VERSION 3.11) + +project(Osi LANGUAGES C CXX) + +set(PROJECT_VERSION 0.107.9) +set(PROJECT_VERSION_MAJOR 0) +set(PROJECT_VERSION_MINOR 107) +set(PROJECT_VERSION_PATCH 9) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake") +if(BUILD_SHARED_LIBS AND MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +endif(BUILD_SHARED_LIBS AND MSVC) +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif(MSVC) +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif(APPLE) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# options +option(BUILD_SHARED_LIBS "" ON) + +# +# 设置用于 install çš„å˜é‡ +# +# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR +include(GNUInstallDirs) + +# Include module with fuction 'write_basic_package_version_file' +include(CMakePackageConfigHelpers) + +# Layout. This works for all platforms: * /lib*/cmake/ * +# /lib*/ * /include/ +set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +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 "Coin::") + +# Packages +find_package(CoinUtils REQUIRED) + +# Add sources +include_directories(Osi/src/Osi) + +file(GLOB OSI_SOURCES Osi/src/Osi/*.hpp Osi/src/Osi/*.cpp) + +add_library(${PROJECT_NAME} ${OSI_SOURCES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC $) +target_compile_definitions(${PROJECT_NAME} + PUBLIC + $ + $) +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES + DESTINATION include) + +install(DIRECTORY Osi/src/Osi/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +# +# Install Libraries +# +# Configure 'ConfigVersion.cmake' Use: * PROJECT_VERSION +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +# Configure 'Config.cmake' Use variables: * TARGETS_EXPORT_NAME * +# PROJECT_NAME +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${config_install_dir}") + +# Config * /lib/cmake/Foo/FooConfig.cmake * +# /lib/cmake/Foo/FooConfigVersion.cmake +install(FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}") + +# Config * /lib/cmake/Foo/FooTargets.cmake +install(EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}") diff --git a/ports/osi/CONTROL b/ports/osi/CONTROL new file mode 100644 index 000000000..457085c68 --- /dev/null +++ b/ports/osi/CONTROL @@ -0,0 +1,4 @@ +Source: osi +Version: 0.107.9-0 +Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver. +Build-Depends: coinutils diff --git a/ports/osi/Config.cmake.in b/ports/osi/Config.cmake.in new file mode 100644 index 000000000..ec01d2e5b --- /dev/null +++ b/ports/osi/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/osi/portfile.cmake b/ports/osi/portfile.cmake new file mode 100644 index 000000000..6cb2e1217 --- /dev/null +++ b/ports/osi/portfile.cmake @@ -0,0 +1,45 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Osi + REF releases/0.107.9 + SHA512 52501e2fa81ad9ec1412596b5945e11f2d5c5c91bdb148f41dad9efb8e4a033cfc2f76e389b9e546593b89ae6c7f74c32e6c5b78337c967ad0c90cd6a7183a28 +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(BUILD_SHARED_LIBS ON) +else() + set(BUILD_SHARED_LIBS OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Osi") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME osi) -- cgit v1.2.3 From 1beac55d71ceaa31dd2665a0df6806eb5f5f3df7 Mon Sep 17 00:00:00 2001 From: cDc Date: Wed, 16 Jan 2019 15:29:17 +0200 Subject: Update portfile.cmake --- ports/tinyexif/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 8464f2ec0..474250d9b 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF REF 1.0.2 - SHA512 956880ccd0ccdee80f438ee899c7a88e02cc3dd6f09b62cbc71b9597501f1c8e06a74cf837d3f231dbd0416c062cd05a9854f46a55671c06c01bbc9437442159 + SHA512 95a88c45c9f4812266cc6b7cf57e93be1229513274b446f5da6b9c4d5dc07c07985bf6ad6ffc31de673e88ef6e428cb29b1b58ad78dee17cb36fc2b859a55f98 HEAD_REF master ) -- cgit v1.2.3 From 2011b8512b1c16fc1f8cf07689591854d531abee Mon Sep 17 00:00:00 2001 From: Phil Felton <39185762+philjdf@users.noreply.github.com> Date: Wed, 16 Jan 2019 18:29:07 +0000 Subject: [Arrow] Update Arrow to 0.11.1 (#4977) * Arrow update * Add version info * Forgot to apply patch * Whitespace * Fix patch * Fix patch * Version which works on Linux * Fix problem finding ZSTD on x64-windows * Fix zlib dependency finding * Fix renaming on Windows * Include missing boost-format dependency * Linux debug build picks up debug libs now * Make windows work again * Remove boost-format dependency * Error if dependencies not found rather than attempt to download them * [parquet] Turn parquest into a stub --- ports/arrow/CONTROL | 4 +- ports/arrow/all.patch | 1339 +++++++++++++++++++++++++++++++++++++++--- ports/arrow/portfile.cmake | 36 +- ports/parquet/CONTROL | 6 +- ports/parquet/all.patch | 779 ------------------------ ports/parquet/portfile.cmake | 53 +- 6 files changed, 1305 insertions(+), 912 deletions(-) delete mode 100644 ports/parquet/all.patch diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index dd7bea53c..cedc63bf4 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,4 +1,4 @@ Source: arrow -Version: 0.9.0-1 -Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags +Version: 0.11.1 +Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog 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. diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index bb67ec13f..31be15f5b 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,28 +1,57 @@ -diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake -index ea971f0..3e98ede 100644 ---- a/cpp/cmake_modules/FindBrotli.cmake -+++ b/cpp/cmake_modules/FindBrotli.cmake -@@ -43,53 +43,31 @@ find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h - NO_DEFAULT_PATH +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4448b98..d6aa484 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -743,10 +743,10 @@ elseif (PTHREAD_LIBRARY) + # linking order. + set(ARROW_LINK_LIBS + ${ARROW_LINK_LIBS} +- ${PTHREAD_LIBRARY}) ++ pthreadshared) + set(ARROW_STATIC_LINK_LIBS + ${ARROW_STATIC_LINK_LIBS} +- ${PTHREAD_LIBRARY}) ++ pthreadshared) + endif() + + ############################################################ +@@ -780,3 +780,4 @@ endif() + if(ARROW_GANDIVA) + add_subdirectory(src/gandiva) + endif() ++ +diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake +index ea971f0..e8dfb3c 100644 +--- a/cmake_modules/FindBrotli.cmake ++++ b/cmake_modules/FindBrotli.cmake +@@ -39,57 +39,27 @@ elseif ( Brotli_HOME ) + endif() + + find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH PATH_SUFFIXES "include" ) -find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a libbrotlienc-static.a brotlienc +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) +find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc libbrotlienc-static brotlienc brotlienc-static - PATHS ${_brotli_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) ++ PATH_SUFFIXES "lib" ) -find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a libbrotlidec-static.a brotlidec +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) +find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec libbrotlidec-static brotlidec brotlidec-static - PATHS ${_brotli_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) ++ PATH_SUFFIXES "lib" ) -find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a libbrotlicommon-static.a brotlicommon +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) +find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon libbrotlicommon-static brotlicommon brotlicommon-static - PATHS ${_brotli_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) ++ PATH_SUFFIXES "lib" ) set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_ENC} ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON}) @@ -65,30 +94,103 @@ index ea971f0..3e98ede 100644 else () set(BROTLI_FOUND FALSE) endif () -diff --git a/cpp/cmake_modules/FindFlatbuffers.cmake b/cpp/cmake_modules/FindFlatbuffers.cmake -index 804f479..baac84e 100644 ---- a/cpp/cmake_modules/FindFlatbuffers.cmake -+++ b/cpp/cmake_modules/FindFlatbuffers.cmake -@@ -53,6 +53,7 @@ endif () +diff --git a/cmake_modules/FindFlatbuffers.cmake b/cmake_modules/FindFlatbuffers.cmake +index 975c869..9cee8a0 100644 +--- a/cmake_modules/FindFlatbuffers.cmake ++++ b/cmake_modules/FindFlatbuffers.cmake +@@ -31,31 +31,26 @@ + # FLATBUFFERS_STATIC_LIB, path to libflatbuffers.a + # FLATBUFFERS_FOUND, whether flatbuffers has been found + +-if( NOT "${FLATBUFFERS_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${FLATBUFFERS_HOME}" _native_path ) +- list( APPEND _flatbuffers_roots "${_native_path}" ) +-elseif ( Flatbuffers_HOME ) +- list( APPEND _flatbuffers_roots "${Flatbuffers_HOME}" ) ++if(WIN32) ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(FLATBUFFERS_LIB_SUFFIX mdd) ++ else() ++ set(FLATBUFFERS_LIB_SUFFIX md) ++ endif() ++else() ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(FLATBUFFERS_LIB_SUFFIX "d") ++ else() ++ set(FLATBUFFERS_LIB_SUFFIX "") ++ endif() + endif() + +-# Try the parameterized roots, if they exist +-if ( _flatbuffers_roots ) +- find_path( FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h +- PATHS "${_flatbuffers_roots}" NO_DEFAULT_PATH +- PATH_SUFFIXES "include" ) +- find_library( FLATBUFFERS_LIBRARIES NAMES flatbuffers +- PATHS "${_flatbuffers_roots}" NO_DEFAULT_PATH +- PATH_SUFFIXES "lib" "lib64") +-else () +- find_path( FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h ) +- find_library( FLATBUFFERS_LIBRARIES NAMES flatbuffers ) +-endif () ++find_path( FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h ) ++find_library( FLATBUFFERS_LIBRARIES NAMES flatbuffers ) find_program(FLATBUFFERS_COMPILER flatc - "${FLATBUFFERS_HOME}/bin" +- "${FLATBUFFERS_HOME}/bin" +- /usr/local/bin +- /usr/bin +- NO_DEFAULT_PATH ++ PATH_SUFFIXES + "${FLATBUFFERS_HOME}/tools/flatbuffers" - /usr/local/bin - /usr/bin - NO_DEFAULT_PATH -diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake -index 3a89c8d..3157197 100644 ---- a/cpp/cmake_modules/FindLz4.cmake -+++ b/cpp/cmake_modules/FindLz4.cmake -@@ -29,21 +29,11 @@ elseif ( Lz4_HOME ) + ) + + if (FLATBUFFERS_INCLUDE_DIR AND FLATBUFFERS_LIBRARIES) +diff --git a/cmake_modules/FindGLOG.cmake b/cmake_modules/FindGLOG.cmake +index f22e4df..53e545b 100644 +--- a/cmake_modules/FindGLOG.cmake ++++ b/cmake_modules/FindGLOG.cmake +@@ -29,11 +29,6 @@ + # GLOG_STATIC_LIB, path to libglog.a + # GLOG_FOUND, whether glog has been found + +-if( NOT "${GLOG_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${GLOG_HOME}" _native_path ) +- list( APPEND _glog_roots ${_native_path} ) +-endif() +- + message(STATUS "GLOG_HOME: ${GLOG_HOME}") + # Try the parameterized roots, if they exist + if ( _glog_roots ) +@@ -43,10 +38,10 @@ if ( _glog_roots ) + endif () + + find_path( GLOG_INCLUDE_DIR NAMES glog/logging.h +- PATHS ${_glog_roots} NO_DEFAULT_PATH ++ PATHS ${_glog_roots} + PATH_SUFFIXES "include" ) + find_library( GLOG_LIBRARIES NAMES glog +- PATHS ${_glog_roots} NO_DEFAULT_PATH ++ PATHS ${_glog_roots} + PATH_SUFFIXES ${lib_dirs}) + else () + find_path( GLOG_INCLUDE_DIR NAMES glog/logging.h ) +diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake +index 3a89c8d..1e068b4 100644 +--- a/cmake_modules/FindLz4.cmake ++++ b/cmake_modules/FindLz4.cmake +@@ -29,23 +29,16 @@ elseif ( Lz4_HOME ) list( APPEND _lz4_roots ${Lz4_HOME} ) endif() -if (MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) - set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") --endif() -- ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(LZ4_LIB_NAME lz4d) ++else() ++ set(LZ4_LIB_NAME lz4) + endif() + -set(LZ4_STATIC_LIB_SUFFIX - "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") - @@ -96,52 +198,1153 @@ index 3a89c8d..3157197 100644 - ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX}) - find_path(LZ4_INCLUDE_DIR NAMES lz4.h - PATHS ${_lz4_roots} - NO_DEFAULT_PATH +- PATHS ${_lz4_roots} +- NO_DEFAULT_PATH PATH_SUFFIXES "include" ) -find_library(LZ4_STATIC_LIB NAMES ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} -+find_library(LZ4_STATIC_LIB NAMES lz4 liblz4 - PATHS ${_lz4_roots} - NO_DEFAULT_PATH +- PATHS ${_lz4_roots} +- NO_DEFAULT_PATH ++ ++find_library(LZ4_STATIC_LIB NAMES ${LZ4_LIB_NAME} PATH_SUFFIXES "lib" ) -diff --git a/cpp/cmake_modules/FindSnappy.cmake b/cpp/cmake_modules/FindSnappy.cmake -index 867963c..8a432db 100644 ---- a/cpp/cmake_modules/FindSnappy.cmake -+++ b/cpp/cmake_modules/FindSnappy.cmake -@@ -55,7 +55,7 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) + + include(FindPackageHandleStandardArgs) +diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake +index 867963c..fd45321 100644 +--- a/cmake_modules/FindSnappy.cmake ++++ b/cmake_modules/FindSnappy.cmake +@@ -31,31 +31,23 @@ + # SNAPPY_SHARED_LIB, path to libsnappy's shared library + # SNAPPY_FOUND, whether snappy has been found + +-if( NOT "${SNAPPY_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${SNAPPY_HOME}" _native_path ) +- list( APPEND _snappy_roots ${_native_path} ) +-elseif ( Snappy_HOME ) +- list( APPEND _snappy_roots ${Snappy_HOME} ) +-endif() +- +-message(STATUS "SNAPPY_HOME: ${SNAPPY_HOME}") +-find_path(SNAPPY_INCLUDE_DIR snappy.h HINTS +- ${_snappy_roots} +- NO_DEFAULT_PATH ++find_path(SNAPPY_INCLUDE_DIR snappy.h + PATH_SUFFIXES "include") + +-find_library( SNAPPY_LIBRARIES NAMES snappy PATHS +- ${_snappy_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib") ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(SNAPPY_LIB_NAME snappyd) ++else() ++ set(SNAPPY_LIB_NAME snappy) ++endif() ++ ++find_library( SNAPPY_LIBRARIES NAMES ${SNAPPY_LIB_NAME} PATH_SUFFIXES "lib") + + if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) + set(SNAPPY_FOUND TRUE) + get_filename_component( SNAPPY_LIBS ${SNAPPY_LIBRARIES} PATH ) set(SNAPPY_HEADER_NAME snappy.h) set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME}) - set(SNAPPY_LIB_NAME snappy) +- set(SNAPPY_LIB_NAME snappy) - set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) + set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) else () set(SNAPPY_FOUND FALSE) -diff --git a/cpp/cmake_modules/FindZLIB.cmake b/cpp/cmake_modules/FindZLIB.cmake -index 78b84f2..56cc887 100644 ---- a/cpp/cmake_modules/FindZLIB.cmake -+++ b/cpp/cmake_modules/FindZLIB.cmake -@@ -61,9 +61,7 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES)) - set(ZLIB_HEADER ${ZLIB_INCLUDE_DIR}/${ZLIB_HEADER_NAME}) - set(ZLIB_LIB_NAME z) - if (MSVC) -- if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX) -- set(ZLIB_MSVC_STATIC_LIB_SUFFIX libstatic) -- endif() -+ set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib) - set(ZLIB_MSVC_SHARED_LIB_SUFFIX lib) - endif() - set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake -index 810e5c0..b483471 100644 ---- a/cpp/cmake_modules/FindZSTD.cmake -+++ b/cpp/cmake_modules/FindZSTD.cmake -@@ -43,7 +43,7 @@ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h - PATHS ${_zstd_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "include" ) +diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake +index 5402766..6cff9fa 100644 +--- a/cmake_modules/FindThrift.cmake ++++ b/cmake_modules/FindThrift.cmake +@@ -28,41 +28,31 @@ + # THRIFT_STATIC_LIB, THRIFT static library + # THRIFT_FOUND, If false, do not try to use ant + +-# prefer the thrift version supplied in THRIFT_HOME +-if( NOT "${THRIFT_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${THRIFT_HOME}" _native_path ) +- list( APPEND _thrift_roots ${_native_path} ) +-elseif ( Thrift_HOME ) +- list( APPEND _thrift_roots ${Thrift_HOME} ) +-endif() +- +-message(STATUS "THRIFT_HOME: ${THRIFT_HOME}") +-find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h HINTS +- ${_thrift_roots} +- NO_DEFAULT_PATH ++find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h + PATH_SUFFIXES "include" + ) + +-find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS +- ${_thrift_roots} +- NO_DEFAULT_PATH +-) +- +-if (MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) +- set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) ++if(WIN32) ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(THRIFT_LIB_SUFFIX mdd) ++ else() ++ set(THRIFT_LIB_SUFFIX md) ++ endif() ++else() ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(THRIFT_LIB_SUFFIX "d") ++ else() ++ set(THRIFT_LIB_SUFFIX "") ++ endif() + endif() + + find_library(THRIFT_STATIC_LIB NAMES +- ${CMAKE_STATIC_LIBRARY_PREFIX}thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} +- HINTS ${_thrift_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ++ thrift${THRIFT_LIB_SUFFIX} ++ PATH_SUFFIXES lib + ) + + find_program(THRIFT_COMPILER thrift HINTS +- ${_thrift_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "bin" ++ PATH_SUFFIXES "tools" + ) + + function(EXTRACT_THRIFT_VERSION) +@@ -111,7 +101,6 @@ else () + endif () + endif () + +- + mark_as_advanced( + THRIFT_STATIC_LIB + THRIFT_COMPILER +diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake +index ca6060b..85a4585 100644 +--- a/cmake_modules/FindZLIB.cmake ++++ b/cmake_modules/FindZLIB.cmake +@@ -30,43 +30,15 @@ + # ZLIB_SHARED_LIB, path to libz's shared library + # ZLIB_FOUND, whether zlib has been found + +-if( NOT "${ZLIB_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${ZLIB_HOME}" _native_path ) +- list( APPEND _zlib_roots ${_native_path} ) +-elseif ( ZLIB_HOME ) +- list( APPEND _zlib_roots ${ZLIB_HOME} ) ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(ZLIB_LIB_NAME_SUFFIX "d") ++else() ++ set(ZLIB_LIB_NAME_SUFFIX "") + endif() + +-if (MSVC) +- # zlib uses zlib.lib for Windows. +- set(ZLIB_LIB_NAME zlib.lib) +-else () +- # zlib uses libz.so for non Windows. +- set(ZLIB_LIB_NAME +- ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}) +-endif () +- + # Try the parameterized roots, if they exist +-if (_zlib_roots) +- find_path(ZLIB_INCLUDE_DIR NAMES zlib.h +- PATHS ${_zlib_roots} NO_DEFAULT_PATH +- PATH_SUFFIXES "include") +- find_library(ZLIB_SHARED_LIB +- NAMES ${ZLIB_LIB_NAME} +- PATHS ${_zlib_roots} NO_DEFAULT_PATH +- PATH_SUFFIXES "lib") +-else () +- pkg_check_modules(PKG_ZLIB zlib) +- if (PKG_ZLIB_FOUND) +- set(ZLIB_INCLUDE_DIR ${PKG_ZLIB_INCLUDEDIR}) +- find_library(ZLIB_SHARED_LIB +- NAMES ${ZLIB_LIB_NAME} +- PATHS ${PKG_ZLIB_LIBDIR} NO_DEFAULT_PATH) +- else () +- find_path(ZLIB_INCLUDE_DIR NAMES zlib.h) +- find_library(ZLIB_SHARED_LIB NAMES ${ZLIB_LIB_NAME}) +- endif () +-endif () ++find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATH_SUFFIXES "include") ++find_library(ZLIB_SHARED_LIB NAMES z zlib${ZLIB_LIB_NAME_SUFFIX} PATH_SUFFIXES "lib") + + if (ZLIB_INCLUDE_DIR AND ZLIB_SHARED_LIB) + set(ZLIB_FOUND TRUE) +diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake +index 810e5c0..d272d8f 100644 +--- a/cmake_modules/FindZSTD.cmake ++++ b/cmake_modules/FindZSTD.cmake +@@ -22,30 +22,16 @@ + # ZSTD_STATIC_LIB, path to libzstd static library + # ZSTD_FOUND, whether zstd has been found + +-if( NOT "${ZSTD_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${ZSTD_HOME}" _native_path ) +- list( APPEND _zstd_roots ${_native_path} ) +-elseif ( ZStd_HOME ) +- list( APPEND _zstd_roots ${ZStd_HOME} ) +-endif() ++find_path(ZSTD_INCLUDE_DIR NAMES zstd.h ++ PATH_SUFFIXES "include" ) + +-if (MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) +- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static") ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(ZSTD_LIB_NAME_SUFFIX "d") ++else() ++ set(ZSTD_LIB_NAME_SUFFIX "") + endif() + +-set(ZSTD_STATIC_LIB_SUFFIX +- "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +-set(ZSTD_STATIC_LIB_NAME +- ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX}) +- +-find_path(ZSTD_INCLUDE_DIR NAMES zstd.h +- PATHS ${_zstd_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "include" ) -find_library(ZSTD_STATIC_LIB NAMES ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME} -+find_library(ZSTD_STATIC_LIB NAMES zstd ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME} - PATHS ${_zstd_roots} - NO_DEFAULT_PATH +- PATHS ${_zstd_roots} +- NO_DEFAULT_PATH ++find_library(ZSTD_STATIC_LIB NAMES zstd${ZSTD_LIB_NAME_SUFFIX} zstd_static${ZSTD_LIB_NAME_SUFFIX} PATH_SUFFIXES "lib" ) + + include(FindPackageHandleStandardArgs) +diff --git a/cmake_modules/Finddouble-conversion.cmake b/cmake_modules/Finddouble-conversion.cmake +new file mode 100644 +index 0000000..4fa0995 +--- /dev/null ++++ b/cmake_modules/Finddouble-conversion.cmake +@@ -0,0 +1,23 @@ ++# Licensed to the Apache Software Foundation (ASF) under one ++# or more contributor license agreements. See the NOTICE file ++# distributed with this work for additional information ++# regarding copyright ownership. The ASF licenses this file ++# to you under the Apache License, Version 2.0 (the ++# "License"); you may not use this file except in compliance ++# with the License. You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, ++# software distributed under the License is distributed on an ++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++# KIND, either express or implied. See the License for the ++# specific language governing permissions and limitations ++# under the License. ++ ++find_path(DOUBLE_CONVERSION_INCLUDE_DIR NAMES double-conversion.h PATH_SUFFIXES "include/double-conversion" ) ++ ++find_library(DOUBLE_CONVERSION_STATIC_LIB NAMES double-conversion PATH_SUFFIXES "lib" ) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(DOUBLE_CONVERSION REQUIRED_VARS DOUBLE_CONVERSION_STATIC_LIB DOUBLE_CONVERSION_INCLUDE_DIR) +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 1c7cd62..572f6e1 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -302,6 +302,8 @@ if (WIN32) + else() + find_library(PTHREAD_LIBRARY pthread) + message(STATUS "Found pthread: ${PTHREAD_LIBRARY}") ++ add_library(pthreadshared SHARED IMPORTED) ++ set_target_properties(pthreadshared PROPERTIES IMPORTED_LOCATION ${PTHREAD_LIBRARY}) + endif() + + # ---------------------------------------------------------------------- +@@ -322,106 +324,56 @@ set(Boost_ADDITIONAL_VERSIONS + "1.61.0" "1.62" + "1.60.0" "1.60") + +-if (ARROW_BOOST_VENDORED) +- set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep") +- set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib") +- set(BOOST_BUILD_LINK "static") +- set(BOOST_STATIC_SYSTEM_LIBRARY +- "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BOOST_STATIC_FILESYSTEM_LIBRARY +- "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BOOST_STATIC_REGEX_LIBRARY +- "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_regex${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BOOST_SYSTEM_LIBRARY "${BOOST_STATIC_SYSTEM_LIBRARY}") +- set(BOOST_FILESYSTEM_LIBRARY "${BOOST_STATIC_FILESYSTEM_LIBRARY}") +- set(BOOST_REGEX_LIBRARY "${BOOST_STATIC_REGEX_LIBRARY}") ++if (MSVC) ++ # disable autolinking in boost ++ add_definitions(-DBOOST_ALL_NO_LIB) ++endif() ++if (ARROW_BOOST_USE_SHARED) ++ # Find shared Boost libraries. ++ set(Boost_USE_STATIC_LIBS OFF) ++ ++ if (MSVC) ++ # force all boost libraries to dynamic link ++ add_definitions(-DBOOST_ALL_DYN_LINK) ++ endif() ++ + if (ARROW_BOOST_HEADER_ONLY) +- set(BOOST_BUILD_PRODUCTS) +- set(BOOST_CONFIGURE_COMMAND "") +- set(BOOST_BUILD_COMMAND "") ++ find_package(Boost REQUIRED) + else() +- set(BOOST_BUILD_PRODUCTS +- ${BOOST_SYSTEM_LIBRARY} +- ${BOOST_FILESYSTEM_LIBRARY} +- ${BOOST_REGEX_LIBRARY}) +- set(BOOST_CONFIGURE_COMMAND +- "./bootstrap.sh" +- "--prefix=${BOOST_PREFIX}" +- "--with-libraries=filesystem,regex,system") ++ find_package(Boost COMPONENTS regex system filesystem REQUIRED) + if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") +- set(BOOST_BUILD_VARIANT "debug") ++ set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) + else() +- set(BOOST_BUILD_VARIANT "release") ++ set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) + endif() +- set(BOOST_BUILD_COMMAND +- "./b2" +- "link=${BOOST_BUILD_LINK}" +- "variant=${BOOST_BUILD_VARIANT}" +- "cxxflags=-fPIC") ++ set(BOOST_SYSTEM_LIBRARY boost_system_shared) ++ set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared) ++ set(BOOST_REGEX_LIBRARY boost_regex_shared) + endif() +- ExternalProject_Add(boost_ep +- URL ${BOOST_SOURCE_URL} +- BUILD_BYPRODUCTS ${BOOST_BUILD_PRODUCTS} +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND} +- BUILD_COMMAND ${BOOST_BUILD_COMMAND} +- INSTALL_COMMAND "" +- ${EP_LOG_OPTIONS}) +- set(Boost_INCLUDE_DIR "${BOOST_PREFIX}") +- set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}") +- add_dependencies(arrow_dependencies boost_ep) + else() +- if (MSVC) +- # disable autolinking in boost +- add_definitions(-DBOOST_ALL_NO_LIB) +- endif() +- if (ARROW_BOOST_USE_SHARED) +- # Find shared Boost libraries. +- set(Boost_USE_STATIC_LIBS OFF) +- +- if (MSVC) +- # force all boost libraries to dynamic link +- add_definitions(-DBOOST_ALL_DYN_LINK) +- endif() +- +- if (ARROW_BOOST_HEADER_ONLY) +- find_package(Boost REQUIRED) +- else() +- find_package(Boost COMPONENTS regex system filesystem REQUIRED) +- if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") +- set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) +- set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) +- set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) +- else() +- set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) +- set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) +- set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) +- endif() +- set(BOOST_SYSTEM_LIBRARY boost_system_shared) +- set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared) +- set(BOOST_REGEX_LIBRARY boost_regex_shared) +- endif() ++ # Find static boost headers and libs ++ # TODO Differentiate here between release and debug builds ++ set(Boost_USE_STATIC_LIBS ON) ++ if (ARROW_BOOST_HEADER_ONLY) ++ find_package(Boost REQUIRED) + else() +- # Find static boost headers and libs +- # TODO Differentiate here between release and debug builds +- set(Boost_USE_STATIC_LIBS ON) +- if (ARROW_BOOST_HEADER_ONLY) +- find_package(Boost REQUIRED) ++ find_package(Boost COMPONENTS regex system filesystem REQUIRED) ++ if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") ++ set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) + else() +- find_package(Boost COMPONENTS regex system filesystem REQUIRED) +- if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") +- set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) +- set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) +- set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) +- else() +- set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) +- set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) +- set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) +- endif() +- set(BOOST_SYSTEM_LIBRARY boost_system_static) +- set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static) +- set(BOOST_REGEX_LIBRARY boost_regex_static) ++ set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) + endif() ++ set(BOOST_SYSTEM_LIBRARY boost_system_static) ++ set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static) ++ set(BOOST_REGEX_LIBRARY boost_regex_static) + endif() + endif() + +@@ -449,28 +401,8 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIR}) + # ---------------------------------------------------------------------- + # Google double-conversion + +-if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") +- set(DOUBLE_CONVERSION_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/double-conversion_ep/src/double-conversion_ep") +- set(DOUBLE_CONVERSION_HOME "${DOUBLE_CONVERSION_PREFIX}") +- set(DOUBLE_CONVERSION_INCLUDE_DIR "${DOUBLE_CONVERSION_PREFIX}/include") +- set(DOUBLE_CONVERSION_STATIC_LIB "${DOUBLE_CONVERSION_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}double-conversion${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- set(DOUBLE_CONVERSION_CMAKE_ARGS +- "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX=${DOUBLE_CONVERSION_PREFIX}") +- ExternalProject_Add(double-conversion_ep +- ${EP_LOG_OPTIONS} +- INSTALL_DIR ${DOUBLE_CONVERSION_PREFIX} +- URL ${DOUBLE_CONVERSION_SOURCE_URL} +- CMAKE_ARGS ${DOUBLE_CONVERSION_CMAKE_ARGS} +- BUILD_BYPRODUCTS "${DOUBLE_CONVERSION_STATIC_LIB}") +- set(DOUBLE_CONVERSION_VENDORED 1) +-else() +- find_package(double-conversion REQUIRED) +- set(DOUBLE_CONVERSION_VENDORED 0) +-endif() ++find_package(double-conversion REQUIRED) ++set(DOUBLE_CONVERSION_VENDORED 0) + + include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(double-conversion +@@ -486,38 +418,8 @@ endif() + if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS) + add_custom_target(unittest ctest -L unittest) + +- if("${GTEST_HOME}" STREQUAL "") +- if(APPLE) +- set(GTEST_CMAKE_CXX_FLAGS "-fPIC -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes") +- elseif(NOT MSVC) +- set(GTEST_CMAKE_CXX_FLAGS "-fPIC") +- endif() +- string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_BUILD_TYPE) +- set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}} ${GTEST_CMAKE_CXX_FLAGS}") +- +- set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep") +- set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include") +- set(GTEST_STATIC_LIB +- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GTEST_MAIN_STATIC_LIB +- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GTEST_VENDORED 1) +- set(GTEST_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX} +- -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}) +- if (MSVC AND NOT ARROW_USE_STATIC_CRT) +- set(GTEST_CMAKE_ARGS ${GTEST_CMAKE_ARGS} -Dgtest_force_shared_crt=ON) +- endif() +- +- ExternalProject_Add(googletest_ep +- URL ${GTEST_SOURCE_URL} +- BUILD_BYPRODUCTS ${GTEST_STATIC_LIB} ${GTEST_MAIN_STATIC_LIB} +- CMAKE_ARGS ${GTEST_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- else() +- find_package(GTest REQUIRED) +- set(GTEST_VENDORED 0) +- endif() ++ find_package(GTest REQUIRED) ++ set(GTEST_VENDORED 0) + + message(STATUS "GTest include dir: ${GTEST_INCLUDE_DIR}") + message(STATUS "GTest static library: ${GTEST_STATIC_LIB}") +@@ -533,40 +435,8 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS) + endif() + + # gflags (formerly Googleflags) command line parsing +- if("${GFLAGS_HOME}" STREQUAL "") +- set(GFLAGS_CMAKE_CXX_FLAGS ${EP_CXX_FLAGS}) +- +- set(GFLAGS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gflags_ep-prefix/src/gflags_ep") +- set(GFLAGS_HOME "${GFLAGS_PREFIX}") +- set(GFLAGS_INCLUDE_DIR "${GFLAGS_PREFIX}/include") +- if(MSVC) +- set(GFLAGS_STATIC_LIB "${GFLAGS_PREFIX}/lib/gflags_static.lib") +- else() +- set(GFLAGS_STATIC_LIB "${GFLAGS_PREFIX}/lib/libgflags.a") +- endif() +- set(GFLAGS_VENDORED 1) +- set(GFLAGS_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${GFLAGS_PREFIX} +- -DBUILD_SHARED_LIBS=OFF +- -DBUILD_STATIC_LIBS=ON +- -DBUILD_PACKAGING=OFF +- -DBUILD_TESTING=OFF +- -BUILD_CONFIG_TESTS=OFF +- -DINSTALL_HEADERS=ON +- -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS} +- -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS} +- -DCMAKE_CXX_FLAGS=${GFLAGS_CMAKE_CXX_FLAGS}) +- +- ExternalProject_Add(gflags_ep +- URL ${GFLAGS_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- BUILD_IN_SOURCE 1 +- BUILD_BYPRODUCTS "${GFLAGS_STATIC_LIB}" +- CMAKE_ARGS ${GFLAGS_CMAKE_ARGS}) +- else() +- set(GFLAGS_VENDORED 0) +- find_package(GFlags REQUIRED) +- endif() ++ set(GFLAGS_VENDORED 0) ++ find_package(GFlags REQUIRED) + + message(STATUS "GFlags include dir: ${GFLAGS_INCLUDE_DIR}") + message(STATUS "GFlags static library: ${GFLAGS_STATIC_LIB}") +@@ -587,37 +457,8 @@ endif() + if(ARROW_BUILD_BENCHMARKS) + add_custom_target(runbenchmark ctest -L benchmark) + +- if("$ENV{GBENCHMARK_HOME}" STREQUAL "") +- if(NOT MSVC) +- set(GBENCHMARK_CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${EP_CXX_FLAGS}") +- endif() +- +- if(APPLE) +- set(GBENCHMARK_CMAKE_CXX_FLAGS "${GBENCHMARK_CMAKE_CXX_FLAGS} -stdlib=libc++") +- endif() +- +- set(GBENCHMARK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gbenchmark_ep/src/gbenchmark_ep-install") +- set(GBENCHMARK_INCLUDE_DIR "${GBENCHMARK_PREFIX}/include") +- set(GBENCHMARK_STATIC_LIB "${GBENCHMARK_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}benchmark${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GBENCHMARK_VENDORED 1) +- set(GBENCHMARK_CMAKE_ARGS +- "-DCMAKE_BUILD_TYPE=Release" +- "-DCMAKE_INSTALL_PREFIX:PATH=${GBENCHMARK_PREFIX}" +- "-DBENCHMARK_ENABLE_TESTING=OFF" +- "-DCMAKE_CXX_FLAGS=${GBENCHMARK_CMAKE_CXX_FLAGS}") +- if (APPLE) +- set(GBENCHMARK_CMAKE_ARGS ${GBENCHMARK_CMAKE_ARGS} "-DBENCHMARK_USE_LIBCXX=ON") +- endif() +- +- ExternalProject_Add(gbenchmark_ep +- URL ${GBENCHMARK_SOURCE_URL} +- BUILD_BYPRODUCTS "${GBENCHMARK_STATIC_LIB}" +- CMAKE_ARGS ${GBENCHMARK_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- else() +- find_package(GBenchmark REQUIRED) +- set(GBENCHMARK_VENDORED 0) +- endif() ++ find_package(GBenchmark REQUIRED) ++ set(GBENCHMARK_VENDORED 0) + + message(STATUS "GBenchmark include dir: ${GBENCHMARK_INCLUDE_DIR}") + message(STATUS "GBenchmark static library: ${GBENCHMARK_STATIC_LIB}") +@@ -632,24 +473,8 @@ endif() + + if (ARROW_IPC) + # RapidJSON, header only dependency +- if("${RAPIDJSON_HOME}" STREQUAL "") +- ExternalProject_Add(rapidjson_ep +- PREFIX "${CMAKE_BINARY_DIR}" +- URL ${RAPIDJSON_SOURCE_URL} +- URL_MD5 ${RAPIDJSON_SOURCE_MD5} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- BUILD_IN_SOURCE 1 +- ${EP_LOG_OPTIONS} +- INSTALL_COMMAND "") +- +- ExternalProject_Get_Property(rapidjson_ep SOURCE_DIR) +- set(RAPIDJSON_INCLUDE_DIR "${SOURCE_DIR}/include") +- set(RAPIDJSON_VENDORED 1) +- else() +- set(RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_HOME}/include") +- set(RAPIDJSON_VENDORED 0) +- endif() ++ set(RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_HOME}/include") ++ set(RAPIDJSON_VENDORED 0) + message(STATUS "RapidJSON include dir: ${RAPIDJSON_INCLUDE_DIR}") + include_directories(SYSTEM ${RAPIDJSON_INCLUDE_DIR}) + +@@ -658,32 +483,8 @@ if (ARROW_IPC) + endif() + + ## Flatbuffers +- if("${FLATBUFFERS_HOME}" STREQUAL "") +- set(FLATBUFFERS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/flatbuffers_ep-prefix/src/flatbuffers_ep-install") +- if (MSVC) +- set(FLATBUFFERS_CMAKE_CXX_FLAGS /EHsc) +- else() +- set(FLATBUFFERS_CMAKE_CXX_FLAGS -fPIC) +- endif() +- # We always need to do release builds, otherwise flatc will not be installed. +- ExternalProject_Add(flatbuffers_ep +- URL ${FLATBUFFERS_SOURCE_URL} +- CMAKE_ARGS +- "-DCMAKE_CXX_FLAGS=${FLATBUFFERS_CMAKE_CXX_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX:PATH=${FLATBUFFERS_PREFIX}" +- "-DFLATBUFFERS_BUILD_TESTS=OFF" +- "-DCMAKE_BUILD_TYPE=RELEASE" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}" +- ${EP_LOG_OPTIONS}) +- +- set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_PREFIX}/include") +- set(FLATBUFFERS_COMPILER "${FLATBUFFERS_PREFIX}/bin/flatc") +- set(FLATBUFFERS_VENDORED 1) +- else() +- find_package(Flatbuffers REQUIRED) +- set(FLATBUFFERS_VENDORED 0) +- endif() ++ find_package(Flatbuffers REQUIRED) ++ set(FLATBUFFERS_VENDORED 0) + + if(FLATBUFFERS_VENDORED) + add_dependencies(arrow_dependencies flatbuffers_ep) +@@ -787,34 +588,7 @@ if (ARROW_WITH_ZLIB) + if(ZLIB_FOUND) + ADD_THIRDPARTY_LIB(zlib SHARED_LIB ${ZLIB_SHARED_LIB}) + else() +- set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install") +- set(ZLIB_HOME "${ZLIB_PREFIX}") +- set(ZLIB_INCLUDE_DIR "${ZLIB_PREFIX}/include") +- if (MSVC) +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib) +- else() +- set(ZLIB_STATIC_LIB_NAME zlibstatic.lib) +- endif() +- else() +- set(ZLIB_STATIC_LIB_NAME libz.a) +- endif() +- set(ZLIB_STATIC_LIB "${ZLIB_PREFIX}/lib/${ZLIB_STATIC_LIB_NAME}") +- set(ZLIB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX} +- -DCMAKE_C_FLAGS=${EP_C_FLAGS} +- -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS} +- -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS} +- -DBUILD_SHARED_LIBS=OFF) +- ADD_THIRDPARTY_LIB(zlib +- STATIC_LIB ${ZLIB_STATIC_LIB}) +- +- ExternalProject_Add(zlib_ep +- URL ${ZLIB_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}" +- CMAKE_ARGS ${ZLIB_CMAKE_ARGS}) +- add_dependencies(zlib zlib_ep) ++ message(FATAL_ERROR "zlib not found.") + endif() + + include_directories(SYSTEM ${ZLIB_INCLUDE_DIR}) +@@ -824,62 +598,8 @@ if (ARROW_WITH_SNAPPY) + # ---------------------------------------------------------------------- + # Snappy + +- if("${SNAPPY_HOME}" STREQUAL "") +- set(SNAPPY_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/snappy_ep/src/snappy_ep-install") +- set(SNAPPY_HOME "${SNAPPY_PREFIX}") +- set(SNAPPY_INCLUDE_DIR "${SNAPPY_PREFIX}/include") +- if (MSVC) +- set(SNAPPY_STATIC_LIB_NAME snappy_static) +- else() +- set(SNAPPY_STATIC_LIB_NAME snappy) +- endif() +- set(SNAPPY_STATIC_LIB "${SNAPPY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- if (${UPPERCASE_BUILD_TYPE} EQUAL "RELEASE") +- if (APPLE) +- set(SNAPPY_CXXFLAGS "CXXFLAGS='-DNDEBUG -O1'") +- else() +- set(SNAPPY_CXXFLAGS "CXXFLAGS='-DNDEBUG -O2'") +- endif() +- endif() +- +- if (WIN32) +- set(SNAPPY_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX=${SNAPPY_PREFIX}") +- set(SNAPPY_UPDATE_COMMAND ${CMAKE_COMMAND} -E copy +- ${CMAKE_SOURCE_DIR}/cmake_modules/SnappyCMakeLists.txt +- ./CMakeLists.txt && +- ${CMAKE_COMMAND} -E copy +- ${CMAKE_SOURCE_DIR}/cmake_modules/SnappyConfig.h +- ./config.h) +- ExternalProject_Add(snappy_ep +- UPDATE_COMMAND ${SNAPPY_UPDATE_COMMAND} +- ${EP_LOG_OPTIONS} +- BUILD_IN_SOURCE 1 +- BUILD_COMMAND ${MAKE} +- INSTALL_DIR ${SNAPPY_PREFIX} +- URL ${SNAPPY_SOURCE_URL} +- CMAKE_ARGS ${SNAPPY_CMAKE_ARGS} +- BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}") +- else() +- ExternalProject_Add(snappy_ep +- CONFIGURE_COMMAND ./configure --with-pic "--prefix=${SNAPPY_PREFIX}" ${SNAPPY_CXXFLAGS} +- ${EP_LOG_OPTIONS} +- BUILD_IN_SOURCE 1 +- BUILD_COMMAND ${MAKE} +- INSTALL_DIR ${SNAPPY_PREFIX} +- URL ${SNAPPY_SOURCE_URL} +- BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}") +- endif() +- set(SNAPPY_VENDORED 1) +- else() +- find_package(Snappy REQUIRED) +- set(SNAPPY_VENDORED 0) +- endif() ++ find_package(Snappy REQUIRED) ++ set(SNAPPY_VENDORED 0) + + include_directories(SYSTEM ${SNAPPY_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(snappy +@@ -894,47 +614,8 @@ if (ARROW_WITH_BROTLI) + # ---------------------------------------------------------------------- + # Brotli + +- if("${BROTLI_HOME}" STREQUAL "") +- set(BROTLI_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/brotli_ep/src/brotli_ep-install") +- set(BROTLI_HOME "${BROTLI_PREFIX}") +- set(BROTLI_INCLUDE_DIR "${BROTLI_PREFIX}/include") +- if (MSVC) +- set(BROTLI_LIB_DIR bin) +- else() +- set(BROTLI_LIB_DIR lib) +- endif() +- set(BROTLI_STATIC_LIBRARY_ENC "${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BROTLI_STATIC_LIBRARY_DEC "${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BROTLI_STATIC_LIBRARY_COMMON "${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BROTLI_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}" +- -DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX} +- -DCMAKE_INSTALL_LIBDIR=lib/${CMAKE_LIBRARY_ARCHITECTURE} +- -DBUILD_SHARED_LIBS=OFF) +- +- ExternalProject_Add(brotli_ep +- URL ${BROTLI_SOURCE_URL} +- BUILD_BYPRODUCTS "${BROTLI_STATIC_LIBRARY_ENC}" "${BROTLI_STATIC_LIBRARY_DEC}" "${BROTLI_STATIC_LIBRARY_COMMON}" +- ${BROTLI_BUILD_BYPRODUCTS} +- ${EP_LOG_OPTIONS} +- CMAKE_ARGS ${BROTLI_CMAKE_ARGS} +- STEP_TARGETS headers_copy) +- if (MSVC) +- ExternalProject_Get_Property(brotli_ep SOURCE_DIR) +- +- ExternalProject_Add_Step(brotli_ep headers_copy +- COMMAND xcopy /E /I include ..\\..\\..\\brotli_ep\\src\\brotli_ep-install\\include /Y +- DEPENDEES build +- WORKING_DIRECTORY ${SOURCE_DIR}) +- endif() +- set(BROTLI_VENDORED 1) +- else() +- find_package(Brotli REQUIRED) +- set(BROTLI_VENDORED 0) +- endif() ++ find_package(Brotli REQUIRED) ++ set(BROTLI_VENDORED 0) + + include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(brotli_enc +@@ -955,45 +636,8 @@ if (ARROW_WITH_LZ4) + # ---------------------------------------------------------------------- + # Lz4 + +- if("${LZ4_HOME}" STREQUAL "") +- set(LZ4_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/lz4_ep-prefix/src/lz4_ep") +- set(LZ4_HOME "${LZ4_BUILD_DIR}") +- set(LZ4_INCLUDE_DIR "${LZ4_BUILD_DIR}/lib") +- +- if (MSVC) +- if (ARROW_USE_STATIC_CRT) +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(LZ4_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreadedDebug") +- else() +- set(LZ4_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreaded") +- endif() +- endif() +- set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/visual/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/liblz4_static.lib") +- set(LZ4_BUILD_COMMAND BUILD_COMMAND msbuild.exe /m /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:PlatformToolset=v140 +- ${LZ4_RUNTIME_LIBRARY_LINKAGE} /t:Build ${LZ4_BUILD_DIR}/visual/VS2010/lz4.sln) +- set(LZ4_PATCH_COMMAND PATCH_COMMAND git --git-dir=. apply --verbose --whitespace=fix ${CMAKE_SOURCE_DIR}/build-support/lz4_msbuild_gl_runtimelibrary_params.patch) +- else() +- set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/lib/liblz4.a") +- set(LZ4_BUILD_COMMAND BUILD_COMMAND ${CMAKE_SOURCE_DIR}/build-support/build-lz4-lib.sh) +- endif() +- +- ExternalProject_Add(lz4_ep +- URL ${LZ4_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- UPDATE_COMMAND "" +- ${LZ4_PATCH_COMMAND} +- CONFIGURE_COMMAND "" +- INSTALL_COMMAND "" +- BINARY_DIR ${LZ4_BUILD_DIR} +- BUILD_BYPRODUCTS ${LZ4_STATIC_LIB} +- ${LZ4_BUILD_COMMAND} +- ) +- +- set(LZ4_VENDORED 1) +- else() +- find_package(Lz4 REQUIRED) +- set(LZ4_VENDORED 0) +- endif() ++ find_package(Lz4 REQUIRED) ++ set(LZ4_VENDORED 0) + + include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(lz4_static +@@ -1008,45 +652,8 @@ if (ARROW_WITH_ZSTD) + # ---------------------------------------------------------------------- + # ZSTD + +- if("${ZSTD_HOME}" STREQUAL "") +- set(ZSTD_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/zstd_ep-prefix/src/zstd_ep") +- set(ZSTD_INCLUDE_DIR "${ZSTD_BUILD_DIR}/lib") +- +- if (MSVC) +- if (ARROW_USE_STATIC_CRT) +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(ZSTD_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreadedDebug") +- else() +- set(ZSTD_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreaded") +- endif() +- endif() +- set(ZSTD_STATIC_LIB "${ZSTD_BUILD_DIR}/build/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/libzstd_static.lib") +- set(ZSTD_BUILD_COMMAND BUILD_COMMAND msbuild ${ZSTD_BUILD_DIR}/build/VS2010/zstd.sln /t:Build /v:minimal /p:Configuration=${CMAKE_BUILD_TYPE} +- ${ZSTD_RUNTIME_LIBRARY_LINKAGE} /p:Platform=x64 /p:PlatformToolset=v140 +- /p:OutDir=${ZSTD_BUILD_DIR}/build/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/ /p:SolutionDir=${ZSTD_BUILD_DIR}/build/VS2010/ ) +- set(ZSTD_PATCH_COMMAND PATCH_COMMAND git --git-dir=. apply --verbose --whitespace=fix ${CMAKE_SOURCE_DIR}/build-support/zstd_msbuild_gl_runtimelibrary_params.patch) +- else() +- set(ZSTD_STATIC_LIB "${ZSTD_BUILD_DIR}/lib/libzstd.a") +- set(ZSTD_BUILD_COMMAND BUILD_COMMAND ${CMAKE_SOURCE_DIR}/build-support/build-zstd-lib.sh) +- endif() +- +- ExternalProject_Add(zstd_ep +- URL ${ZSTD_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- UPDATE_COMMAND "" +- ${ZSTD_PATCH_COMMAND} +- CONFIGURE_COMMAND "" +- INSTALL_COMMAND "" +- BINARY_DIR ${ZSTD_BUILD_DIR} +- BUILD_BYPRODUCTS ${ZSTD_STATIC_LIB} +- ${ZSTD_BUILD_COMMAND} +- ) +- +- set(ZSTD_VENDORED 1) +- else() +- find_package(ZSTD REQUIRED) +- set(ZSTD_VENDORED 0) +- endif() ++ find_package(ZSTD REQUIRED) ++ set(ZSTD_VENDORED 0) + + include_directories(SYSTEM ${ZSTD_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(zstd_static +@@ -1063,24 +670,8 @@ endif() + + if (ARROW_ORC OR ARROW_FLIGHT) + # protobuf +- if ("${PROTOBUF_HOME}" STREQUAL "") +- set (PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") +- set (PROTOBUF_HOME "${PROTOBUF_PREFIX}") +- set (PROTOBUF_INCLUDE_DIR "${PROTOBUF_PREFIX}/include") +- set (PROTOBUF_STATIC_LIB "${PROTOBUF_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- ExternalProject_Add(protobuf_ep +- CONFIGURE_COMMAND "./configure" "--disable-shared" "--prefix=${PROTOBUF_PREFIX}" "CXXFLAGS=${EP_CXX_FLAGS}" +- BUILD_IN_SOURCE 1 +- URL ${PROTOBUF_SOURCE_URL} +- BUILD_BYPRODUCTS "${PROTOBUF_STATIC_LIB}" +- ${EP_LOG_OPTIONS}) +- +- set (PROTOBUF_VENDORED 1) +- else () +- find_package (Protobuf REQUIRED) +- set (PROTOBUF_VENDORED 0) +- endif () ++ find_package (Protobuf REQUIRED) ++ set (PROTOBUF_VENDORED 0) + + include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + if (ARROW_PROTOBUF_USE_SHARED) +@@ -1100,34 +691,8 @@ endif() + # Dependencies for Arrow Flight RPC + + if (ARROW_FLIGHT) +- if ("${GRPC_HOME}" STREQUAL "") +- set(GRPC_VENDORED 1) +- set(GRPC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/grpc_ep-prefix/src/grpc_ep-build") +- set(GRPC_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/grpc_ep/src/grpc_ep-install") +- set(GRPC_HOME "${GRPC_PREFIX}") +- set(GRPC_INCLUDE_DIR "${GRPC_PREFIX}/include") +- set(GRPC_STATIC_LIBRARY_GPR "${GRPC_BUILD_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gpr${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GRPC_STATIC_LIBRARY_GRPC "${GRPC_BUILD_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}grpc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GRPC_STATIC_LIBRARY_GRPCPP "${GRPC_BUILD_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}grpcpp${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GRPC_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- -DCMAKE_INSTALL_PREFIX=${GRPC_PREFIX} +- -DBUILD_SHARED_LIBS=OFF) +- +- ExternalProject_Add(grpc_ep +- GIT_REPOSITORY "https://github.com/grpc/grpc" +- GIT_TAG ${GRPC_VERSION} +- BUILD_BYPRODUCTS "${GRPC_STATIC_LIBRARY_GPR}" "${GRPC_STATIC_LIBRARY_GRPC}" "${GRPC_STATIC_LIBRARY_GRPCPP}" +- ${GRPC_BUILD_BYPRODUCTS} +- ${EP_LOG_OPTIONS} +- CMAKE_ARGS ${GRPC_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) +- else() +- find_package(gRPC CONFIG REQUIRED) +- set(GRPC_VENDORED 0) +- endif() ++ find_package(gRPC CONFIG REQUIRED) ++ set(GRPC_VENDORED 0) + + get_property(GPR_STATIC_LIB TARGET gRPC::gpr PROPERTY LOCATION) + ADD_THIRDPARTY_LIB(grpc_gpr +@@ -1157,60 +722,9 @@ endif() + + if (ARROW_ORC) + # orc +- if ("${ORC_HOME}" STREQUAL "") +- set(ORC_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/orc_ep-install") +- set(ORC_HOME "${ORC_PREFIX}") +- set(ORC_INCLUDE_DIR "${ORC_PREFIX}/include") +- set(ORC_STATIC_LIB "${ORC_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}orc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- if ("${COMPILER_FAMILY}" STREQUAL "clang") +- if ("${COMPILER_VERSION}" VERSION_GREATER "4.0") +- set(ORC_CMAKE_CXX_FLAGS " -Wno-zero-as-null-pointer-constant \ +- -Wno-inconsistent-missing-destructor-override ") +- endif() +- endif() +- +- set(ORC_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} ${ORC_CMAKE_CXX_FLAGS}") +- +- # Since LZ4 isn't installed, the header file is in ${LZ4_HOME}/lib instead of +- # ${LZ4_HOME}/include, which forces us to specify the include directory +- # manually as well. +- set (ORC_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${ORC_PREFIX} +- -DCMAKE_CXX_FLAGS=${ORC_CMAKE_CXX_FLAGS} +- -DBUILD_LIBHDFSPP=OFF +- -DBUILD_JAVA=OFF +- -DBUILD_TOOLS=OFF +- -DBUILD_CPP_TESTS=OFF +- -DINSTALL_VENDORED_LIBS=OFF +- -DPROTOBUF_HOME=${PROTOBUF_HOME} +- -DLZ4_HOME=${LZ4_HOME} +- -DLZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} +- -DSNAPPY_HOME=${SNAPPY_HOME} +- -DZLIB_HOME=${ZLIB_HOME}) +- +- ExternalProject_Add(orc_ep +- URL ${ORC_SOURCE_URL} +- BUILD_BYPRODUCTS ${ORC_STATIC_LIB} +- CMAKE_ARGS ${ORC_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- +- set(ORC_VENDORED 1) +- add_dependencies(orc_ep zlib) +- if (LZ4_VENDORED) +- add_dependencies(orc_ep lz4_static) +- endif() +- if (SNAPPY_VENDORED) +- add_dependencies(orc_ep snappy) +- endif() +- if (PROTOBUF_VENDORED) +- add_dependencies(orc_ep protobuf_ep) +- endif() +- else() +- set(ORC_INCLUDE_DIR "${ORC_HOME}/include") +- set(ORC_STATIC_LIB "${ORC_HOME}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}orc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(ORC_VENDORED 0) +- endif() ++ set(ORC_INCLUDE_DIR "${ORC_HOME}/include") ++ set(ORC_STATIC_LIB "${ORC_HOME}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}orc${CMAKE_STATIC_LIBRARY_SUFFIX}") ++ set(ORC_VENDORED 0) + + include_directories(SYSTEM ${ORC_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(orc +@@ -1231,97 +745,7 @@ if (ARROW_WITH_THRIFT) + # find thrift headers and libs + find_package(Thrift) + +-if (NOT THRIFT_FOUND) +- set(THRIFT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep/src/thrift_ep-install") +- set(THRIFT_HOME "${THRIFT_PREFIX}") +- set(THRIFT_INCLUDE_DIR "${THRIFT_PREFIX}/include") +- set(THRIFT_COMPILER "${THRIFT_PREFIX}/bin/thrift") +- set(THRIFT_CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX=${THRIFT_PREFIX}" +- "-DCMAKE_INSTALL_RPATH=${THRIFT_PREFIX}/lib" +- "-DBUILD_SHARED_LIBS=OFF" +- "-DBUILD_TESTING=OFF" +- "-DBUILD_EXAMPLES=OFF" +- "-DBUILD_TUTORIALS=OFF" +- "-DWITH_QT4=OFF" +- "-DWITH_C_GLIB=OFF" +- "-DWITH_JAVA=OFF" +- "-DWITH_PYTHON=OFF" +- "-DWITH_HASKELL=OFF" +- "-DWITH_CPP=ON" +- "-DWITH_STATIC_LIB=ON" +- "-DWITH_LIBEVENT=OFF" +- ) +- +- # Thrift also uses boost. Forward important boost settings if there were ones passed. +- if (DEFINED BOOST_ROOT) +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBOOST_ROOT=${BOOST_ROOT}") +- endif() +- if (DEFINED Boost_NAMESPACE) +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBoost_NAMESPACE=${Boost_NAMESPACE}") +- endif() +- +- set(THRIFT_STATIC_LIB_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}thrift") +- if (MSVC) +- if (ARROW_USE_STATIC_CRT) +- set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}mt") +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DWITH_MT=ON") +- else() +- set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}md") +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DWITH_MT=OFF") +- endif() +- endif() +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}d") +- endif() +- set(THRIFT_STATIC_LIB "${THRIFT_PREFIX}/lib/${THRIFT_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- if (ZLIB_SHARED_LIB) +- set(THRIFT_CMAKE_ARGS "-DZLIB_LIBRARY=${ZLIB_SHARED_LIB}" +- ${THRIFT_CMAKE_ARGS}) +- else() +- set(THRIFT_CMAKE_ARGS "-DZLIB_LIBRARY=${ZLIB_STATIC_LIB}" +- ${THRIFT_CMAKE_ARGS}) +- endif() +- set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} zlib) +- +- if (MSVC) +- set(WINFLEXBISON_VERSION 2.4.9) +- set(WINFLEXBISON_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/winflexbison_ep/src/winflexbison_ep-install") +- ExternalProject_Add(winflexbison_ep +- URL https://github.com/lexxmark/winflexbison/releases/download/v.${WINFLEXBISON_VERSION}/win_flex_bison-${WINFLEXBISON_VERSION}.zip +- URL_HASH MD5=a2e979ea9928fbf8567e995e9c0df765 +- SOURCE_DIR ${WINFLEXBISON_PREFIX} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ${EP_LOG_OPTIONS}) +- set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} winflexbison_ep) +- +- set(THRIFT_CMAKE_ARGS "-DFLEX_EXECUTABLE=${WINFLEXBISON_PREFIX}/win_flex.exe" +- "-DBISON_EXECUTABLE=${WINFLEXBISON_PREFIX}/win_bison.exe" +- "-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR}" +- "-DWITH_SHARED_LIB=OFF" +- "-DWITH_PLUGIN=OFF" +- ${THRIFT_CMAKE_ARGS}) +- elseif (APPLE) +- if (DEFINED BISON_EXECUTABLE) +- set(THRIFT_CMAKE_ARGS "-DBISON_EXECUTABLE=${BISON_EXECUTABLE}" +- ${THRIFT_CMAKE_ARGS}) +- endif() +- endif() +- +- ExternalProject_Add(thrift_ep +- URL ${THRIFT_SOURCE_URL} +- BUILD_BYPRODUCTS "${THRIFT_STATIC_LIB}" "${THRIFT_COMPILER}" +- CMAKE_ARGS ${THRIFT_CMAKE_ARGS} +- DEPENDS ${THRIFT_DEPENDENCIES} +- ${EP_LOG_OPTIONS}) +- +- set(THRIFT_VENDORED 1) +-else() ++if (THRIFT_FOUND) + set(THRIFT_VENDORED 0) + endif() + +@@ -1347,45 +771,8 @@ endif() # ARROW_HIVESERVER2 + # GLOG + + if (ARROW_USE_GLOG) +- if("${GLOG_HOME}" STREQUAL "") +- set(GLOG_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/glog_ep-prefix/src/glog_ep") +- set(GLOG_INCLUDE_DIR "${GLOG_BUILD_DIR}/include") +- set(GLOG_STATIC_LIB "${GLOG_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}glog${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +- set(GLOG_CMAKE_C_FLAGS "${EP_C_FLAGS} -fPIC") +- if (PTHREAD_LIBRARY) +- set(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread") +- set(GLOG_CMAKE_C_FLAGS "${EP_C_FLAGS} -fPIC -pthread") +- endif() +- message(STATUS "GLOG_CMAKE_CXX_FLAGS: ${GLOG_CMAKE_CXX_FLAGS}") +- message(STATUS "CMAKE_CXX_FLAGS in glog: ${GLOG_CMAKE_CXX_FLAGS}") +- +- if(APPLE) +- # If we don't set this flag, the binary built with 10.13 cannot be used in 10.12. +- set(GLOG_CMAKE_CXX_FLAGS "${GLOG_CMAKE_CXX_FLAGS} -mmacosx-version-min=10.9") +- endif() +- +- set(GLOG_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${GLOG_BUILD_DIR} +- -DBUILD_SHARED_LIBS=OFF +- -DBUILD_TESTING=OFF +- -DWITH_GFLAGS=OFF +- -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${GLOG_CMAKE_CXX_FLAGS} +- -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${GLOG_CMAKE_C_FLAGS} +- -DCMAKE_CXX_FLAGS=${GLOG_CMAKE_CXX_FLAGS}) +- message(STATUS "Glog version: ${GLOG_VERSION}") +- ExternalProject_Add(glog_ep +- URL ${GLOG_SOURCE_URL} +- BUILD_IN_SOURCE 1 +- BUILD_BYPRODUCTS "${GLOG_STATIC_LIB}" +- CMAKE_ARGS ${GLOG_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- +- set(GLOG_VENDORED 1) +- else() +- find_package(GLOG REQUIRED) +- set(GLOG_VENDORED 0) +- endif() ++ find_package(GLOG REQUIRED) ++ set(GLOG_VENDORED 0) + + message(STATUS "Glog include dir: ${GLOG_INCLUDE_DIR}") + message(STATUS "Glog static library: ${GLOG_STATIC_LIB}") diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 4bd745ebf..73cf90eb2 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -7,15 +7,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-0.9.0 - SHA512 789d0948eee3af20eb922e09c14eb721f20fa041ca3c0cf57bd869718fc9919b45590bd72714efafdf19196f35abb6bdbe0a3972ca74fcc2af92c1f9ade8fa00 + REF apache-arrow-0.11.1 + SHA512 8a2de7e4b40666e4ea7818fac488549f1348e961e7cb6a4166ae4019976a574fd115dc1cabaf44bc1cbaabf15fb8e5133c8232b34fca250d8ff7c5b65c5407c8 HEAD_REF master ) set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp") vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${CPP_SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/all.patch" ) @@ -23,6 +23,14 @@ vcpkg_apply_patches( string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" IS_STATIC) + +if (IS_STATIC) + set(PARQUET_ARROW_LINKAGE static) +else() + set(PARQUET_ARROW_LINKAGE shared) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${CPP_SOURCE_PATH} PREFER_NINJA @@ -38,18 +46,28 @@ vcpkg_configure_cmake( -DBOOST_ROOT=${CURRENT_INSTALLED_DIR} -DGFLAGS_HOME=${CURRENT_INSTALLED_DIR} -DZLIB_HOME=${CURRENT_INSTALLED_DIR} + -DARROW_PARQUET=ON -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} + -DBUILD_STATIC=${ARROW_BUILD_STATIC} + -DBUILD_SHARED=${ARROW_BUILD_SHARED} + -DPARQUET_ARROW_LINKAGE=${PARQUET_ARROW_LINKAGE} + -DDOUBLE_CONVERSION_HOME=${CURRENT_INSTALLED_DIR} + -DGLOG_HOME=${CURRENT_INSTALLED_DIR} ) vcpkg_install_cmake() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib) +vcpkg_copy_pdbs() + +if(WIN32) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib) + endif() endif() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright) diff --git a/ports/parquet/CONTROL b/ports/parquet/CONTROL index c9288597e..21584e8ee 100644 --- a/ports/parquet/CONTROL +++ b/ports/parquet/CONTROL @@ -1,4 +1,4 @@ Source: parquet -Version: 1.4.0 -Build-Depends: arrow, thrift, gtest -Description: Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. \ No newline at end of file +Version: 0 +Build-Depends: arrow +Description: Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. It is now part of the arrow library. \ No newline at end of file diff --git a/ports/parquet/all.patch b/ports/parquet/all.patch deleted file mode 100644 index e9ec99662..000000000 --- a/ports/parquet/all.patch +++ /dev/null @@ -1,779 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 304f3fb..0b0fc1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,7 +16,7 @@ - # under the License. - - # Require cmake that supports BYPRODUCTS in add_custom_command, ExternalProject_Add [1]. --cmake_minimum_required(VERSION 3.2.0) -+cmake_minimum_required(VERSION 3.8) - - file(READ "${CMAKE_CURRENT_SOURCE_DIR}/.parquetcppversion" PARQUET_VERSION) - string(REPLACE "\n" "" PARQUET_VERSION "${PARQUET_VERSION}") -@@ -25,6 +25,10 @@ if(NOT VERSION) - message(FATAL_ERROR "invalid .parquetcppversion") - endif() - -+if(NOT DEFINED ARROW_LIB_SUFFIX) -+ set(ARROW_LIB_SUFFIX "") -+endif() -+ - project(parquet-cpp VERSION ${VERSION}) - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ library to read and write the Apache Parquet columnar data format") - set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) -@@ -528,37 +532,25 @@ endif() - ############################################################# - # Apache Arrow linkage - --if ("${PARQUET_ARROW_LINKAGE}" STREQUAL "shared") -+if ("${PARQUET_ARROW_LINKAGE}" STREQUAL "dynamic") - set(ARROW_LINK_LIBS -- arrow) -+ arrow_static) - else() - ############################################################# - # Transitive Library Linkage -- -- if (NOT DEFINED ENV{BROTLI_STATIC_LIB_ENC} OR -- NOT DEFINED ENV{BROTLI_STATIC_LIB_DEC} OR -- NOT DEFINED ENV{BROTLI_STATIC_LIB_COMMON} OR -- NOT DEFINED ENV{SNAPPY_STATIC_LIB} OR -- NOT DEFINED ENV{ZLIB_STATIC_LIB} OR -- NOT DEFINED ENV{LZ4_STATIC_LIB} OR -- NOT DEFINED ENV{ZSTD_STATIC_LIB}) -- message(FATAL_ERROR "Missing transitive dependencies for Arrow static linking") -- endif() -- -- set(BROTLI_STATIC_LIB_ENC "$ENV{BROTLI_STATIC_LIB_ENC}") -- set(BROTLI_STATIC_LIB_DEC "$ENV{BROTLI_STATIC_LIB_DEC}") -- set(BROTLI_STATIC_LIB_COMMON "$ENV{BROTLI_STATIC_LIB_COMMON}") -- set(SNAPPY_STATIC_LIB "$ENV{SNAPPY_STATIC_LIB}") -- set(ZLIB_STATIC_LIB "$ENV{ZLIB_STATIC_LIB}") -- set(LZ4_STATIC_LIB "$ENV{LZ4_STATIC_LIB}") -- set(ZSTD_STATIC_LIB "$ENV{ZSTD_STATIC_LIB}") -- -+ -+ find_package(Brotli REQUIRED) -+ find_package(Snappy REQUIRED) -+ find_package(LZ4 REQUIRED) -+ find_package(ZLIB REQUIRED) -+ find_package(ZSTD REQUIRED) -+ - add_library(brotli_enc STATIC IMPORTED) -- set_target_properties(brotli_enc PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIB_ENC}) -+ set_target_properties(brotli_enc PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIBRARY_ENC}) - add_library(brotli_dec STATIC IMPORTED) -- set_target_properties(brotli_dec PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIB_DEC}) -+ set_target_properties(brotli_dec PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIBRARY_DEC}) - add_library(brotli_common STATIC IMPORTED) -- set_target_properties(brotli_common PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIB_COMMON}) -+ set_target_properties(brotli_common PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIBRARY_COMMON}) - add_library(snappy STATIC IMPORTED) - set_target_properties(snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) - add_library(zlib STATIC IMPORTED) -@@ -588,9 +580,7 @@ endif() - ############################################################# - # Test linking - --set(PARQUET_MIN_TEST_LIBS -- gtest -- gtest_main) -+set(PARQUET_MIN_TEST_LIBS GTest::GTest GTest::Main) - - if (APPLE) - set(PARQUET_MIN_TEST_LIBS -diff --git a/cmake_modules/FindArrow.cmake b/cmake_modules/FindArrow.cmake -index b63b1af..3329c4a 100644 ---- a/cmake_modules/FindArrow.cmake -+++ b/cmake_modules/FindArrow.cmake -@@ -22,76 +22,21 @@ - # ARROW_SHARED_LIB, path to libarrow's shared library - # ARROW_FOUND, whether arrow has been found - --if (DEFINED ENV{ARROW_HOME}) -- set(ARROW_HOME "$ENV{ARROW_HOME}") --endif() -- --if ("${ARROW_HOME}" STREQUAL "") -- # PARQUET-955. If the user has set $ARROW_HOME in the environment, we respect -- # this, otherwise try to locate the pkgconfig in the system environment -- pkg_check_modules(ARROW arrow) -- if (ARROW_FOUND) -- # We found the pkgconfig -- set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS}) -- -- if (COMMAND pkg_get_variable) -- pkg_get_variable(ARROW_ABI_VERSION arrow abi_version) -- else() -- set(ARROW_ABI_VERSION "") -- endif() -- if (ARROW_ABI_VERSION STREQUAL "") -- set(ARROW_SHARED_LIB_SUFFIX "") -- else() -- set(ARROW_SHARED_LIB_SUFFIX ".${ARROW_ABI_VERSION}") -- endif() -- -- set(ARROW_LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}arrow) -- -- if (APPLE) -- set(ARROW_SHARED_LIB ${ARROW_LIBDIR}/${ARROW_LIB_NAME}${ARROW_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- else() -- set(ARROW_SHARED_LIB ${ARROW_LIBDIR}/${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}${ARROW_SHARED_LIB_SUFFIX}) -- endif() -- set(ARROW_STATIC_LIB ${ARROW_LIBDIR}/${ARROW_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- endif() --else() -- set(ARROW_HOME "${ARROW_HOME}") -+find_path(ARROW_INCLUDE_DIR arrow/array.h -+ PATH_SUFFIXES "include" -+ ) - -- if (MSVC AND NOT ARROW_MSVC_STATIC_LIB_SUFFIX) -- set(ARROW_MSVC_STATIC_LIB_SUFFIX _static) -- endif() -+find_library(ARROW_LIB_PATH NAMES arrow) - -- set(ARROW_SEARCH_HEADER_PATHS -- ${ARROW_HOME}/include -- ) -+if (ARROW_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ARROW_LIB_PATH)) -+ set(ARROW_FOUND TRUE) -+ set(ARROW_HEADER_NAME arrow/api.h) -+ set(ARROW_HEADER ${ARROW_INCLUDE_DIR}/${ARROW_HEADER_NAME}) -+ set(ARROW_LIB_NAME arrow) - -- set(ARROW_SEARCH_LIB_PATH -- ${ARROW_HOME}/lib -- ) -- -- find_path(ARROW_INCLUDE_DIR arrow/array.h PATHS -- ${ARROW_SEARCH_HEADER_PATHS} -- # make sure we don't accidentally pick up a different version -- NO_DEFAULT_PATH -- ) -- -- find_library(ARROW_LIB_PATH NAMES arrow arrow${ARROW_MSVC_STATIC_LIB_SUFFIX} -- PATHS -- ${ARROW_SEARCH_LIB_PATH} -- NO_DEFAULT_PATH) -- -- if (ARROW_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ARROW_LIB_PATH)) -- set(ARROW_FOUND TRUE) -- set(ARROW_HEADER_NAME arrow/api.h) -- set(ARROW_HEADER ${ARROW_INCLUDE_DIR}/${ARROW_HEADER_NAME}) -- set(ARROW_LIB_NAME arrow) -- -- get_filename_component(ARROW_LIBS ${ARROW_LIB_PATH} DIRECTORY) -- set(ARROW_STATIC_LIB ${ARROW_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(ARROW_SHARED_LIB ${ARROW_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- set(ARROW_SHARED_IMPLIB ${ARROW_LIBS}/${ARROW_LIB_NAME}.lib) -- endif () --endif() -+ set(ARROW_STATIC_LIB ${ARROW_LIB_PATH}) -+ set(ARROW_SHARED_LIB ${ARROW_LIB_PATH}) -+endif () - - if (ARROW_FOUND) - if (NOT Arrow_FIND_QUIETLY) -diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake -index f2e714c..9561660 100644 ---- a/cmake_modules/FindBrotli.cmake -+++ b/cmake_modules/FindBrotli.cmake -@@ -17,13 +17,6 @@ - # - # find_package(Brotli) - # --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# Brotli_HOME - When set, this path is inspected instead of standard library --# locations as the root of the Brotli installation. --# The environment variable BROTLI_HOME overrides this veriable. --# - # This module defines - # BROTLI_INCLUDE_DIR, directory containing headers - # BROTLI_LIBS, directory containing brotli libraries -@@ -31,80 +24,37 @@ - # BROTLI_SHARED_LIB, path to libbrotli's shared library - # BROTLI_FOUND, whether brotli has been found - --if( NOT "${BROTLI_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${BROTLI_HOME}" _native_path ) -- list( APPEND _brotli_roots ${_native_path} ) --elseif ( Brotli_HOME ) -- list( APPEND _brotli_roots ${Brotli_HOME} ) --endif() -- - find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH - PATH_SUFFIXES "include" ) -- --find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a brotlienc -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -- --find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a brotlidec -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -- --find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a brotlicommon -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -+ -+find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a brotlienc brotlienc-static ) -+find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a brotlidec brotlidec-static ) -+find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a brotlicommon brotlicommon-static ) - - set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_ENC} ${BROTLI_LIBRARY_DEC} - ${BROTLI_LIBRARY_COMMON}) - --if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES)) -+if (BROTLI_INCLUDE_DIR) - set(BROTLI_FOUND TRUE) -- get_filename_component( BROTLI_LIBS ${BROTLI_LIBRARY_ENC} PATH ) -- set(BROTLI_LIB_NAME brotli) -- if (MSVC AND NOT BROTLI_MSVC_STATIC_LIB_SUFFIX) -- set(BROTLI_MSVC_STATIC_LIB_SUFFIX _static) -- endif() - set(BROTLI_STATIC_LIB -- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} -- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} -- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -+ ${BROTLI_LIBRARY_ENC} -+ ${BROTLI_LIBRARY_DEC} -+ ${BROTLI_LIBRARY_COMMON}) -+ set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBRARY_ENC}) -+ set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBRARY_DEC}) -+ set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBRARY_COMMON}) - set(BROTLI_SHARED_LIB -- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_SHARED_LIBRARY_SUFFIX} -- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_SHARED_LIBRARY_SUFFIX} -- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ ${BROTLI_LIBRARY_ENC} -+ ${BROTLI_LIBRARY_DEC} -+ ${BROTLI_LIBRARY_COMMON}) - else () - set(BROTLI_FOUND FALSE) - endif () - - if (BROTLI_FOUND) -- if (NOT Brotli_FIND_QUIETLY) -- if (PARQUET_MINIMAL_DEPENDENCY) -- message(STATUS "Found the Brotli headers: ${BROTLI_INCLUDE_DIR}") -- else () -- message(STATUS "Found the Brotli library: ${BROTLI_LIBRARIES}") -- endif () -- endif () -+ message(STATUS "Found the Brotli library: ${BROTLI_LIBRARIES}") - else () -- if (NOT Brotli_FIND_QUIETLY) -- set(BROTLI_ERR_MSG "Could not find the Brotli library. Looked in ") -- if ( _brotli_roots ) -- set(BROTLI_ERR_MSG "${BROTLI_ERR_MSG} in ${_brotli_roots}.") -- else () -- set(BROTLI_ERR_MSG "${BROTLI_ERR_MSG} system search paths.") -- endif () -- if (Brotli_FIND_REQUIRED) -- message(FATAL_ERROR "${BROTLI_ERR_MSG}") -- else (Brotli_FIND_REQUIRED) -- message(STATUS "${BROTLI_ERR_MSG}") -- endif (Brotli_FIND_REQUIRED) -- endif () -+ message(FATAL_ERROR "Could not find the Brotli library.") - endif () - - mark_as_advanced( -diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake -deleted file mode 100644 -index c6ea16b..0000000 ---- a/cmake_modules/FindGTest.cmake -+++ /dev/null -@@ -1,94 +0,0 @@ --# --# Licensed under the Apache License, Version 2.0 (the "License"); --# you may not use this file except in compliance with the License. --# You may obtain a copy of the License at --# --# http://www.apache.org/licenses/LICENSE-2.0 --# --# Unless required by applicable law or agreed to in writing, software --# distributed under the License is distributed on an "AS IS" BASIS, --# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --# See the License for the specific language governing permissions and --# limitations under the License. --# --# Tries to find GTest headers and libraries. --# --# Usage of this module as follows: --# --# find_package(GTest) --# --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# GTest_HOME - When set, this path is inspected instead of standard library --# locations as the root of the GTest installation. --# The environment variable GTEST_HOME overrides this veriable. --# --# This module defines --# GTEST_INCLUDE_DIR, directory containing headers --# GTEST_LIBS, directory containing gtest libraries --# GTEST_STATIC_LIB, path to libgtest.a --# GTEST_MAIN_STATIC_LIB, path to libgtest_main.a --# GTEST_SHARED_LIB, path to libgtest's shared library --# GTEST_FOUND, whether gtest has been found -- --if( NOT "$ENV{GTEST_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "$ENV{GTEST_HOME}" _native_path ) -- list( APPEND _gtest_roots ${_native_path} ) --elseif ( GTest_HOME ) -- list( APPEND _gtest_roots ${GTest_HOME} ) --endif() -- --# Try the parameterized roots, if they exist --if ( _gtest_roots ) -- find_path( GTEST_INCLUDE_DIR NAMES gtest/gtest.h -- PATHS ${_gtest_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "include" ) -- find_library( GTEST_LIBRARIES NAMES gtest gtest_main -- PATHS ${_gtest_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "lib" ) --else () -- find_path( GTEST_INCLUDE_DIR NAMES gtest/gtest.h ) -- find_library( GTEST_LIBRARIES NAMES gtest ) --endif () -- -- --if (GTEST_INCLUDE_DIR AND GTEST_LIBRARIES) -- set(GTEST_FOUND TRUE) -- get_filename_component( GTEST_LIBS ${GTEST_LIBRARIES} PATH ) -- set(GTEST_LIB_NAME gtest) -- set(GTEST_STATIC_LIB ${GTEST_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${GTEST_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(GTEST_MAIN_STATIC_LIB ${GTEST_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${GTEST_LIB_NAME}_main${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(GTEST_SHARED_LIB ${GTEST_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${GTEST_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) --else () -- set(GTEST_FOUND FALSE) --endif () -- --if (GTEST_FOUND) -- if (NOT GTest_FIND_QUIETLY) -- message(STATUS "Found the GTest library: ${GTEST_LIBRARIES}") -- endif () --else () -- if (NOT GTest_FIND_QUIETLY) -- set(GTEST_ERR_MSG "Could not find the GTest library. Looked in ") -- if ( _gtest_roots ) -- set(GTEST_ERR_MSG "${GTEST_ERR_MSG} in ${_gtest_roots}.") -- else () -- set(GTEST_ERR_MSG "${GTEST_ERR_MSG} system search paths.") -- endif () -- if (GTest_FIND_REQUIRED) -- message(FATAL_ERROR "${GTEST_ERR_MSG}") -- else (GTest_FIND_REQUIRED) -- message(STATUS "${GTEST_ERR_MSG}") -- endif (GTest_FIND_REQUIRED) -- endif () --endif () -- --mark_as_advanced( -- GTEST_INCLUDE_DIR -- GTEST_LIBS -- GTEST_LIBRARIES -- GTEST_STATIC_LIB -- GTEST_MAIN_STATIC_LIB -- GTEST_SHARED_LIB --) -diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake -new file mode 100644 -index 0000000..8458d7f ---- /dev/null -+++ b/cmake_modules/FindLZ4.cmake -@@ -0,0 +1,62 @@ -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+# Tries to find LZ4 headers and libraries. -+# -+# Usage of this module as follows: -+# -+# find_package(Snappy) -+# -+# This module defines -+# LZ4_INCLUDE_DIR, directory containing headers -+# LZ4_LIBS, directory containing LZ4 libraries -+# LZ4_STATIC_LIB, path to lz4.a -+# LZ4_SHARED_LIB, path to lz4's shared library -+# LZ4_FOUND, whether LZ4 has been found -+ -+find_path(LZ4_INCLUDE_DIR lz4.h -+ PATH_SUFFIXES "include") -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(LZ4_LIB_SUFFIX "d") -+else() -+ set(LZ4_LIB_SUFFIX "") -+endif() -+ -+find_library( LZ4_LIBRARIES NAMES lz4${LZ4_LIB_SUFFIX} -+ PATH_SUFFIXES "lib") -+ -+if (LZ4_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR LZ4_LIBRARIES)) -+ set(LZ4_FOUND TRUE) -+ get_filename_component( LZ4_LIBS ${LZ4_LIBRARIES} PATH ) -+ set(LZ4_HEADER_NAME lz4.h) -+ set(LZ4_HEADER ${LZ4_INCLUDE_DIR}/${LZ4_HEADER_NAME}) -+ set(LZ4_STATIC_LIB ${LZ4_LIBRARIES}) -+ set(LZ4_SHARED_LIB ${LZ4_LIBRARIES}) -+else () -+ set(LZ4_FOUND FALSE) -+endif () -+ -+if (LZ4_FOUND) -+ message(STATUS "Found the LZ4 library: ${LZ4_LIBRARIES}") -+else () -+ message(FATAL_ERROR "Could not find the LZ4 library.") -+endif () -+ -+mark_as_advanced( -+ LZ4_INCLUDE_DIR -+ LZ4_LIBS -+ LZ4_LIBRARIES -+ LZ4_STATIC_LIB -+ LZ4_SHARED_LIB -+) -diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake -index 867963c..cc68688 100644 ---- a/cmake_modules/FindSnappy.cmake -+++ b/cmake_modules/FindSnappy.cmake -@@ -17,13 +17,6 @@ - # - # find_package(Snappy) - # --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# Snappy_HOME - When set, this path is inspected instead of standard library --# locations as the root of the Snappy installation. --# The environment variable SNAPPY_HOME overrides this variable. --# - # This module defines - # SNAPPY_INCLUDE_DIR, directory containing headers - # SNAPPY_LIBS, directory containing snappy libraries -@@ -31,22 +24,16 @@ - # SNAPPY_SHARED_LIB, path to libsnappy's shared library - # SNAPPY_FOUND, whether snappy has been found - --if( NOT "${SNAPPY_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${SNAPPY_HOME}" _native_path ) -- list( APPEND _snappy_roots ${_native_path} ) --elseif ( Snappy_HOME ) -- list( APPEND _snappy_roots ${Snappy_HOME} ) --endif() -- --message(STATUS "SNAPPY_HOME: ${SNAPPY_HOME}") --find_path(SNAPPY_INCLUDE_DIR snappy.h HINTS -- ${_snappy_roots} -- NO_DEFAULT_PATH -+find_path(SNAPPY_INCLUDE_DIR snappy.h - PATH_SUFFIXES "include") -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(SNAPPY_LIB_SUFFIX "d") -+else() -+ set(SNAPPY_LIB_SUFFIX "") -+endif() - --find_library( SNAPPY_LIBRARIES NAMES snappy PATHS -- ${_snappy_roots} -- NO_DEFAULT_PATH -+find_library( SNAPPY_LIBRARIES NAMES snappy${SNAPPY_LIB_SUFFIX} - PATH_SUFFIXES "lib") - - if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) -@@ -54,9 +41,8 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) - get_filename_component( SNAPPY_LIBS ${SNAPPY_LIBRARIES} PATH ) - set(SNAPPY_HEADER_NAME snappy.h) - set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME}) -- set(SNAPPY_LIB_NAME snappy) -- set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ set(SNAPPY_STATIC_LIB ${SNAPPY_LIBRARIES}) -+ set(SNAPPY_SHARED_LIB ${SNAPPY_LIBRARIES}) - else () - set(SNAPPY_FOUND FALSE) - endif () -diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake -index 25f5082..f27857f 100644 ---- a/cmake_modules/FindThrift.cmake -+++ b/cmake_modules/FindThrift.cmake -@@ -14,55 +14,28 @@ - - # - Find Thrift (a cross platform RPC lib/tool) - # --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# Thrift_HOME - When set, this path is inspected instead of standard library --# locations as the root of the Thrift installation. --# The environment variable THRIFT_HOME overrides this variable. --# - # This module defines - # THRIFT_VERSION, version string of ant if found - # THRIFT_INCLUDE_DIR, where to find THRIFT headers --# THRIFT_CONTRIB_DIR, where contrib thrift files (e.g. fb303.thrift) are installed - # THRIFT_STATIC_LIB, THRIFT static library - # THRIFT_FOUND, If false, do not try to use ant - --# prefer the thrift version supplied in THRIFT_HOME --if( NOT "${THRIFT_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${THRIFT_HOME}" _native_path ) -- list( APPEND _thrift_roots ${_native_path} ) --elseif ( Thrift_HOME ) -- list( APPEND _thrift_roots ${Thrift_HOME} ) --endif() -- --message(STATUS "THRIFT_HOME: ${THRIFT_HOME}") --find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h HINTS -- ${_thrift_roots} -- NO_DEFAULT_PATH -+find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h - PATH_SUFFIXES "include" - ) - --find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS -- ${_thrift_roots} -- NO_DEFAULT_PATH --) -- --if (MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) -- set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(THRIFT_LIB_SUFFIX mdd) -+else() -+ set(THRIFT_LIB_SUFFIX md) - endif() - - find_library(THRIFT_STATIC_LIB NAMES -- ${CMAKE_STATIC_LIBRARY_PREFIX}thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} -- HINTS ${_thrift_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" -+ thrift${THRIFT_LIB_SUFFIX} - ) - - find_program(THRIFT_COMPILER thrift HINTS -- ${_thrift_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "bin" -+ PATH_SUFFIXES "tools" - ) - - if (THRIFT_STATIC_LIB) -@@ -94,7 +67,6 @@ else () - endif () - endif () - -- - mark_as_advanced( - THRIFT_STATIC_LIB - THRIFT_COMPILER -diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake -index 78b84f2..1ef0305 100644 ---- a/cmake_modules/FindZLIB.cmake -+++ b/cmake_modules/FindZLIB.cmake -@@ -32,27 +32,17 @@ - # ZLIB_SHARED_LIB, path to libz's shared library - # ZLIB_FOUND, whether zlib has been found - --if( NOT "${ZLIB_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${ZLIB_HOME}" _native_path ) -- list( APPEND _zlib_roots ${_native_path} ) --elseif ( ZLIB_HOME ) -- list( APPEND _zlib_roots ${ZLIB_HOME} ) -+find_path( ZLIB_INCLUDE_DIR NAMES zlib.h -+ PATH_SUFFIXES "include" ) -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(ZLIB_LIB_SUFFIX "d") -+else() -+ set(ZLIB_LIB_SUFFIX "") - endif() -- --# Try the parameterized roots, if they exist --if ( _zlib_roots ) -- find_path( ZLIB_INCLUDE_DIR NAMES zlib.h -- PATHS ${_zlib_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "include" ) -- find_library( ZLIB_LIBRARIES NAMES libz.a zlib -- PATHS ${_zlib_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "lib" ) --else () -- find_path( ZLIB_INCLUDE_DIR NAMES zlib.h ) -- # Only look for the static library -- find_library( ZLIB_LIBRARIES NAMES libz.a zlib ) --endif () -- -+ -+find_library( ZLIB_LIBRARIES NAMES libz.a zlib${ZLIB_LIB_SUFFIX} -+ PATH_SUFFIXES "lib" ) - - if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES)) - set(ZLIB_FOUND TRUE) -@@ -66,8 +56,8 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES)) - endif() - set(ZLIB_MSVC_SHARED_LIB_SUFFIX lib) - endif() -- set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(ZLIB_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ set(ZLIB_STATIC_LIB ${ZLIB_LIBRARIES}) -+ set(ZLIB_SHARED_LIB ${ZLIB_LIBRARIES}) - else () - set(ZLIB_FOUND FALSE) - endif () -diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake -new file mode 100644 -index 0000000..062cfa9 ---- /dev/null -+++ b/cmake_modules/FindZSTD.cmake -@@ -0,0 +1,62 @@ -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+# Tries to find ZSTD headers and libraries. -+# -+# Usage of this module as follows: -+# -+# find_package(Snappy) -+# -+# This module defines -+# ZSTD_INCLUDE_DIR, directory containing headers -+# ZSTD_LIBS, directory containing ZSTD libraries -+# ZSTD_STATIC_LIB, path to zstd.a -+# ZSTD_SHARED_LIB, path to ZSTD's shared library -+# ZSTD_FOUND, whether ZSTD has been found -+ -+find_path(ZSTD_INCLUDE_DIR ZSTD.h -+ PATH_SUFFIXES "include") -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(ZSTD_LIB_SUFFIX "d") -+else() -+ set(ZSTD_LIB_SUFFIX "") -+endif() -+ -+find_library( ZSTD_LIBRARIES NAMES zstd${ZSTD_LIB_SUFFIX} zstd_static${ZSTD_LIB_SUFFIX} -+ PATH_SUFFIXES "lib") -+ -+if (ZSTD_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZSTD_LIBRARIES)) -+ set(ZSTD_FOUND TRUE) -+ get_filename_component( ZSTD_LIBS ${ZSTD_LIBRARIES} PATH ) -+ set(ZSTD_HEADER_NAME zstd.h) -+ set(ZSTD_HEADER ${ZSTD_INCLUDE_DIR}/${ZSTD_HEADER_NAME}) -+ set(ZSTD_STATIC_LIB ${ZSTD_LIBRARIES}) -+ set(ZSTD_SHARED_LIB ${ZSTD_LIBRARIES}) -+else () -+ set(ZSTD_FOUND FALSE) -+endif () -+ -+if (ZSTD_FOUND) -+ message(STATUS "Found the ZSTD library: ${ZSTD_LIBRARIES}") -+else () -+ message(FATAL_ERROR "Could not find the ZSTD library.") -+endif () -+ -+mark_as_advanced( -+ ZSTD_INCLUDE_DIR -+ ZSTD_LIBS -+ ZSTD_LIBRARIES -+ ZSTD_STATIC_LIB -+ ZSTD_SHARED_LIB -+) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 690fd0b..d74bb3d 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -276,54 +276,11 @@ endif() - if(PARQUET_BUILD_TESTS AND NOT IGNORE_OPTIONAL_PACKAGES) - add_custom_target(unittest ctest -L unittest) - -- if("$ENV{GTEST_HOME}" STREQUAL "") -- if(APPLE) -- set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes") -- else() -- set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS}") -- endif() -- -- set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep") -- set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include") -- set(GTEST_STATIC_LIB -- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}") -- set(GTEST_MAIN_STATIC_LIB -- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}") -- -- set(GTEST_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -- -DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX} -- -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}) -- -- if (MSVC AND NOT PARQUET_USE_STATIC_CRT) -- set(GTEST_CMAKE_ARGS ${GTEST_CMAKE_ARGS} -Dgtest_force_shared_crt=ON) -- endif() -- -- ExternalProject_Add(googletest_ep -- URL "https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz" -- BUILD_BYPRODUCTS "${GTEST_STATIC_LIB}" "${GTEST_MAIN_STATIC_LIB}" -- CMAKE_ARGS ${GTEST_CMAKE_ARGS} -- ${EP_LOG_OPTIONS}) -- set(GTEST_VENDORED 1) -- else() -- find_package(GTest REQUIRED) -- set(GTEST_VENDORED 0) -- endif() -+ find_package(GTest REQUIRED) -+ include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) - - message(STATUS "GTest include dir: ${GTEST_INCLUDE_DIR}") - message(STATUS "GTest static library: ${GTEST_STATIC_LIB}") -- include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) -- -- add_library(gtest STATIC IMPORTED) -- set_target_properties(gtest PROPERTIES IMPORTED_LOCATION ${GTEST_STATIC_LIB}) -- -- add_library(gtest_main STATIC IMPORTED) -- set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION -- ${GTEST_MAIN_STATIC_LIB}) -- -- if(GTEST_VENDORED) -- add_dependencies(gtest googletest_ep) -- add_dependencies(gtest_main googletest_ep) -- endif() - endif() - - ## Google Benchmark diff --git a/ports/parquet/portfile.cmake b/ports/parquet/portfile.cmake index 5a67bf346..593c1e136 100644 --- a/ports/parquet/portfile.cmake +++ b/ports/parquet/portfile.cmake @@ -1,51 +1,2 @@ -include(vcpkg_common_functions) - -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "Apache Parquet only supports x64") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO apache/parquet-cpp - REF apache-parquet-cpp-1.4.0 - SHA512 a6c12e39dcae123ae1893f7fc32bae32e32a1943182b1c0c1c2726134ee4fa6470d73a6ff8e3ce312eeb250d7fa35c9b9f3c227a35ba0aa6f873ce3954217bed - HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/all.patch" -) - -SET(ENV{GTEST_HOME} ${CURRENT_INSTALLED_DIR}) - -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" PARQUET_BUILD_SHARED) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" PARQUET_BUILD_STATIC) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DTHRIFT_HOME=${CURRENT_INSTALLED_DIR} - -DARROW_HOME=${CURRENT_INSTALLED_DIR} - -DPARQUET_BUILD_STATIC=${PARQUET_BUILD_STATIC} - -DPARQUET_BUILD_SHARED=${PARQUET_BUILD_SHARED} - -DPARQUET_ARROW_LINKAGE=${VCPKG_LIBRARY_LINKAGE} - -DPARQUET_BUILD_TOOLCHAIN=${CURRENT_INSTALLED_DIR} - -DPARQUET_BOOST_USE_SHARED=${PARQUET_BUILD_SHARED} -) - -vcpkg_install_cmake() - -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME copyright) - -# Put CMake files in the right place -file(INSTALL ${CURRENT_PACKAGES_DIR}/cmake/parquet-cppConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet) -file(INSTALL ${CURRENT_PACKAGES_DIR}/cmake/parquet-cppConfigVersion.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME parquet-cppConfigVersion-release.cmake) -file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/cmake/parquet-cppConfigVersion.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME parquet-cppConfigVersion-debug.cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# The parquet library has been merged into arrow +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -- cgit v1.2.3 From 672ea9a1b3222673342b37ea26dacad0a1c38288 Mon Sep 17 00:00:00 2001 From: Eric Rosenquist Date: Wed, 16 Jan 2019 13:52:33 -0500 Subject: [minizip] Enable decrypt support for password-encrypted ZIP files. (#5010) * Enable support for password-encrypted ZIP files. * [minizip] combine patch with in vcpkg_from_github --- ports/minizip/minizip.patch | 16 ++++++++++++++++ ports/minizip/portfile.cmake | 1 + 2 files changed, 17 insertions(+) create mode 100644 ports/minizip/minizip.patch diff --git a/ports/minizip/minizip.patch b/ports/minizip/minizip.patch new file mode 100644 index 000000000..04ef8fa2f --- /dev/null +++ b/ports/minizip/minizip.patch @@ -0,0 +1,16 @@ +diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c +index f12e3329..bfc05f77 100644 +--- a/contrib/minizip/unzip.c ++++ b/contrib/minizip/unzip.c +@@ -68,10 +68,6 @@ + #include + #include + +-#ifndef NOUNCRYPT +- #define NOUNCRYPT +-#endif +- + #include "zlib.h" + #include "unzip.h" + + diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index f12e3329b..927951d70 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( REF v1.2.11 SHA512 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf HEAD_REF master + PATCHES minizip.patch # enable decrypt support for password-encrypted ZIP files ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -- cgit v1.2.3 From 9c308ef387945b1d78400819173c2b0316f91eb5 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 16 Jan 2019 12:25:16 -0800 Subject: [tinyexif] Update CONTROL file --- ports/tinyexif/CONTROL | 2 +- ports/tinyexif/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index 259421043..e253d1481 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.2 +Version: 1.0.2-1 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 474250d9b..8464f2ec0 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF REF 1.0.2 - SHA512 95a88c45c9f4812266cc6b7cf57e93be1229513274b446f5da6b9c4d5dc07c07985bf6ad6ffc31de673e88ef6e428cb29b1b58ad78dee17cb36fc2b859a55f98 + SHA512 956880ccd0ccdee80f438ee899c7a88e02cc3dd6f09b62cbc71b9597501f1c8e06a74cf837d3f231dbd0416c062cd05a9854f46a55671c06c01bbc9437442159 HEAD_REF master ) -- cgit v1.2.3 From 5e38f4955aa4ea699bd9723398e9f9b3aebea503 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 16 Jan 2019 13:10:39 -0800 Subject: [tinyexif] Fix hash --- ports/tinyexif/CONTROL | 2 +- ports/tinyexif/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index e253d1481..11270c896 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.2-1 +Version: 1.0.2-2 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 8464f2ec0..474250d9b 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF REF 1.0.2 - SHA512 956880ccd0ccdee80f438ee899c7a88e02cc3dd6f09b62cbc71b9597501f1c8e06a74cf837d3f231dbd0416c062cd05a9854f46a55671c06c01bbc9437442159 + SHA512 95a88c45c9f4812266cc6b7cf57e93be1229513274b446f5da6b9c4d5dc07c07985bf6ad6ffc31de673e88ef6e428cb29b1b58ad78dee17cb36fc2b859a55f98 HEAD_REF master ) -- cgit v1.2.3 From 13ec61a842588480f49d3c3a6a3b42d70df4fa84 Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Wed, 16 Jan 2019 23:54:59 +0100 Subject: [qt5] update to QT5.12 (#4991) * update qt5-base to 5.12 * update modules to 5.12 (qt5-declarative and dependents don't work yet) * fix qt5-declarative for 5.12 and some hashes. * add qt5-declarative as dependency for qt5-graphicaleffects --- ports/qt5-3d/CONTROL | 2 +- ports/qt5-3d/portfile.cmake | 2 +- ports/qt5-activeqt/CONTROL | 2 +- ports/qt5-activeqt/portfile.cmake | 2 +- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/fix-system-freetype.patch | 11 ++++++++--- ports/qt5-base/portfile.cmake | 6 +++--- ports/qt5-charts/CONTROL | 2 +- ports/qt5-charts/portfile.cmake | 2 +- ports/qt5-datavis3d/CONTROL | 2 +- ports/qt5-datavis3d/portfile.cmake | 2 +- ports/qt5-declarative/CONTROL | 2 +- ports/qt5-declarative/portfile.cmake | 4 ++-- ports/qt5-gamepad/CONTROL | 2 +- ports/qt5-gamepad/portfile.cmake | 2 +- ports/qt5-graphicaleffects/CONTROL | 4 ++-- ports/qt5-graphicaleffects/portfile.cmake | 2 +- ports/qt5-imageformats/CONTROL | 2 +- ports/qt5-imageformats/portfile.cmake | 2 +- ports/qt5-modularscripts/CONTROL | 2 +- ports/qt5-modularscripts/qt_modular_library.cmake | 8 ++++---- ports/qt5-multimedia/CONTROL | 2 +- ports/qt5-multimedia/portfile.cmake | 2 +- ports/qt5-networkauth/CONTROL | 2 +- ports/qt5-networkauth/portfile.cmake | 2 +- ports/qt5-quickcontrols/CONTROL | 2 +- ports/qt5-quickcontrols/portfile.cmake | 2 +- ports/qt5-quickcontrols2/CONTROL | 2 +- ports/qt5-quickcontrols2/portfile.cmake | 2 +- ports/qt5-script/CONTROL | 2 +- ports/qt5-script/portfile.cmake | 2 +- ports/qt5-scxml/CONTROL | 2 +- ports/qt5-scxml/portfile.cmake | 2 +- ports/qt5-serialport/CONTROL | 2 +- ports/qt5-serialport/portfile.cmake | 2 +- ports/qt5-speech/CONTROL | 2 +- ports/qt5-speech/portfile.cmake | 2 +- ports/qt5-svg/CONTROL | 2 +- ports/qt5-svg/portfile.cmake | 2 +- ports/qt5-tools/CONTROL | 2 +- ports/qt5-tools/portfile.cmake | 4 ++-- ports/qt5-virtualkeyboard/CONTROL | 2 +- ports/qt5-virtualkeyboard/portfile.cmake | 2 +- ports/qt5-websockets/CONTROL | 2 +- ports/qt5-websockets/portfile.cmake | 2 +- ports/qt5-winextras/CONTROL | 2 +- ports/qt5-winextras/portfile.cmake | 2 +- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5-xmlpatterns/portfile.cmake | 2 +- ports/qt5/CONTROL | 4 ++-- scripts/cmake/vcpkg_build_qmake.cmake | 4 ++-- 51 files changed, 68 insertions(+), 63 deletions(-) diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index bcf523665..2013fc194 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index e98d4da83..ef9c6a44e 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qt3d 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe) +qt_modular_library(qt3d 4df1c07d5fce5771779bf8c43f41f97c8135702f606e7d0766bb17f8819057038b0b83366469ffbcef39e36a527a771d6905ae000f37ce67e6cad3a769e28eba) diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index 2df390330..491702603 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-activeqt -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake index 6f2e479a9..9af6e19c9 100644 --- a/ports/qt5-activeqt/portfile.cmake +++ b/ports/qt5-activeqt/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtactiveqt 50027f3429a4e9f140e259f228ea46420284a9632bba3ed92b9b44fbc1c168b6b2d039986d6a07e17ae1afff4f0aec3ccfe8a660322449a3258ab251c1910135) +qt_modular_library(qtactiveqt 439ba83a10763b29419d34bac42d11c59964e9d279cbee0faa51198cfbc91ef0fe60b4b96ea516dcdcc9bc6696599d266b406a0d5e9a6e182ca61df67349a11c) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 820137710..fdf74b20c 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.11.2-1 +Version: 5.12.0 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/fix-system-freetype.patch b/ports/qt5-base/fix-system-freetype.patch index 88211bc68..d83fc9891 100644 --- a/ports/qt5-base/fix-system-freetype.patch +++ b/ports/qt5-base/fix-system-freetype.patch @@ -1,12 +1,17 @@ +--- + src/gui/configure.json | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + diff --git a/src/gui/configure.json b/src/gui/configure.json -index 28c8034..4c7c0a7 100644 +index 0332631e..bd64b7b1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -157,7 +157,7 @@ +@@ -164,8 +164,7 @@ }, "sources": [ { "type": "pkgConfig", "args": "freetype2" }, -- { "type": "freetype", "libs": "-lfreetype" } +- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, +- { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-lfreetype" } ] }, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 696ae0cb6..79b7f763d 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -11,14 +11,14 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) include(configure_qt) include(install_qt) -set(MAJOR_MINOR 5.11) -set(FULL_VERSION ${MAJOR_MINOR}.2) +set(MAJOR_MINOR 5.12) +set(FULL_VERSION ${MAJOR_MINOR}.0) set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" FILENAME ${ARCHIVE_NAME} - SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 + SHA512 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index 4a73bcdc4..a682fb982 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake index fdf59fe17..6ce32435e 100644 --- a/ports/qt5-charts/portfile.cmake +++ b/ports/qt5-charts/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtcharts 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d) +qt_modular_library(qtcharts f8767dc019cf0b9a983e4fd61ac983184d7f4d3ad3cb748fc26a877892d537808eafc3f18815ba06761818e0fe5a74f0a048772fdac9ce86d7290a078f5e21aa) diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index 34842f14d..54d6eb7f6 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake index a74f82cd7..0b5430177 100644 --- a/ports/qt5-datavis3d/portfile.cmake +++ b/ports/qt5-datavis3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdatavis3d ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8) +qt_modular_library(qtdatavis3d 6b88551e5ada11333a2202598d2c3732dccafafbf0dd7f245dee103137ca0bd3b547b47d3e6dd6929610764f520baa75cd92bf986493fcd57c7ce61e7d419204) diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 9de065478..e16026069 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 7949ba8f8..8999aebb6 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdeclarative 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee) +qt_modular_library(qtdeclarative 858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd) -#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts) \ No newline at end of file +#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts) diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index 68927e58c..bf323df72 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake index 9e97d17ea..fe7f260c1 100644 --- a/ports/qt5-gamepad/portfile.cmake +++ b/ports/qt5-gamepad/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgamepad 65200780a7a27ca6fd6bd624b38c6568eacc2209816b3214ac2b63b5e510613cd492f846b5f67922aa5605eab1064e3e6ff060b610519e0546a0005736f55274) +qt_modular_library(qtgamepad bf412012b270b1fc594a8f139e5343f45d8b989cbc2d5eb02eb1c06817dd7ffd36706b14e3fa7691e4b4554b56c05e42899d28e278b1f1e0ca278842f46b8cfa) diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index f8c7d27cd..73f051121 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 GraphicalEffects Module. -Build-Depends: qt5-modularscripts, qt5-base +Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake index 3b765d796..6c3ff45e3 100644 --- a/ports/qt5-graphicaleffects/portfile.cmake +++ b/ports/qt5-graphicaleffects/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgraphicaleffects a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f) +qt_modular_library(qtgraphicaleffects 88545f9f11d5f97aa70b293539aa10b4e87bbf1f585ba57cbf337c0300b2cdad52ab9d25867a663714ae345c21006d10f567fdbb839df235a9faf7f7674a5835) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index f8cb675b9..9681cf060 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index b87bebaee..7a3e37749 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtimageformats 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1) +qt_modular_library(qtimageformats c83cfdb7e2c73c796d57e14c26bcf2b7d7d1b72413d0d0d632747f42748368d3538e2b1b2b896fe9ca2f58dda285b3452db42738911f26bad5413adea36a3f45) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index 09e07dd08..f738101d7 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 2018-11-01-1 +Version: 2018-12-17 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 4066a6b51..34efa6eb9 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -8,8 +8,8 @@ function(qt_modular_library NAME HASH) ) endif() - set(MAJOR_MINOR 5.11) - set(FULL_VERSION ${MAJOR_MINOR}.2) + set(MAJOR_MINOR 5.12) + set(FULL_VERSION ${MAJOR_MINOR}.0) set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE @@ -40,7 +40,7 @@ function(qt_modular_library NAME HASH) string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) - + #Configure debug+release vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}) @@ -135,4 +135,4 @@ function(qt_modular_library NAME HASH) endif() file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endfunction() \ No newline at end of file +endfunction() diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index 7c910ee27..c2dacdb53 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index f03f71183..735b53eea 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtmultimedia f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f) +qt_modular_library(qtmultimedia b16e657c73e57a8e5588697fda0e902834df10edd52704edcb7deb74fc45054ff9840344309ba720998d8afa6a5f315ce2bd46393ff8db6492694cfce0543692) diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index bf8b15e0c..82809ca9c 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Network Authorization Module Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake index 2a27d21e9..e144088d6 100644 --- a/ports/qt5-networkauth/portfile.cmake +++ b/ports/qt5-networkauth/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtnetworkauth f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d) +qt_modular_library(qtnetworkauth ae00e338ff4b9b3233c821a28d59e601489554ce882e8a1dc22c0d7903fadbee182e1f9a43c3667b707581d196f5615042b230823e48c71a4f2b5d793183f1de) diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index fc4fb902b..e76b8f15b 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 QuickControls Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake index 6b8983cf7..8a93e8947 100644 --- a/ports/qt5-quickcontrols/portfile.cmake +++ b/ports/qt5-quickcontrols/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25) +qt_modular_library(qtquickcontrols a2052398c281e81f8a61afe49f262d4feeb4da2593dbec0cc9971e7de6b169b17c1cf2ee7c213b3d5939cc322d4d715a1ce318b031fd4b8a783fac7bae3e37f9) diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index f13d9df72..f85acbb14 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake index 7f96cf5a3..5b9dfed4b 100644 --- a/ports/qt5-quickcontrols2/portfile.cmake +++ b/ports/qt5-quickcontrols2/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols2 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6) +qt_modular_library(qtquickcontrols2 e954832787fcb36cc3bab529b5ddf88ffa96d90924b9193a99e524831aff24026c9b278b4f3bb41afb2cc52a89888621637863ad0cda928901d9eb81e49017a5) diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 2b49490c9..02a9b88fb 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,3 +1,3 @@ Source: qt5-script -Version: 5.11.2 +Version: 5.12.0 Description:Qt5 Script Module. diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake index 9999ad6cf..e6465127d 100755 --- a/ports/qt5-script/portfile.cmake +++ b/ports/qt5-script/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscript b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00) +qt_modular_library(qtscript f8870208fb0eb35551294739eabe9736a458e79fef1160b836031411b8055df7284339d301f2983c94b3bafeb15919fc575e12541c471655c0db9c0c5d85a087) diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index a00542c74..c3163b420 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake index 7680b6eb0..eb912f98b 100644 --- a/ports/qt5-scxml/portfile.cmake +++ b/ports/qt5-scxml/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscxml 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab) +qt_modular_library(qtscxml 4a50e6586a452bf0a0e9b40e969d00082c1bc88b50128d8ff211be4f03705e5a5aa3dcee062e9a635f6f520c6b1cbf52b4a68742d0b41409e1d9f650e76dbf49) diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index af03e1254..19c7687b5 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake index daf037cdb..515535458 100644 --- a/ports/qt5-serialport/portfile.cmake +++ b/ports/qt5-serialport/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtserialport babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d) +qt_modular_library(qtserialport b8004e844cab66a50f5c899af74f22e62dbac23493210d579344d4a9337990da9781c3647662e7f31b132b4c60d7e3de640a9a636ae7c63de253858324e11428) diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index 1f4c2420c..f3c6068d4 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Speech Module Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows) diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake index b1d36265b..2cbd8064a 100644 --- a/ports/qt5-speech/portfile.cmake +++ b/ports/qt5-speech/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtspeech b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02) +qt_modular_library(qtspeech cbc34d2d51ef2cf333dccd0a142198a477187786e743f6322370a197b4bbcba11ef7ce92aa9ea0917cc092f51609e71764ee3e5d356dadd54eaae5783c756887) diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index d88bb1742..320a03df8 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index 0de3de3fd..b528c806f 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtsvg d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57) +qt_modular_library(qtsvg 571e457dce3b62de5f316ab69fa0a9a9fd6a3ace8b05ae525ad5c82e6784b60f3c06f1ce94c3639c861639740b29d996fda6907ce77b60aeae916788313e0a65) diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 81df69267..86d880315 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 8c7d0c047..1502646d9 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qttools a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5) +qt_modular_library(qttools 90ce900dc64856e994b05dba8a1f2735357d7cc489b0565beb2553c6007e0a53cedf363cbec96d9af325182f5a164eafe10d2d4d180ee72f544bf0fa9dbc671d) -#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts) \ No newline at end of file +#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts) diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index ebdb27623..2b2e7d291 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake index 210997bfc..4b30772a8 100644 --- a/ports/qt5-virtualkeyboard/portfile.cmake +++ b/ports/qt5-virtualkeyboard/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtvirtualkeyboard 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912) +qt_modular_library(qtvirtualkeyboard 984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index e10c241d0..5feba2a6b 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake index 67ea215f3..7b949223e 100644 --- a/ports/qt5-websockets/portfile.cmake +++ b/ports/qt5-websockets/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwebsockets 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3) +qt_modular_library(qtwebsockets 2c176fce2ad92d7c6c23047ea35a7e868d222abaea077f3d1d9e84ff5fccbaa198d1d0583f5686fdc99c71bea9c4a733cf0b718c65262e761e5f07a93452d186) diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index 5b9377077..00350de99 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-winextras -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-modularscripts, qt5-base, atlmfc diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake index adc3bdbe1..18e3e40be 100644 --- a/ports/qt5-winextras/portfile.cmake +++ b/ports/qt5-winextras/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwinextras ac9ca4d188f7dadbdd124321cba39fb159f9225c23ab955c06ff3939080065a5e8f176f34504c59ae5fee602328550487187ed0648e7896dcd6bed698a6b45d8) +qt_modular_library(qtwinextras 37279e56c8317c2303d077d46ccb3780822e0853f9a2b92d3c9566077a977c2322ee46e9eca5f0f417624fe8ea4da03480fb905895dfb6b149a1c98b1caa3707) diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 21e0069ab..7cc2504d6 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index 6484f4610..64832816c 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtxmlpatterns f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f) +qt_modular_library(qtxmlpatterns 9e9fe5d99957a0079eada985d8b9837cee27c0025851d00024951bb12cf23d0fb2483cbf3a39cb4c5a23b9d453e42d667b0434e73d87447d9b4e84a9dca37ece) diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 9f3ea3778..d4093b323 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Application Framework -Build-Depends: qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-3d, qt5-winextras, qt5-xmlpatterns \ No newline at end of file +Build-Depends: qt5-3d, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-winextras, qt5-xmlpatterns diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 189a1113b..947178686 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -51,7 +51,7 @@ function(vcpkg_build_qmake) file(READ "${DEBUG_MAKEFILE}" _contents) string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}") string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}") - string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}") + string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}") string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}") string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}") string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}") @@ -72,7 +72,7 @@ function(vcpkg_build_qmake) foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES}) file(READ "${RELEASE_MAKEFILE}" _contents) - string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}") + string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}") string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}") string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}") string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}") -- cgit v1.2.3 From 92a8da2224ada02689139a2bc910f212f48b5d57 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 16 Jan 2019 15:44:51 -0800 Subject: [tinyexif] Use SHA as download source code ref --- ports/tinyexif/CONTROL | 2 +- ports/tinyexif/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index 11270c896..8302333d5 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.2-2 +Version: 1.0.2-4 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 474250d9b..5a10d422f 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF - REF 1.0.2 - SHA512 95a88c45c9f4812266cc6b7cf57e93be1229513274b446f5da6b9c4d5dc07c07985bf6ad6ffc31de673e88ef6e428cb29b1b58ad78dee17cb36fc2b859a55f98 + REF c57a5fec1a847ec0e7b482b2da72e1f04fc2e147 + SHA512 a968e79b4b7a6f5f189328a8dc493da5c0d568526b5dca46b9bfc0cf85295fb348bd0b38828fedbb7b6e4467fc8932d0d7b435b4acbfe662e954cbed1d0ea914 HEAD_REF master ) -- cgit v1.2.3 From e8489a46c11775036f82e9f6ecc25d61feecee66 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 17 Jan 2019 00:50:46 +0100 Subject: [msmpi] update to 10.0 (#5107) * [msmpi] update to 10.0 * [parmetis] fix build error --- ports/msmpi/CONTROL | 2 +- ports/msmpi/portfile.cmake | 26 ++++++++++++++------------ ports/parmetis/portfile.cmake | 17 +++++++++-------- ports/parmetis/use_stdint.patch | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 ports/parmetis/use_stdint.patch diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index 27e27074a..7a4b2d62e 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,3 @@ Source: msmpi -Version: 9.0 +Version: 10.0 Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 7933f2361..70c2ff5d9 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -1,17 +1,19 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-8.1) + +set(MSMPI_VERSION "10.0.12498") +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) vcpkg_download_distfile(SDK_ARCHIVE - URLS "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisdk.msi" - FILENAME "msmpisdk-9.0.msi" - SHA512 f80cc7619c42a5a0975224c5a0ab6d4085a97ab9a1480318cd72db2f600db52fb81d3959a2a9e0dbd9412b02d0814b8191dd4745bbde397110210e05960628b4 + URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisdk.msi" + FILENAME "msmpisdk-${MSMPI_VERSION}.msi" + SHA512 36a31b2516f45fbc26167b31d2d6419f1928aef1591033f0430d36570159205e1a3134557a4ac0462f2d879add1fc6fee87a6997032e4438b528cd42a8bbe6b1 ) macro(download_msmpi_redistributable_package) vcpkg_download_distfile(REDIST_ARCHIVE - URLS "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisetup.exe" - FILENAME "msmpisetup-9.0.exe" - SHA512 ad1cc3bc74e4c9c3c0f304395df9468e729e0acd9c77c8c6c806e88eadf4693811d29e608ffb459fcb6f4a20f61946ef4ac2e411aac49fb8f8d5aaddd10d4554 + URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe" + FILENAME "msmpisetup-${MSMPI_VERSION}.exe" + SHA512 c272dc842eb1e693f25eb580e1caf0c1fdb385611a12c20cdc6a40cf592ccbdba434a1c16edb63eef14b1a2ac6e678ac1cd561ec5fd003a5d17191a0fad281ae ) endmacro() @@ -20,7 +22,6 @@ endmacro() # We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS) set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_PLATFORM_BITNESS}/Microsoft MPI/Bin/mpiexec.exe") -set(MSMPI_EXPECTED_FULL_VERSION "9.0.12497") if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") @@ -32,12 +33,12 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") file(READ ${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log MPIEXEC_OUTPUT) if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]") - if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_EXPECTED_FULL_VERSION) + if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION) download_msmpi_redistributable_package() message(FATAL_ERROR " The version of the installed MSMPI redistributable packages does not match the version to be installed\n" - " Expected version: ${MSMPI_EXPECTED_FULL_VERSION}\n" + " Expected version: ${MSMPI_VERSION}\n" " Found version: ${CMAKE_MATCH_1}\n" " Please upgrade the installed version on your system.\n" " The appropriate installer for the expected version has been downloaded to:\n" @@ -131,5 +132,6 @@ if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") endif() # Handle copyright -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/license_sdk.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying license_sdk.rtf") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index c6022ad47..ba34e47e8 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -7,21 +7,22 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/parmetis-4.0.3) + vcpkg_download_distfile(ARCHIVE URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz" FILENAME "parmetis-4.0.3.tar.gz" SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-metis-vs14-math.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-gklib-vs14-math.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-root-cmakelist.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-libparmetis-cmakelist.patch + fix-metis-vs14-math.patch + fix-gklib-vs14-math.patch + fix-root-cmakelist.patch + fix-libparmetis-cmakelist.patch + use_stdint.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/parmetis/use_stdint.patch b/ports/parmetis/use_stdint.patch new file mode 100644 index 000000000..5b239e60c --- /dev/null +++ b/ports/parmetis/use_stdint.patch @@ -0,0 +1,22 @@ +diff --git a/metis/GKlib/ms_stdint.h b/metis/GKlib/ms_stdint.h +index 7e200dc..0d07a7a 100644 +--- a/metis/GKlib/ms_stdint.h ++++ b/metis/GKlib/ms_stdint.h +@@ -42,6 +42,10 @@ + + #include + ++#if(_MSC_VER >= 1900) ++ #include ++#else ++ + // For Visual Studio 6 in C++ mode wrap include with 'extern "C++" {}' + // or compiler give many errors like this: + // error C2733: second C linkage of overloaded function 'wmemchr' not allowed +@@ -218,5 +222,6 @@ typedef uint64_t uintmax_t; + + #endif // __STDC_CONSTANT_MACROS ] + ++#endif + + #endif // _MSC_STDINT_H_ ] -- cgit v1.2.3 From 919e5788a9545d58f3654a3f5b0b42b66812c57c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20de=20Jes=C3=BAs=20Medina=20R=C3=ADos?= Date: Wed, 16 Jan 2019 22:23:59 -0800 Subject: [x265] enable linux compilation --- ports/x265/portfile.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 090a2db22..7f431a923 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -29,7 +29,12 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x265) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "LINUX") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265 ${CURRENT_PACKAGES_DIR}/tools/x265/x265) +else() + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -- cgit v1.2.3 From 2d0e674a445d4e51d987e2e3a01b2063b9d74a3b Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 17 Jan 2019 22:37:40 +0300 Subject: [sobjectizer] updated to 5.5.24.1 (#5176) * sobjectizer-v5.5.24 and so5extra-v1.2.2 * sobjectizer updated to v.5.5.24.1 --- ports/sobjectizer/CONTROL | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index 33dee9141..a0e398e31 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.24 +Version: 5.5.24.1 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 c79f5adfa..bf8174bf5 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.24) +set(VERSION 5.5.24.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 d33b5660fb6d7b1182d68069bb86782dd7632071723762875d88dd6d67353f6913b25e0574d87e06b86f472608631f59c3e26dc9c67cda9f8223454ae758b524 + SHA512 a7b8b57626e99588f79e14594dea1cdfe7fea455f01fe4fde9c397b3086c0a9f0c3cb75b531cc8c40a3f38729729ec6764d450ed7fc626ae79e2f2de7cd2a98e ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 3b258a7171821f1647e6e5bd17268b904beb6d12 Mon Sep 17 00:00:00 2001 From: Farwaykorse Date: Thu, 17 Jan 2019 20:42:11 +0100 Subject: ms-gsl update to support clang-cl (#5162) --- ports/ms-gsl/CONTROL | 4 ++-- ports/ms-gsl/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index c782ee097..b17888fd3 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-12-14 -Description: Microsoft implementation of the Guidelines Support Library \ No newline at end of file +Version: 2019-01-15 +Description: Microsoft implementation of the Guidelines Support Library diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index 1b0711977..a1359d206 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF 0f68d133fa6fd2973951b8aaab481e34bbfd2cf4 - SHA512 1aa8116a75dd6ffd3a879dcf52f804e1d67e03bac3788559441ddebe2db6fd43a362bfa5ddac36954848555ba1e7fccb2d26b6060a9e171a04497ea551402b42 + REF 6418b5f4de2204cd5a335b00d2f8754301b8b382 + SHA512 d585ce18ff190e681f55c53978bd8d84dd0f8ebf0f572a49a38be07c44bd97b6d99c46b9f5fff2455dbd934e242be4a2d6d3ca2ba193358cafa14272d7a6fba8 HEAD_REF master ) -- cgit v1.2.3 From 7d2f73d36bf29ffa8d57525feda1dec55c86a66f Mon Sep 17 00:00:00 2001 From: ewertons Date: Thu, 17 Jan 2019 13:37:44 -0800 Subject: Add public-preview version of azure-iot-sdk-c (#5155) * Add public-preview feature to azure-iot-sdk-c suite of packages * [azure-c-shared-utility][azure-iot-sdk-c] Remove unneeded repeat dependencies in feature --- ports/azure-c-shared-utility/CONTROL | 3 +++ ports/azure-c-shared-utility/portfile.cmake | 27 +++++++++++++++++++-------- ports/azure-iot-sdk-c/CONTROL | 4 ++++ ports/azure-iot-sdk-c/portfile.cmake | 27 +++++++++++++++++++-------- ports/azure-uamqp-c/CONTROL | 4 ++++ ports/azure-uamqp-c/portfile.cmake | 24 +++++++++++++++++------- ports/azure-uhttp-c/CONTROL | 4 ++++ ports/azure-uhttp-c/portfile.cmake | 24 +++++++++++++++++------- ports/azure-umqtt-c/CONTROL | 4 ++++ ports/azure-umqtt-c/portfile.cmake | 24 +++++++++++++++++------- 10 files changed, 108 insertions(+), 37 deletions(-) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 51efe3f6f..2ca540258 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -2,3 +2,6 @@ Source: azure-c-shared-utility Version: 1.1.11-3 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) + +Feature: public-preview +Description: Azure C SDKs common code (public preview) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index cc4514dfe..408c996db 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -2,14 +2,25 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-c-shared-utility - REF 1d622902d7842f94193fc394987f2b4e978bb700 - SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 - HEAD_REF master - PATCHES no-double-expand-cmake.patch -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF e885482ce32f1f77d29e85f7b8d35d74ffc69c74 + SHA512 329101cb2ff499aa16e1df736285e2fdd8c34549d4790eaafa1df763950c2b4a5927f52e93dbf22192b240fe0445050ad99133df0405227ffe9857ff2b25014d + HEAD_REF public-preview + PATCHES no-double-expand-cmake.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF 1d622902d7842f94193fc394987f2b4e978bb700 + SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 + HEAD_REF master + PATCHES no-double-expand-cmake.patch + ) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 0164d44a0..139e72eb1 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-iot-sdk-c Version: 1.2.12-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services + +Feature: public-preview +Description: A version of the azure-iot-sdk-c containing public-preview features. +Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview] diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 2b1ef492c..6008b0e71 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -2,14 +2,25 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-iot-sdk-c - REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 - SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb - HEAD_REF master - PATCHES improve-external-deps.patch -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF 74b03316ec90f1602c20ebeab67a3b4a61065d8e + SHA512 78ab8d7cd6e25886e41f98500cb8cd9609ca677426a882ed0364a908e5267ec6191bb15fd65fb2c420a108df41f52a8ba6d5e6d626874bbfae4f56e8af5ca428 + HEAD_REF public-preview + PATCHES improve-external-deps.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 + SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb + HEAD_REF master + PATCHES improve-external-deps.patch + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 062c02bef..a903752ac 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-uamqp-c Version: 1.2.11-2 Build-Depends: azure-c-shared-utility Description: AMQP library for C + +Feature: public-preview +Description: AMQP library for C (public preview) +Build-Depends: azure-c-shared-utility[public-preview] diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index b7ee41625..4f4d33ee9 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -2,13 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uamqp-c - REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 - SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 - HEAD_REF master -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF bd7b85d0830634e3157da2411a6d060bf28f266e + SHA512 cbc2aa2765242ebe1a5e194e126f419cbd26edda5c1f72ffe9219a6c38b80aa91ef823a4fd8f78ac5d7ae0d9d471b50e5b8c4684e77c71b31e7cf35802e0cc17 + HEAD_REF public-preview + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 + SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 + HEAD_REF master + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index e41543687..8a6857c3e 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-uhttp-c Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C + +Feature: public-preview +Description: Azure HTTP Library written in C (public preview) +Build-Depends: azure-c-shared-utility[public-preview] diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 64834510d..0ef272a12 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -2,13 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uhttp-c - REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed - SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 - HEAD_REF master -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF e459385a811ce075f42aa7202db96ba1d1f55ac1 + SHA512 b96382184893b49f30ad75d4c19eeb48f7a7823e9d48f2896ee4760be20f2f5b5ee3e78e39f10ae26363165360e5871c3ba82aa9edf3943b9f0ef9c0e3036ea6 + HEAD_REF public-preview + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed + SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 + HEAD_REF master + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 407844601..84359ff0c 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-umqtt-c Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol + +Feature: public-preview +Description: General purpose library for communication over the mqtt protocol (public preview) +Build-Depends: azure-c-shared-utility[public-preview] diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 6bfb77f89..d03c24527 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -2,13 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-umqtt-c - REF 3205eb26401e9c6639100934e8fb75b75275760d - SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c - HEAD_REF master -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 1b3a25f4f7f0edbe068e261e8a808d7bc394a358 + SHA512 00ff90eccfbb4febded7e819baa6303e97d3e7d6f6f8f1a28ebf353d7ad7ac5ec7f479e66456f395c7ece7fd6d612f3948ac656420bc0bc75566bdbb65fb88c3 + HEAD_REF public-preview + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 3205eb26401e9c6639100934e8fb75b75275760d + SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c + HEAD_REF master + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -- cgit v1.2.3 From c028db0b8d8a60b60963c5648d96af4ae02050d5 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Thu, 17 Jan 2019 13:40:57 -0800 Subject: [cppgraphqlgen] Update to 1.0.3 bugfix release (#5139) * Update to 1.0.2 bugfix release * Update REF to get missing commit * Update to v1.0.3 --- ports/cppgraphqlgen/CONTROL | 2 +- ports/cppgraphqlgen/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 5e51572cc..fcdc0fcaa 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen -Version: 1.0.0 +Version: 1.0.3 Build-Depends: pegtl, rapidjson Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 926a4ecd2..c6cad7d99 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cppgraphqlgen - REF v1.0.0 - SHA512 3756c31063dc86d1c37d3cb709221b2b6e7dda5f3405d7586e4f395fd4915b1088c0305b116164c615846413042857fd688e61ef36c5c2aab218cfab8f16370c + REF v1.0.3 + SHA512 136f17460d6a7ed3bd20e2be5f9326d2a4a039bc1a7a212155a31a5e165e0f1fd061638c3f77f22d6c3d4230e9a57563585ad29ef59eea355e1521b374ce1ce4 HEAD_REF master ) -- cgit v1.2.3 From 7d9224c83ec746e612b6eacdbe91e4bf0e7b6b77 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 17 Jan 2019 18:02:08 +0800 Subject: [spdlog] Fix #5143 and update to 1.3.1 --- ports/spdlog/CONTROL | 2 +- ports/spdlog/portfile.cmake | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 6214deb4d..801cd3697 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 1.3.0 +Version: 1.3.1 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index ccc961b18..530e8b084 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.3.0 - SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f + REF v1.3.1 + SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd HEAD_REF v1.x PATCHES disable-master-project-check.patch @@ -27,6 +27,17 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) # use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/fmt.h + "#if !defined(SPDLOG_FMT_EXTERNAL)" + "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" +) + +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/ostr.h + "#if !defined(SPDLOG_FMT_EXTERNAL)" + "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" +) + + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spdlog) file(RENAME ${CURRENT_PACKAGES_DIR}/share/spdlog/LICENSE ${CURRENT_PACKAGES_DIR}/share/spdlog/copyright) -- cgit v1.2.3 From c6db2c880a064b29e0b38eda29f19510235fb4c9 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 9 Jan 2019 12:31:28 -0800 Subject: Updates 2019.01.09 --- ports/abseil/CMakeLists.txt | 4 ++-- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 ++-- ports/chakracore/CONTROL | 2 +- ports/chakracore/portfile.cmake | 4 ++-- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 4 ++-- ports/eastl/CONTROL | 2 +- ports/eastl/portfile.cmake | 4 ++-- ports/exprtk/CONTROL | 2 +- ports/exprtk/portfile.cmake | 4 ++-- ports/fizz/CONTROL | 4 ++-- ports/fizz/depend-zlib.patch | 20 ++++++++++++++++++++ ports/fizz/portfile.cmake | 5 +++-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/libsodium/CONTROL | 2 +- ports/libsodium/portfile.cmake | 4 ++-- ports/libuv/CONTROL | 2 +- ports/libuv/portfile.cmake | 4 ++-- ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 ++-- ports/rs-core-lib/CONTROL | 2 +- ports/rs-core-lib/portfile.cmake | 4 ++-- ports/sqlite-orm/CONTROL | 2 +- ports/sqlite-orm/portfile.cmake | 4 ++-- ports/strtk/CONTROL | 2 +- ports/strtk/portfile.cmake | 4 ++-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 ++-- ports/unicorn-lib/CONTROL | 2 +- ports/unicorn-lib/portfile.cmake | 4 ++-- ports/unicorn/CONTROL | 2 +- ports/unicorn/portfile.cmake | 4 ++-- ports/wangle/CONTROL | 2 +- ports/wangle/portfile.cmake | 4 ++-- ports/zeromq/CONTROL | 2 +- ports/zeromq/portfile.cmake | 4 ++-- 40 files changed, 81 insertions(+), 60 deletions(-) create mode 100644 ports/fizz/depend-zlib.patch diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt index d98914e60..7235b95e2 100644 --- a/ports/abseil/CMakeLists.txt +++ b/ports/abseil/CMakeLists.txt @@ -60,7 +60,7 @@ endfunction() add_sublibrary(algorithm) add_sublibrary(base) -add_sublibrary(container) +add_sublibrary(container STATIC) add_sublibrary(debugging) add_sublibrary(hash) add_sublibrary(memory) @@ -74,7 +74,7 @@ add_sublibrary(types) add_sublibrary(utility) target_link_public_libraries(algorithm base meta) -target_link_public_libraries(container algorithm base memory) +target_link_public_libraries(container algorithm base memory time) target_link_public_libraries(debugging base) target_link_public_libraries(hash base) target_link_public_libraries(memory meta) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index e6a265d6b..c1cb755b4 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-12-14 +Version: 2019-01-09-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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 2e2488845..bd2e6a0d4 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 389ec3f906f018661a5308458d623d01f96d7b23 - SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911 + REF 018b4db1d73ec8238e6dc4b17fd9e1fd7468d0ed + SHA512 55cd4bc801a405c9197d4d9bdd906a3742f9f7ef04a70f6f8a41aa8d2f7f6b9c38501265a4a096a12840b2e48ac0bf93d348b6ba8dea05e0801ed4013941f5dd HEAD_REF master ) diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index aa90dad66..2afd57484 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,3 +1,3 @@ Source: celero -Version: 2.4.0-1 +Version: 2.4.0 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index 61dbec10e..f9288fb8e 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3 - SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7 + REF v2.4.0 + SHA512 4ba9f26bcda85bea00de27a6e8166f874f2c3852f74c54c089373caf71e1c066ac771fda73799d84c4c7a20986a71fd7a3b101b7b8972b9797ab3e8ed7918c30 HEAD_REF master ) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 7277d6832..932988fe8 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.11.4 +Version: 1.11.5 Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index aff3cb1ca..c9cb48ac5 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore - REF v1.11.4 - SHA512 903336fae63573991c539fd1652dd2a61c580845aca21253bce76efd884fb7d575c8bb1d91818112a6ba7c69cdcb1847175d9f09080cdc599c0afb3d36f474e2 + REF v1.11.5 + SHA512 502cf6a4370719c60648d1af370f9da54858df746fb851cb0d67588fef334757e89f8dbf7c097762b0b341d72fe6b511355fe84a2d37c22a114f58f4290d19ee HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 8a04a83bf..5bd3ed7d7 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.4.2 +Version: 2.4.4 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 3baed452d..752f36b9f 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.4.2 + REF v.2.4.4 HEAD_REF master - SHA512 dc27e7c0b06cd619c4270a91d830dbd3e0dfea851e04d7aab46fe9f2131e4b3717f73ac53bc4d70497ff2efe3bee1ae693e621d993cd63735d00368a362833f3) + SHA512 16106e6b225fa53f4d825a1c91a05fca27b7b9219126b4328aa74fc2bdead9f145445524f456d230cef18ea2e2fe39f9f725cdf78ed4556270af728be3aa80e8) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index cb7704c8a..5159f18fc 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl -Version: 3.12.07 +Version: 3.12.08 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. diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 4d61ff01f..b447f1d94 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 3.12.07 - SHA512 d7ae29661ef8dbf13f9b8d195c5088992f23d3ca4751249385e8068f034dd687e178b2aac0f228b354e9019f0ea69f377a7b20aacb5d2b23a98b8032437f9f25 + REF 3.12.08 + SHA512 8135831a16dcc662de04d8053560a40d2ca8e6b44c5b5b6ccabd7b30241ce299b90fc22ad001cefb8e2c81a6b59847157c6e488ce797ee96314a931df468f16a HEAD_REF master ) diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL index 2ba795fa7..995b9165a 100644 --- a/ports/exprtk/CONTROL +++ b/ports/exprtk/CONTROL @@ -1,3 +1,3 @@ Source: exprtk -Version: 2018-12-14 +Version: 2019-01-09 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake index dea82b4d5..56cc29941 100644 --- a/ports/exprtk/portfile.cmake +++ b/ports/exprtk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/exprtk - REF d89d2f5f46fbd33372c81e8ad4b997fa84569fae - SHA512 bad42b83a0f1d8142ceafac862ec62dafc040fa8293bfbca29e49afdc8dca1000fc43537a5cf28d1dae00f5e86516899bd37f996975fbbccdd6a8298d1adb359 + REF e0e880c3797ea363d24782ba63fe362f7d94f89c + SHA512 bd367a07b5dc266f5e335204b256572f682595532be396c7617c7c72f370a49702ee8c073a93614463a3742efe65df9f3f509d6c16efe31a63a1e7b08f9c0b1a ) file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL index 1267b81b9..9456fdb71 100644 --- a/ports/fizz/CONTROL +++ b/ports/fizz/CONTROL @@ -1,4 +1,4 @@ Source: fizz -Version: 2018.10.15.00 -Build-Depends: folly, openssl, libsodium +Version: 2019.01.14.00 +Build-Depends: folly, openssl, libsodium, zlib Description: a TLS 1.3 implementation by Facebook diff --git a/ports/fizz/depend-zlib.patch b/ports/fizz/depend-zlib.patch new file mode 100644 index 000000000..6e574b62e --- /dev/null +++ b/ports/fizz/depend-zlib.patch @@ -0,0 +1,20 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index ab3b48f..c84890e 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -35,6 +35,7 @@ endif() + + find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context) + find_package(OpenSSL REQUIRED) ++find_package(ZLIB REQUIRED) + find_package(Glog REQUIRED) + find_package(Gflags REQUIRED) + find_package(Libevent REQUIRED) +@@ -169,6 +170,7 @@ target_link_libraries(fizz + ${FOLLY_LIBRARIES} + ${Boost_LIBRARIES} + ${OPENSSL_LIBRARIES} ++ ${ZLIB_LIBRARIES} + # Don't use the sodium target here because it will break clients that + # consume fizz's exported targets (fizz-targets.cmake) since the sodium + # target is not exported. diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index f1c140afa..add950fe3 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF v2018.10.15.00 - SHA512 bf16050eebb8fa131927064a2467ee8cc20ba9a214cf232f38067afa9cb71414fa19ab1c65d7f2fb3e6dff651065aadeed02724fb4660fedb0c44da9073222c0 + REF v2019.01.14.00 + SHA512 9182e5e6eb795842fdc536adaae9aeae7ddd17a34776bda303015dbac95c95a1ceb42ea77c3b69c1018a9ea33bbd469fd23955ac7efcc2bfcc84e899c89b5981 HEAD_REF master + PATCHES depend-zlib.patch ) # Prefer installed config files diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 89862610c..eeffbb2a1 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.12.10.00 +Version: 2019.01.07.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index aab53792b..1303eca30 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.12.10.00 - SHA512 d571c08f764a7670b8313336d52c02190d001085385ce92073823887fe435945a821f623b8009e846435e3461bed2dbc58427bd3960a90469461d38386bb76b9 + REF v2019.01.07.00 + SHA512 9f5d39947818315b9a951ec261fef3a69f52a380a29f74555b16a11a276cda168effb4026fc38a2dde31117485074e3aa496a7abb8d317ca7f3c667a54d4851e HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL index b670f39ff..643ba68f4 100644 --- a/ports/libsodium/CONTROL +++ b/ports/libsodium/CONTROL @@ -1,3 +1,3 @@ Source: libsodium -Version: 1.0.16-1 +Version: 1.0.17 Description: A modern and easy-to-use crypto library diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 29e6d1f9d..42e9150bd 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libsodium - REF 1.0.16 - SHA512 a9b5c4484f08f3ec1703a6c3af0acfa233214d0d38f32c1fc26305fc01cd2d9c8d469d52d98e6329729c08c15ee0494494037d5ad1472864d3cbdb55a751afec + REF 1.0.17 + SHA512 faf6ab57d113b6b1614b51390823a646f059018327b6f493e9e918a908652d0932a75a1a6683032b7a3869f516f387d67acdf944568387feddff7b2f5b6e77d6 HEAD_REF master ) diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index 7a8a79098..1106a3285 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.24.0-1 +Version: 1.24.1 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 76077fc3d..6b15dba59 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.24.0 - SHA512 b75dac19e99497b059b9b8ce646266c4fa10f1259f5fd74554f7f614f7b70f4b62b9c756316d9a3eed6cf6b9d61f5acde9f6eedb88d30431f6a5c87169487ec6 + REF v1.24.1 + SHA512 19cb03a7a62ad2a1f392e1de3e4fdb622e3ac5afe890bfb819c30118f4745f81ecc343d5b633eebb8471fdfb4025652bbface245fd616c55346aae82376f6836 HEAD_REF v1.x ) diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 4a92b4835..46bab0028 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-12-14 +Version: 2019-01-09 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index b1ecb3f0e..95816db3d 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF e7c832772ec55f495927bfa4526d2fc17f0381be - SHA512 d79b5f5a5b97cc1f305abcf3799b00e335ba74c7c73b347b231e4796f45821398f952336dc94011fd8347de8c0e5af78b6cfa61387df002c1ba5e34954ec64c9 + REF 90970542fe952602f42150c6e71d086f5afebcb3 + SHA512 910e8ec958d559e2d71bcc701bdb2ac52e319025470a6690cdf86c10ec385789b81392f61f3d5586f4bc4b686714c05ebe67e5596978c0c6c2e5b4b3694cf8d9 HEAD_REF master ) diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 34eaa31db..0dbf976ce 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2018-12-14 +Version: 2019-01-09 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index 13f0b9ed2..a7eb6a76d 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 23ed1ddc676c74f19c333ebbe5dafe68ad3118f3 - SHA512 2b1b0ddb13ba258ce82cb659ca989cb96e9a72ba242df01de7963de50671d6ac6ab93b0e8bb05fa030970e7efb7b894fa4daa7778d77ebb930cba96da3a55317 + REF fa2144ec238def8d5e08d8489fda6ccfe19a8db1 + SHA512 c6c6405a15e197cc7f335e26193b46f00d3293606c042d7d6a2c50e79aa93c9c2ed14537a71b6dad30c271f80138cb7d294bf85bf0e67cbec6c0709e9f0f624f HEAD_REF master ) diff --git a/ports/sqlite-orm/CONTROL b/ports/sqlite-orm/CONTROL index 5de84f58e..622e7b9c8 100644 --- a/ports/sqlite-orm/CONTROL +++ b/ports/sqlite-orm/CONTROL @@ -1,4 +1,4 @@ Source: sqlite-orm -Version: 1.2 +Version: 1.3 Build-Depends: sqlite3 Description: SQLite ORM light header only library for modern C++ diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index 2e6686bfc..c7fcec417 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF v1.2 - SHA512 b2c87bb643337b5f59d96f8a22e2c6ae040116f51bd86b75e1085d0c06618af131a36d312040d0cf49533269fa840f4e575812b017c7b80b121e1f27825723b5 + REF 1.3 + SHA512 9d61d65a8987f875aacca9dd262d5b1e4dca273aef938fc5c292469b215b244edc63fb6428199e16ed6d254f752e1a9574306b15ebb099a4bf4f744510975da3 HEAD_REF master ) diff --git a/ports/strtk/CONTROL b/ports/strtk/CONTROL index 613ee7db1..861e148a7 100644 --- a/ports/strtk/CONTROL +++ b/ports/strtk/CONTROL @@ -1,4 +1,4 @@ Source: strtk -Version: 2018.09.30-b887974 +Version: 2019-01-09 Description: robust, optimized and portable string processing algorithms for the C++ language Build-Depends: boost diff --git a/ports/strtk/portfile.cmake b/ports/strtk/portfile.cmake index 1fed1a4a6..6790325bf 100644 --- a/ports/strtk/portfile.cmake +++ b/ports/strtk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/strtk - REF b88797408e614ff5a127df12cc520bf41769ada6 - SHA512 3bb5bfc5f12f46180bc7751b865c5ef9120b3c8764ccc86ca2b4b344d6b9d1744e7bd45e9a9202fe4349f8ce75fbb0c37e807cb1e072f5aef28e790ec94646ca + REF c6168dda1deed942b2fbfde9d80f53049fa79f20 + SHA512 7595f412838e86d4b7cf0ca3da4dc8aebe40011fb29058e1ee42e23923fbbadeb9a2d0fceac3362b2d0a228ff86c111457f9204b533edb8e0379f3022976906e ) file(COPY ${SOURCE_PATH}/strtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index 076c7dbfa..f00c0c0e2 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-12-14 +Version: 2019-01-09 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 1635579b8..41b2189d7 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 2b7365c54f823013cc6a4760798051b22743c103 - SHA512 439d4860f029e083c2f9da5b87f3b6119f34da085fb8000020b4bb17195838f6ea029157ce8537176024a9dec6c163ba5495b59e66eefc344fbbb4b323d2f334 + REF a5df39032ca206e2e6a9ec975147e81746d9a255 + SHA512 765227283477dc0c0d0e94da34f1d11e90ccdfc61752662e9da7c9e4793d655de2a6c42e8e44c488e264b8b1f071c5a1324bb63111d471718c6e85b39b812ddd HEAD_REF master ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index c6ecb0a3f..11845151a 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2018-12-14 +Version: 2019-01-09 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index 76e9ccb9b..a982e1a24 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF a4015d502f462ad5ba1003a51edcbd07400c14d2 - SHA512 bfdfe4062c17a5d0d1971f1482ddbc28f4d041c7bcc173350e5b2210ad466c2e5496d3a548e31fa1e1f83c12bd8d646e766cf3b8388d13d3782af50a189fb47d + REF a1e3df0dd62004c244d00825867aea30c83d678e + SHA512 febc79ba30ba023f24a8b5ae01465bf353457d37cfccbdaebeabde16f7a4758a8acd8f9c6ddd9f453fc0918b6c02631a45107f322297ea0e32ac46c548d9e7b3 HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index ab167b4da..f01523040 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2018-12-14 +Version: 2019-01-09 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index f734e1386..93c4d8f34 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 536c4e77c4350fac3e5c2b9b57d8c16f69b934d3 - SHA512 295a88381fbb765d3ffb6a8e58a85c9385a978e49957ad35db828952c0144e392abab77f529ea12aa62b7e495e75df8f02b032f8fd8b87502517d7e46b889e3c + REF ac0cd2144df92a487acd98a43b1d7880a3044835 + SHA512 68bd31beabdad80e80e049159a9345cd7a6830a01f63f813612a14802fe1d8bcf2f7089e120b2cd0ebd432fe0b17adc2cd9177485c694c7d963beae10580446b HEAD_REF master ) diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index b7d4dcd17..498eeb6cb 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle -Version: 2018.11.05.00 +Version: 2019.01.07.00 Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion 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/portfile.cmake b/ports/wangle/portfile.cmake index 5f17212c9..6d1aac9f8 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2018.11.05.00 - SHA512 287fd19e352f04666d2d925eb6322aa5b74b1b8808142d37c1089b34df650bc56f0489ff4746b1ddfbec7544d99df71f9583d47ef5abef600e9bc5d434dceab6 + REF v2019.01.07.00 + SHA512 1b4771d92b45fd5e9622985321cfd608510ea13d2f4cb03a4842c52d7253a1b460f825746a315ef0df3b2e37e56abddb5b493b80d383ba327fdbf7294bae193e HEAD_REF master PATCHES build.patch diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index ae33c6f68..2fe693a12 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2018-12-14 +Version: 2019-01-09 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 2ae912e07..929df2718 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF ed8ed727c6f532f1a7d7bdf14b72aa83e2a4f0e9 - SHA512 32034fac0bc9f2d0c40e0d9e999200af43146b015ea3663da2d1f58e47da38f292fc03284e39e6c3e30311cd80f4787492e7d993e4d36fa1031e62a8d3dd3c35 + REF 3154f3eab7fee360991e244c2d710f274e0ad4d9 + SHA512 c964add0fb93965bc26f6e981908dd2c8c321ed9857621a4f8a35145a4cd0f087298db0eddf659f4e91e0c4c1641edbba00a3771e520771bfdcbe8fb925cfb05 HEAD_REF master ) -- cgit v1.2.3 From 7bc18139e37b4a9db949bc96bfb13c22f59f8d37 Mon Sep 17 00:00:00 2001 From: Jaime Soto Date: Thu, 19 Jul 2018 20:40:19 -0400 Subject: [pdal-c] Add pdal-c port files --- ports/pdal-c/CONTROL | 4 ++++ ports/pdal-c/fix-docs-version.patch | 14 +++++++++++ ports/pdal-c/portfile.cmake | 42 +++++++++++++++++++++++++++++++++ ports/pdal-c/preserve-install-dir.patch | 13 ++++++++++ ports/pdal-c/remove-tests.patch | 12 ++++++++++ 5 files changed, 85 insertions(+) create mode 100644 ports/pdal-c/CONTROL create mode 100644 ports/pdal-c/fix-docs-version.patch create mode 100644 ports/pdal-c/portfile.cmake create mode 100644 ports/pdal-c/preserve-install-dir.patch create mode 100644 ports/pdal-c/remove-tests.patch diff --git a/ports/pdal-c/CONTROL b/ports/pdal-c/CONTROL new file mode 100644 index 000000000..8dcde3f5b --- /dev/null +++ b/ports/pdal-c/CONTROL @@ -0,0 +1,4 @@ +Source: pdal-c +Version: 1.8 +Description: C API for the Point Data Abstraction Library (PDAL) +Build-Depends: pdal diff --git a/ports/pdal-c/fix-docs-version.patch b/ports/pdal-c/fix-docs-version.patch new file mode 100644 index 000000000..d44b50b61 --- /dev/null +++ b/ports/pdal-c/fix-docs-version.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fbc4a4..c8a325a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,8 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "CMake RelWithDebInfo suffix") + set(PDALC_ENABLE_CODE_COVERAGE ON CACHE BOOL "Enable code coverage calculation") + set(PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE "131072" CACHE STRING "GCC garbage collection minimum heap size") + +-include(ObtainProjectVersion) ++set(${PROJECT_NAME}_VERSION "1.8") ++set(BUILD_ID "vcpkg build") + include_directories("${CMAKE_SOURCE_DIR}/source") + + if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake new file mode 100644 index 000000000..4e1a51b72 --- /dev/null +++ b/ports/pdal-c/portfile.cmake @@ -0,0 +1,42 @@ +# vcpkg portfile.cmake for pdal-c, the C API for PDAL + +include(vcpkg_common_functions) +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "Warning: Static building will not support load data through plugins.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/CAPI + REF 1.8 + SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf + HEAD_REF master +) + +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-docs-version.patch + ${CMAKE_CURRENT_LIST_DIR}/preserve-install-dir.patch + ${CMAKE_CURRENT_LIST_DIR}/remove-tests.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Remove headers from debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Install copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdal-c + RENAME copyright +) diff --git a/ports/pdal-c/preserve-install-dir.patch b/ports/pdal-c/preserve-install-dir.patch new file mode 100644 index 000000000..87377ab2f --- /dev/null +++ b/ports/pdal-c/preserve-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fbc4a4..075c86c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,8 +13,6 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + +-# Install to the build directory +-set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING "CMake install prefix" FORCE) + + # Use "d" suffix for debug builds + # Do not use a suffix for RelWithDebInfo diff --git a/ports/pdal-c/remove-tests.patch b/ports/pdal-c/remove-tests.patch new file mode 100644 index 000000000..c50914e57 --- /dev/null +++ b/ports/pdal-c/remove-tests.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fbc4a4..e31e552 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,3 @@ endif() + + add_subdirectory("source/pdal") + add_subdirectory("doc") +- +-include(CTest) +-add_subdirectory("tests/data") +-add_subdirectory("tests/pdal") -- cgit v1.2.3 From ea29ebaf375b2bd26c0132cd483b05d6339e8f91 Mon Sep 17 00:00:00 2001 From: huangqinjin Date: Tue, 22 Jan 2019 16:32:52 +0800 Subject: fix tiff build for uwp --- ports/tiff/fix-stddef.patch | 13 +++++++++++++ ports/tiff/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/tiff/fix-stddef.patch diff --git a/ports/tiff/fix-stddef.patch b/ports/tiff/fix-stddef.patch new file mode 100644 index 000000000..a9c2ddf0b --- /dev/null +++ b/ports/tiff/fix-stddef.patch @@ -0,0 +1,13 @@ +diff --git a/port/lfind.c port/lfind.c +index 087dfa9..20fa8b4 100644 +--- a/port/lfind.c ++++ b/port/lfind.c +@@ -38,7 +38,7 @@ + #ifdef _WIN32_WCE + # include + #else +-# include ++# include + #endif + + #ifndef NULL diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 92ba3963c..6e46ee6d2 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_extract_source_archive_ex( add-component-options.patch fix-cxx-shared-libs.patch crt-secure-no-deprecate.patch + fix-stddef.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") -- cgit v1.2.3 From a1747f156799985d30670507bb3dcf793c2f438b Mon Sep 17 00:00:00 2001 From: Jasper-Bekkers Date: Tue, 22 Jan 2019 12:19:59 +0100 Subject: Update flatbuffers to 1.10.0 --- ports/flatbuffers/CONTROL | 2 +- ports/flatbuffers/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 9dc3a871f..f9f318630 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,4 +1,4 @@ Source: flatbuffers -Version: 1.9.0-3 +Version: 1.10.0 Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/ FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index d98d5ce48..fe7704d8c 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers - REF v1.9.0 - SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696 + REF v1.10.0 + SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch -- cgit v1.2.3 From c646d30a71e20d62a75080779441379431e06cd4 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 22 Jan 2019 15:28:35 -0800 Subject: [celero] Revert changes in c6db2c880a064b29e0b38eda29f19510235fb4c9 --- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 2afd57484..aa90dad66 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,3 +1,3 @@ Source: celero -Version: 2.4.0 +Version: 2.4.0-1 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index f9288fb8e..61dbec10e 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF v2.4.0 - SHA512 4ba9f26bcda85bea00de27a6e8166f874f2c3852f74c54c089373caf71e1c066ac771fda73799d84c4c7a20986a71fd7a3b101b7b8972b9797ab3e8ed7918c30 + REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3 + SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7 HEAD_REF master ) -- cgit v1.2.3 From 39b7876db496d2cae6ec8c2736a45db6319ad46f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 18 Jan 2019 19:03:37 -0800 Subject: [vcpkg] Randomize topological sort in CI plans to allow concurrent builds to more efficiently interact --- toolsrc/.clang-format | 3 ++- toolsrc/include/vcpkg/base/graphs.h | 43 ++++++++++++++++++++++++++++++------ toolsrc/include/vcpkg/dependencies.h | 20 +++++++++++++++-- toolsrc/src/vcpkg/commands.ci.cpp | 36 +++++++++++++++++++++++++----- toolsrc/src/vcpkg/dependencies.cpp | 21 +++++++++--------- 5 files changed, 97 insertions(+), 26 deletions(-) diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format index 4700062c7..c14765672 100644 --- a/toolsrc/.clang-format +++ b/toolsrc/.clang-format @@ -29,4 +29,5 @@ IndentCaseLabels: true KeepEmptyLinesAtTheStartOfBlocks: false NamespaceIndentation: All PenaltyReturnTypeOnItsOwnLine: 1000 -SpaceAfterTemplateKeyword: false \ No newline at end of file +SpaceAfterTemplateKeyword: false +SpaceBeforeCpp11BracedList: false diff --git a/toolsrc/include/vcpkg/base/graphs.h b/toolsrc/include/vcpkg/base/graphs.h index 1b0fa61c7..6cff75ad3 100644 --- a/toolsrc/include/vcpkg/base/graphs.h +++ b/toolsrc/include/vcpkg/base/graphs.h @@ -29,13 +29,36 @@ namespace vcpkg::Graphs virtual U load_vertex_data(const V& vertex) const = 0; }; + struct Randomizer + { + virtual int random(int max_exclusive) = 0; + + protected: + ~Randomizer() {} + }; + namespace details { + template + void shuffle(Container& c, Randomizer* r) + { + if (!r) return; + for (int i = static_cast(c.size()); i > 1; --i) + { + auto j = r->random(i); + if (j != i - 1) + { + std::swap(c[i - 1], c[j]); + } + } + } + template void topological_sort_internal(const V& vertex, const AdjacencyProvider& f, std::unordered_map& exploration_status, - std::vector& sorted) + std::vector& sorted, + Randomizer* randomizer) { ExplorationStatus& status = exploration_status[vertex]; switch (status) @@ -43,7 +66,7 @@ namespace vcpkg::Graphs case ExplorationStatus::FULLY_EXPLORED: return; case ExplorationStatus::PARTIALLY_EXPLORED: { - System::println("Cycle detected within graph:"); + System::println("Cycle detected within graph at %s:", f.to_string(vertex)); for (auto&& node : exploration_status) { if (node.second == ExplorationStatus::PARTIALLY_EXPLORED) @@ -57,8 +80,10 @@ namespace vcpkg::Graphs { status = ExplorationStatus::PARTIALLY_EXPLORED; U vertex_data = f.load_vertex_data(vertex); - for (const V& neighbour : f.adjacency_list(vertex_data)) - topological_sort_internal(neighbour, f, exploration_status, sorted); + auto neighbours = f.adjacency_list(vertex_data); + details::shuffle(neighbours, randomizer); + for (const V& neighbour : neighbours) + topological_sort_internal(neighbour, f, exploration_status, sorted, randomizer); sorted.push_back(std::move(vertex_data)); status = ExplorationStatus::FULLY_EXPLORED; @@ -69,15 +94,19 @@ namespace vcpkg::Graphs } } - template - std::vector topological_sort(const VertexRange& starting_vertices, const AdjacencyProvider& f) + template + std::vector topological_sort(VertexContainer starting_vertices, + const AdjacencyProvider& f, + Randomizer* randomizer) { std::vector sorted; std::unordered_map exploration_status; + details::shuffle(starting_vertices, randomizer); + for (auto&& vertex : starting_vertices) { - details::topological_sort_internal(vertex, f, exploration_status, sorted); + details::topological_sort_internal(vertex, f, exploration_status, sorted, randomizer); } return sorted; diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 3c3b8f267..16fdb3f73 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -7,8 +7,14 @@ #include #include +#include #include +namespace vcpkg::Graphs +{ + struct Randomizer; +} + namespace vcpkg::Dependencies { enum class RequestType @@ -148,6 +154,11 @@ namespace vcpkg::Dependencies struct ClusterGraph; struct GraphPlan; + struct CreateInstallPlanOptions + { + Graphs::Randomizer* randomizer = nullptr; + }; + struct PackageGraph { PackageGraph(const PortFileProvider& provider, const StatusParagraphs& status_db); @@ -157,7 +168,7 @@ namespace vcpkg::Dependencies const std::unordered_set& prevent_default_features = {}) const; void upgrade(const PackageSpec& spec) const; - std::vector serialize() const; + std::vector serialize(const CreateInstallPlanOptions& options = {}) const; private: std::unique_ptr m_graph_plan; @@ -174,9 +185,14 @@ namespace vcpkg::Dependencies const std::vector& specs, const StatusParagraphs& status_db); + /// Figure out which actions are required to install features specifications in `specs`. + /// Contains the ports of the current environment. + /// Feature specifications to resolve dependencies for. + /// Status of installed packages in the current environment. std::vector create_feature_install_plan(const PortFileProvider& provider, const std::vector& specs, - const StatusParagraphs& status_db); + const StatusParagraphs& status_db, + const CreateInstallPlanOptions& options = {}); void print_plan(const std::vector& action_plan, const bool is_recursive = true); } diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 551eee27b..5ca962744 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -30,14 +31,16 @@ namespace vcpkg::Commands::CI static constexpr StringLiteral OPTION_EXCLUDE = "--exclude"; static constexpr StringLiteral OPTION_PURGE_TOMBSTONES = "--purge-tombstones"; static constexpr StringLiteral OPTION_XUNIT = "--x-xunit"; + static constexpr StringLiteral OPTION_RANDOMIZE = "--x-randomize"; static constexpr std::array CI_SETTINGS = {{ {OPTION_EXCLUDE, "Comma separated list of ports to skip"}, {OPTION_XUNIT, "File to output results in XUnit format (internal)"}, }}; - static constexpr std::array CI_SWITCHES = {{ + static constexpr std::array CI_SWITCHES = {{ {OPTION_DRY_RUN, "Print out plan without execution"}, + {OPTION_RANDOMIZE, "Randomize the install order"}, {OPTION_PURGE_TOMBSTONES, "Purge failure tombstones and retry building the ports"}, }}; @@ -69,7 +72,7 @@ namespace vcpkg::Commands::CI std::map abi_tag_map; std::set will_fail; - const Build::BuildPackageOptions install_plan_options = { + const Build::BuildPackageOptions build_options = { Build::UseHeadVersion::NO, Build::AllowDownloads::YES, Build::CleanBuildtrees::YES, @@ -81,7 +84,9 @@ namespace vcpkg::Commands::CI vcpkg::Cache pre_build_info_cache; - auto action_plan = Dependencies::create_feature_install_plan(provider, fspecs, StatusParagraphs {}); + auto action_plan = Dependencies::create_feature_install_plan(provider, fspecs, {}, {}); + + auto timer = Chrono::ElapsedTimer::create_started(); for (auto&& action : action_plan) { @@ -94,7 +99,7 @@ namespace vcpkg::Commands::CI auto triplet = p->spec.triplet(); const Build::BuildPackageConfig build_config { - *scf, triplet, paths.port_dir(p->spec), install_plan_options, p->feature_list}; + *scf, triplet, paths.port_dir(p->spec), build_options, p->feature_list}; auto dependency_abis = Util::fmap(p->computed_dependencies, [&](const PackageSpec& spec) -> Build::AbiEntry { @@ -174,6 +179,8 @@ namespace vcpkg::Commands::CI } } + System::print("Time to determine pass/fail: %s\n", timer.elapsed().to_string()); + return ret; } @@ -241,12 +248,31 @@ namespace vcpkg::Commands::CI for (auto&& fspec : fspecs) pgraph.install(fspec); + Dependencies::CreateInstallPlanOptions serialize_options; + + struct RandomizerInstance : Graphs::Randomizer + { + virtual int random(int i) override + { + if (i <= 1) return 0; + std::uniform_int_distribution d(0, i - 1); + return d(e); + } + + std::random_device e; + } randomizer_instance; + + if (Util::Sets::contains(options.switches, OPTION_RANDOMIZE)) + { + serialize_options.randomizer = &randomizer_instance; + } + auto action_plan = [&]() { int iterations = 0; do { bool inconsistent = false; - auto action_plan = pgraph.serialize(); + auto action_plan = pgraph.serialize(serialize_options); for (auto&& action : action_plan) { diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 60c43e4a8..19d8e7ae8 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -354,7 +354,7 @@ namespace vcpkg::Dependencies auto installed_ports = get_installed_ports(status_db); const std::unordered_set specs_as_set(specs.cbegin(), specs.cend()); - return Graphs::topological_sort(specs, RemoveAdjacencyProvider{status_db, installed_ports, specs_as_set}); + return Graphs::topological_sort(specs, RemoveAdjacencyProvider{status_db, installed_ports, specs_as_set}, {}); } std::vector create_export_plan(const std::vector& specs, @@ -396,7 +396,7 @@ namespace vcpkg::Dependencies const std::unordered_set specs_as_set(specs.cbegin(), specs.cend()); std::vector toposort = - Graphs::topological_sort(specs, ExportAdjacencyProvider{status_db, specs_as_set}); + Graphs::topological_sort(specs, ExportAdjacencyProvider{status_db, specs_as_set}, {}); return toposort; } @@ -605,13 +605,10 @@ namespace vcpkg::Dependencies } } - /// Figure out which actions are required to install features specifications in `specs`. - /// Contains the ports of the current environment. - /// Feature specifications to resolve dependencies for. - /// Status of installed packages in the current environment. std::vector create_feature_install_plan(const PortFileProvider& provider, const std::vector& specs, - const StatusParagraphs& status_db) + const StatusParagraphs& status_db, + const CreateInstallPlanOptions& options) { std::unordered_set prevent_default_features; for (auto&& spec : specs) @@ -628,7 +625,7 @@ namespace vcpkg::Dependencies pgraph.install(spec, prevent_default_features); } - return pgraph.serialize(); + return pgraph.serialize(options); } /// Figure out which actions are required to install features specifications in `specs`. @@ -672,13 +669,15 @@ namespace vcpkg::Dependencies mark_minus(spec_cluster, *m_graph, *m_graph_plan, {}); } - std::vector PackageGraph::serialize() const + std::vector PackageGraph::serialize(const CreateInstallPlanOptions& options) const { auto remove_vertex_list = m_graph_plan->remove_graph.vertex_list(); - auto remove_toposort = Graphs::topological_sort(remove_vertex_list, m_graph_plan->remove_graph); + auto remove_toposort = + Graphs::topological_sort(remove_vertex_list, m_graph_plan->remove_graph, options.randomizer); auto insert_vertex_list = m_graph_plan->install_graph.vertex_list(); - auto insert_toposort = Graphs::topological_sort(insert_vertex_list, m_graph_plan->install_graph); + auto insert_toposort = + Graphs::topological_sort(insert_vertex_list, m_graph_plan->install_graph, options.randomizer); std::vector plan; -- cgit v1.2.3 From 181a7bef8dbc2962d934bc0e568706cdcecb2539 Mon Sep 17 00:00:00 2001 From: Alexej Harm Date: Wed, 23 Jan 2019 02:38:01 +0100 Subject: [podofo] Change auto_ptr to unique_ptr. (#5182) * [podofo] Change auto_ptr to unique_ptr. * [podofo] Use PATCHES argument of vcpkg_extract_source_archive_ex --- ports/podofo/CONTROL | 2 +- ports/podofo/portfile.cmake | 1 + ports/podofo/unique_ptr.patch | 198 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 ports/podofo/unique_ptr.patch diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL index e5485c493..9b6abdb17 100644 --- a/ports/podofo/CONTROL +++ b/ports/podofo/CONTROL @@ -1,5 +1,5 @@ Source: podofo -Version: 0.9.6-1 +Version: 0.9.6-3 Description: PoDoFo is a library to work with the PDF file format Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl (!windows&!uwp), freetype diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 0897576d0..a0b27a7a7 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PODOFO_VERSION} + PATCHES unique_ptr.patch ) set(PODOFO_NO_FONTMANAGER ON) diff --git a/ports/podofo/unique_ptr.patch b/ports/podofo/unique_ptr.patch new file mode 100644 index 000000000..5c70e8471 --- /dev/null +++ b/ports/podofo/unique_ptr.patch @@ -0,0 +1,198 @@ +diff -ruNp a/src/base/PdfFilter.cpp b/src/base/PdfFilter.cpp +--- a/src/base/PdfFilter.cpp 2016-11-18 20:08:56.000000000 +0100 ++++ b/src/base/PdfFilter.cpp 2019-01-16 10:25:22.934430500 +0100 +@@ -131,7 +131,7 @@ class PdfFilteredEncodeStream : public P + + private: + PdfOutputStream* m_pOutputStream; +- std::auto_ptr m_filter; ++ std::unique_ptr m_filter; + }; + + /** Create a filter that is a PdfOutputStream. +@@ -206,7 +206,7 @@ class PdfFilteredDecodeStream : public P + + private: + PdfOutputStream* m_pOutputStream; +- std::auto_ptr m_filter; ++ std::unique_ptr m_filter; + bool m_bFilterFailed; + }; + +@@ -264,7 +264,7 @@ PdfFilterFactory::PdfFilterFactory() + { + } + +-std::auto_ptr PdfFilterFactory::Create( const EPdfFilter eFilter ) ++std::unique_ptr PdfFilterFactory::Create( const EPdfFilter eFilter ) + { + PdfFilter* pFilter = NULL; + switch( eFilter ) +@@ -316,7 +316,7 @@ std::auto_ptr PdfFilterFactor + break; + } + +- return std::auto_ptr(pFilter); ++ return std::unique_ptr(pFilter); + } + + PdfOutputStream* PdfFilterFactory::CreateEncodeStream( const TVecFilters & filters, PdfOutputStream* pStream ) +diff -ruNp a/src/base/PdfFilter.h b/src/base/PdfFilter.h +--- a/src/base/PdfFilter.h 2016-11-18 20:08:56.000000000 +0100 ++++ b/src/base/PdfFilter.h 2019-01-16 10:25:22.981323900 +0100 +@@ -454,7 +454,7 @@ class PODOFO_API PdfFilterFactory { + public: + /** Create a filter from an enum. + * +- * Ownership is transferred to the caller, who should let the auto_ptr ++ * Ownership is transferred to the caller, who should let the unique_ptr + * the filter is returned in take care of freeing it when they're done + * with it. + * +@@ -463,7 +463,7 @@ class PODOFO_API PdfFilterFactory { + * \returns a new PdfFilter allocated using new, or NULL if no + * filter is available for this type. + */ +- static std::auto_ptr Create( const EPdfFilter eFilter ); ++ static std::unique_ptr Create( const EPdfFilter eFilter ); + + /** Create a PdfOutputStream that applies a list of filters + * on all data written to it. +diff -ruNp a/src/base/PdfMemStream.cpp b/src/base/PdfMemStream.cpp +--- a/src/base/PdfMemStream.cpp 2016-11-18 20:08:56.000000000 +0100 ++++ b/src/base/PdfMemStream.cpp 2019-01-16 10:25:23.479681200 +0100 +@@ -245,7 +245,7 @@ void PdfMemStream::FlateCompressStreamDa + if( !m_lLength ) + return; + +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_FlateDecode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_FlateDecode ); + if( pFilter.get() ) + { + pFilter->Encode( m_buffer.GetBuffer(), m_buffer.GetSize(), &pBuffer, &lLen ); +diff -ruNp a/src/base/PdfStream.cpp b/src/base/PdfStream.cpp +--- a/src/base/PdfStream.cpp 2016-11-18 20:08:56.000000000 +0100 ++++ b/src/base/PdfStream.cpp 2019-01-16 10:25:24.387075400 +0100 +@@ -91,9 +91,9 @@ void PdfStream::GetFilteredCopy( char** + PdfMemoryOutputStream stream; + if( vecFilters.size() ) + { +- // Use std::auto_ptr so that pDecodeStream is deleted ++ // Use std::unique_ptr so that pDecodeStream is deleted + // even in the case of an exception +- std::auto_ptr pDecodeStream( PdfFilterFactory::CreateDecodeStream( vecFilters, &stream, ++ std::unique_ptr pDecodeStream( PdfFilterFactory::CreateDecodeStream( vecFilters, &stream, + m_pParent ? + &(m_pParent->GetDictionary()) : NULL ) ); + +diff -ruNp a/src/base/PdfString.cpp b/src/base/PdfString.cpp +--- a/src/base/PdfString.cpp 2018-03-10 17:30:53.000000000 +0100 ++++ b/src/base/PdfString.cpp 2019-01-16 10:25:24.480799400 +0100 +@@ -673,7 +673,7 @@ PdfString PdfString::HexEncode() const + return *this; + else + { +- std::auto_ptr pFilter; ++ std::unique_ptr pFilter; + + pdf_long lLen = (m_buffer.GetSize() - 1) << 1; + PdfString str; +@@ -702,7 +702,7 @@ PdfString PdfString::HexDecode() const + return *this; + else + { +- std::auto_ptr pFilter; ++ std::unique_ptr pFilter; + + pdf_long lLen = m_buffer.GetSize() >> 1; + PdfString str; +diff -ruNp a/src/doc/PdfFont.cpp b/src/doc/PdfFont.cpp +--- a/src/doc/PdfFont.cpp 2016-05-13 16:04:34.000000000 +0200 ++++ b/src/doc/PdfFont.cpp 2019-01-16 10:25:26.372048300 +0100 +@@ -145,7 +145,7 @@ void PdfFont::WriteStringToStream( const + pdf_long lLen = 0; + char* pBuffer = NULL; + +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); + pFilter->Encode( buffer.GetBuffer(), buffer.GetSize(), &pBuffer, &lLen ); + + pStream->Append( "<", 1 ); +diff -ruNp a/src/doc/PdfPainter.cpp b/src/doc/PdfPainter.cpp +--- a/src/doc/PdfPainter.cpp 2018-03-06 15:04:03.000000000 +0100 ++++ b/src/doc/PdfPainter.cpp 2019-01-16 10:25:28.512159900 +0100 +@@ -829,7 +829,7 @@ void PdfPainter::DrawText( double dX, do + + /* + char* pBuffer; +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); + pFilter->Encode( sString.GetString(), sString.GetLength(), &pBuffer, &lLen ); + + m_pCanvas->Append( pBuffer, lLen ); +diff -ruNp a/test/CreationTest/CreationTest.cpp b/test/CreationTest/CreationTest.cpp +--- a/test/CreationTest/CreationTest.cpp 2018-02-25 12:48:38.000000000 +0100 ++++ b/test/CreationTest/CreationTest.cpp 2019-01-16 10:25:29.605315700 +0100 +@@ -37,7 +37,7 @@ void WriteStringToStream( const PdfStrin + pdf_long lLen = 0; + char* pBuffer = NULL; + +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); + pFilter->Encode( buffer.GetBuffer(), buffer.GetSize(), &pBuffer, &lLen ); + + oss << "<"; +diff -ruNp a/test/FilterTest/FilterTest.cpp b/test/FilterTest/FilterTest.cpp +--- a/test/FilterTest/FilterTest.cpp 2018-03-10 15:06:27.000000000 +0100 ++++ b/test/FilterTest/FilterTest.cpp 2019-01-16 10:25:29.777214800 +0100 +@@ -57,7 +57,7 @@ void test_filter( EPdfFilter eFilter, co + pdf_long lEncoded; + pdf_long lDecoded; + +- std::auto_ptr pFilter = PdfFilterFactory::Create( eFilter ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( eFilter ); + if( !pFilter.get() ) + { + printf("!!! Filter %i not implemented.\n", eFilter); +@@ -256,7 +256,7 @@ int main() + char* pLargeBuffer2 = static_cast(malloc( strlen(pszInputAscii85Lzw) * 6 )); + + try { +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCII85Decode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCII85Decode ); + pFilter->Decode( pszInputAscii85Lzw, strlen(pszInputAscii85Lzw), + &pLargeBuffer1, &lLargeBufer1 ); + pFilter->Encode( pLargeBuffer1, lLargeBufer1, +diff -ruNp a/test/VariantTest/VariantTest.cpp b/test/VariantTest/VariantTest.cpp +--- a/test/VariantTest/VariantTest.cpp 2010-10-21 19:09:00.000000000 +0200 ++++ b/test/VariantTest/VariantTest.cpp 2019-01-16 10:25:32.418465600 +0100 +@@ -124,7 +124,7 @@ int main() + printf("This test tests the PdfVariant class.\n"); + printf("---\n"); + +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode ); + + // testing strings + TEST_SAFE_OP( Test( "(Hallo Welt!)", ePdfDataType_String ) ); +diff -ruNp a/test/unit/FilterTest.cpp b/test/unit/FilterTest.cpp +--- a/test/unit/FilterTest.cpp 2016-05-12 22:25:45.000000000 +0200 ++++ b/test/unit/FilterTest.cpp 2019-01-16 10:25:31.464162600 +0100 +@@ -59,7 +59,7 @@ void FilterTest::TestFilter( EPdfFilter + pdf_long lEncoded; + pdf_long lDecoded; + +- std::auto_ptr pFilter = PdfFilterFactory::Create( eFilter ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( eFilter ); + if( !pFilter.get() ) + { + printf("!!! Filter %i not implemented.\n", eFilter); +@@ -123,7 +123,7 @@ void FilterTest::testFilters() + + void FilterTest::testCCITT() + { +- std::auto_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_CCITTFaxDecode ); ++ std::unique_ptr pFilter = PdfFilterFactory::Create( ePdfFilter_CCITTFaxDecode ); + if( !pFilter.get() ) + { + printf("!!! ePdfFilter_CCITTFaxDecode not implemented skipping test!\n"); -- cgit v1.2.3 From f3ccca08f5758733d3ab554affe9cea38dca91de Mon Sep 17 00:00:00 2001 From: angelmixu Date: Wed, 23 Jan 2019 02:50:02 +0100 Subject: fix freetype for macOS (#4774) * added patch to freetype for assigning a value to macros like HAVE_UNISTD_H as using newer macOS Frameworks fail to compile if they have no value * [freetype] Modernize. Bump control version --- ports/freetype/0004-Fix-macOS-defines.patch | 23 +++++++++++++++++++++++ ports/freetype/CONTROL | 2 +- ports/freetype/portfile.cmake | 18 ++++++++++-------- 3 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 ports/freetype/0004-Fix-macOS-defines.patch diff --git a/ports/freetype/0004-Fix-macOS-defines.patch b/ports/freetype/0004-Fix-macOS-defines.patch new file mode 100644 index 000000000..92e676b52 --- /dev/null +++ b/ports/freetype/0004-Fix-macOS-defines.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt 2018-11-16 10:49:22.000000000 +0100 ++++ b/CMakeLists.txt 2018-11-16 10:50:26.000000000 +0100 +@@ -200,17 +200,17 @@ + FTCONFIG_H) + if (HAVE_UNISTD_H) + string(REGEX REPLACE +- "#undef +(HAVE_UNISTD_H)" "#define \\1" ++ "#undef +(HAVE_UNISTD_H)" "#define \\1 1" + FTCONFIG_H "${FTCONFIG_H}") + endif () + if (HAVE_FCNTL_H) + string(REGEX REPLACE +- "#undef +(HAVE_FCNTL_H)" "#define \\1" ++ "#undef +(HAVE_FCNTL_H)" "#define \\1 1" + FTCONFIG_H "${FTCONFIG_H}") + endif () + if (HAVE_STDINT_H) + string(REGEX REPLACE +- "#undef +(HAVE_STDINT_H)" "#define \\1" ++ "#undef +(HAVE_STDINT_H)" "#define \\1 1" + FTCONFIG_H "${FTCONFIG_H}") + endif () + string(REPLACE "/undef " "#undef " diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 567cf9020..1052412b4 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,4 +1,4 @@ Source: freetype -Version: 2.8.1-3 +Version: 2.8.1-4 Build-Depends: zlib, bzip2, libpng Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index d74c53220..e60f9ecb3 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,18 +1,20 @@ include(vcpkg_common_functions) + set(FT_VERSION 2.8.1) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-${FT_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2" FILENAME "freetype-${FT_VERSION}.tar.bz2" SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch - ${CMAKE_CURRENT_LIST_DIR}/0002-Add-CONFIG_INSTALL_PATH-option.patch - ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-UWP.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${FT_VERSION} + PATCHES + 0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch + 0002-Add-CONFIG_INSTALL_PATH-option.patch + 0003-Fix-UWP.patch + 0004-Fix-macOS-defines.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 07f1d2f44b4d8709cfeefaec5b6290b95baf7a64 Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Tue, 22 Jan 2019 20:15:15 -0600 Subject: Updating HPX to V1.2 (#4778) --- ports/hpx/CONTROL | 4 ++-- ports/hpx/portfile.cmake | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index ff6801a42..253b3aaae 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,5 @@ Source: hpx -Version: 1.1.0-1 -Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-date-time, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-format, boost-iostreams, boost-lockfree, boost-parameter, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-thread, boost-throw-exception, boost-variant, boost-winapi +Version: 1.2.0 +Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi Description: The C++ Standards Library for Concurrency and Parallelism HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case. diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index c200a6278..704d944fc 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.1.0 - SHA512 435250143ddbd2608995fe3dc5c229a096312d7ac930925ae56d0abd2d5689886126f6e81bc7e37b84ca9bc99f951ef1f39580168a359c48788ac8d008bc7078 + REF 1.2.0 + SHA512 caf2650381856db6a96fd4b120975d94d68d9bb19ada1d6cd076abe2d4aa1418e410167f774a881d95eacd0d46bbd5f90f16a4c77b4a2cf00e5b24ea17bfe670 HEAD_REF master ) @@ -20,7 +20,6 @@ vcpkg_configure_cmake( "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost" "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc" -DHPX_WITH_VCPKG=ON - -DHPX_WITH_HWLOC=ON -DHPX_WITH_TESTS=OFF -DHPX_WITH_EXAMPLES=OFF -DHPX_WITH_TOOLS=OFF @@ -30,9 +29,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # post build cleanup -file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/hpx-*) -file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/hpx) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX) file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake") @@ -44,7 +40,7 @@ foreach(CMAKE_FILE IN LISTS CMAKE_FILES) _contents "${_contents}") string(REGEX REPLACE "lib/hpx/([A-Za-z0-9_.-]+\\.dll)" - "bin/\\1" + "bin/hpx/\\1" _contents "${_contents}") file(WRITE ${CMAKE_FILE} "${_contents}") endforeach() @@ -65,7 +61,7 @@ endif() file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll) if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx) file(REMOVE ${DLLS}) endif() @@ -77,7 +73,7 @@ endif() file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll) if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx) file(REMOVE ${DLLS}) endif() -- cgit v1.2.3 From 8b3d233c487b54cd8f4f72fc745c19b40141b4b1 Mon Sep 17 00:00:00 2001 From: jasjuang Date: Tue, 22 Jan 2019 23:58:10 -0800 Subject: [tinyobjloader] update to 1.4.1 --- ports/tinyobjloader/CONTROL | 2 +- ports/tinyobjloader/portfile.cmake | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL index 16668c167..7967039a7 100644 --- a/ports/tinyobjloader/CONTROL +++ b/ports/tinyobjloader/CONTROL @@ -1,3 +1,3 @@ Source: tinyobjloader -Version: 1.2.0-1 +Version: 1.4.1 Description: Tiny but powerful single file wavefront obj loader diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake index bc70373a6..fd2dbf8a4 100644 --- a/ports/tinyobjloader/portfile.cmake +++ b/ports/tinyobjloader/portfile.cmake @@ -4,26 +4,25 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT VCPKG_CMAKE_SYSTEM_NAME OR endif() include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinyobjloader - REF 8fd9f6e57bf8c70d5ae47cf0f0d1bf1ccae2dfc2 - SHA512 5b6a2822989c5a28eabee0a33724c045b5d07cf0ccfd4288c7c3a5a2cc5b0c3f6ee8aca45e8e22c941278fbbfabd8f909f5010cd34b9d905c4d84102d151c73b + REF v1.4.1 + SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" TINYOBJLOADER_COMPILATION_SHARED) - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - -DTINYOBJLOADER_COMPILATION_SHARED=${TINYOBJLOADER_COMPILATION_SHARED} -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/tinyobjloader/cmake) + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake") file( REMOVE_RECURSE -- cgit v1.2.3 From b7d5f8cbee375cf4e82f50f1ea5ba74e86ca043b Mon Sep 17 00:00:00 2001 From: Raynor Vliegendhart Date: Wed, 23 Jan 2019 10:35:53 +0100 Subject: [libgeotiff] Remove FindPROJ4.cmake from src The GeoTIFF library ships with its own FindPROJ4.cmake module. This file interferes with the cmake files that are installed by vcpkg for the PROJ4 package. As a result, the debug version of libgeotiff gets incorrectly linked to the release version of PROJ4. By removing FindPROJ4.cmake from the source directory, the vcpkg's .cmake files are used instead, allowing CMake to find the debug version of PROJ4 when building the debug version of libgeotiff. --- ports/libgeotiff/CONTROL | 2 +- ports/libgeotiff/portfile.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index dea361457..edfa7f0cb 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,4 @@ Source: libgeotiff -Version: 1.4.2-6 +Version: 1.4.2-7 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/portfile.cmake b/ports/libgeotiff/portfile.cmake index afd203b03..fc79fe15d 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -21,6 +21,9 @@ vcpkg_extract_source_archive_ex( 0006-Fix-utility-link-error.patch ) +# Delete FindPROJ4.cmake +file(REMOVE ${SOURCE_PATH}/cmake/FindPROJ4.cmake) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA -- cgit v1.2.3 From 55ca74d64993eddeed05224564502b9bc2267fff Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 23 Jan 2019 09:55:51 -0800 Subject: [x265] Fix detect platform --- ports/x265/CONTROL | 2 +- ports/x265/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 537556763..f2185d2f0 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.9-1 +Version: 2.9-2 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 7f431a923..87f11c4f4 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -30,9 +30,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x265) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "LINUX") +if(UNIX) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265 ${CURRENT_PACKAGES_DIR}/tools/x265/x265) -else() +elseif(WIN32) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) endif() -- cgit v1.2.3 From c292cdcc456d2dbea68e1b5140df81e343c7d8ef Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 24 Jan 2019 06:07:22 +0800 Subject: [cnl] Add new port (#5158) --- ports/cnl/CONTROL | 3 +++ ports/cnl/portfile.cmake | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 ports/cnl/CONTROL create mode 100644 ports/cnl/portfile.cmake diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL new file mode 100644 index 000000000..7aa93f60e --- /dev/null +++ b/ports/cnl/CONTROL @@ -0,0 +1,3 @@ +Source: cnl +Version: 2019-01-09 +Description: A Compositional Numeric Library for C++ diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake new file mode 100644 index 000000000..0eb23e1c9 --- /dev/null +++ b/ports/cnl/portfile.cmake @@ -0,0 +1,28 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO johnmcfarlane/cnl + REF 9f632898a4738b9e41de90e66d4f6ddb84bda08b + SHA512 ffde0b5aa58e79b5a03eee588c0e43d17ab2ddb2ffb12508f9d1b0e05aa54bb6c653986f183ce339e73c562efd749af6bd3907d816c9f79bf48f1e84ded3ac13 + HEAD_REF develop +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 10d5e84b0135b07f9665418aebb42bc44ab2c7ca Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 23 Jan 2019 16:22:32 -0800 Subject: [pdal-c] Apply patches when obtaining source from GitHub --- ports/pdal-c/CONTROL | 2 +- ports/pdal-c/portfile.cmake | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/pdal-c/CONTROL b/ports/pdal-c/CONTROL index 8dcde3f5b..2a52378b5 100644 --- a/ports/pdal-c/CONTROL +++ b/ports/pdal-c/CONTROL @@ -1,4 +1,4 @@ Source: pdal-c -Version: 1.8 +Version: 1.8-1 Description: C API for the Point Data Abstraction Library (PDAL) Build-Depends: pdal diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index 4e1a51b72..8a478c547 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_from_github( REF 1.8 SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-docs-version.patch ${CMAKE_CURRENT_LIST_DIR}/preserve-install-dir.patch -- cgit v1.2.3 From 57e6b1f53531ba0d1b3d7e007c123c6e6c41cf1c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 24 Jan 2019 11:35:40 -0800 Subject: Update cpprestsdk to v2.10.9. (#5190) --- ports/cpprestsdk/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index d6390836c..bf8478be0 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.8 - SHA512 d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df + REF v2.10.9 + SHA512 bae55232bdee6dd4cb9e3da81b41c4d9b2c4b7bd514d7a15bbeadf90e13e96a6c3055d40e277f00b8e85f39b7eddd1bf7d4839f0a98a6040a55576e2d6ac2b57 HEAD_REF master ) -- cgit v1.2.3 From c0bf747e45d288dd3cf5823c6ad2478527737971 Mon Sep 17 00:00:00 2001 From: Codiferous <44823842+Codiferous@users.noreply.github.com> Date: Thu, 24 Jan 2019 11:47:28 -0800 Subject: Add a more correct port for libass (#5223) This port currently only works on Windows because the dependencies of the port (fribidi in particular) don't build on non-Windows platforms. I made patch modifications to the source code because the Visual C++ C compiler does not allow for non-constant-expression array indicesto be used to declare a static array. I've verified that this (1) builds on Windows and (2) works with a sample test that's included in the libass github repo. --- ports/libass/CMakeLists.txt | 36 ++++++++++++++++++++++++++++++++ ports/libass/CONTROL | 1 + ports/libass/ConstantValues.patch | 43 +++++++++++++++++++++++++++++++++++++++ ports/libass/config.h.in | 0 ports/libass/portfile.cmake | 21 ++++++++++++++++--- 5 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 ports/libass/CMakeLists.txt create mode 100644 ports/libass/ConstantValues.patch create mode 100644 ports/libass/config.h.in diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt new file mode 100644 index 000000000..12e32f902 --- /dev/null +++ b/ports/libass/CMakeLists.txt @@ -0,0 +1,36 @@ +cmake_minimum_required(VERSION 3.9) +project(libass C CXX) + +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + +# This is Windows-specific. Other acceptable values on different platforms should be +# macOS - CONFIG_CORETEXT +# linux - CONFIG_FONTCONFIG +add_compile_definitions(CONFIG_DIRECTWRITE) + +file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) + +list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") +list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + +find_package(Freetype REQUIRED) + +find_path(FRIBIDI_INCLUDE_DIR + NAMES fribidi.h + PATH_SUFFIXES fribidi) + +find_library(FRIBIDI_LIBRARY NAMES fribidi) + +add_library(ass STATIC ${SOURCES}) + +target_include_directories(ass PRIVATE ${FRIBIDI_INCLUDE_DIR}) + +target_link_libraries(ass PRIVATE Freetype::Freetype) + +install(TARGETS ass + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + diff --git a/ports/libass/CONTROL b/ports/libass/CONTROL index 0142a5e51..ea25ea9a1 100644 --- a/ports/libass/CONTROL +++ b/ports/libass/CONTROL @@ -1,3 +1,4 @@ Source: libass Version: 0.14.0 +Build-Depends: freetype, fribidi, harfbuzz, dirent (windows) Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. diff --git a/ports/libass/ConstantValues.patch b/ports/libass/ConstantValues.patch new file mode 100644 index 000000000..d357032d7 --- /dev/null +++ b/ports/libass/ConstantValues.patch @@ -0,0 +1,43 @@ +--- + 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/ports/libass/config.h.in b/ports/libass/config.h.in new file mode 100644 index 000000000..e69de29bb diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index a7380a6e6..64d49c985 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,15 +1,30 @@ -#header-only library + include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass REF 98727c3b78f44cb3bbc955fcf5d977ebd911d5ca SHA512 d466108180cea598b817f89aa21a1021ed2a763580d9aad51b054aa120186af48ab4264907e49ddcb38479a28d87d5431751a28afee9cb83ad7623f002d99c57 HEAD_REF master + PATCHES ConstantValues.patch ) -file(INSTALL ${SOURCE_PATH}/libass/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright) + +# Since libass uses automake, make and configure, we use a custom CMake file +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +file(COPY ${SOURCE_PATH}/libass/ass.h ${SOURCE_PATH}/libass/ass_types.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ass) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3 From 5dec8aa31b241cb4e92c520cac6c250575a0d719 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 25 Jan 2019 00:51:26 +0100 Subject: [ace] 6.5.4 (#5225) --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index ed08a12c2..9f8070e17 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,3 +1,3 @@ Source: ace -Version: 6.5.3 +Version: 6.5.4 Description: The ADAPTIVE Communication Environment diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index e10e82e0e..95fc09dce 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -9,9 +9,9 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip" - FILENAME ACE-6.5.3.zip - SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_4/ACE-6.5.4.zip" + FILENAME ACE-6.5.4.zip + SHA512 d18248f1fcea0e4993d5ba9c62ff99883d4eaecfb0b6b88062961723c0f30ac423c9f550ada98042cd7913d2586feb2f8d47b5779403017afaa89a622613d1ae ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 7d5fa69b3336dfca70539c77f536dc81633703f1 Mon Sep 17 00:00:00 2001 From: bdonlan Date: Thu, 24 Jan 2019 23:53:13 +0000 Subject: [aws-sdk-cpp] Update port to version 1.7.38 and add ports for its dependencies (#5214) * [aws-c-common] Add new port * [aws-checksums] Add new port * [aws-c-event-stream] Add new port * [aws-sdk-cpp] Update port to version 1.7.38 * [aws-sdk-cpp] Add dependencies on aws-c-event-stream, aws-checksums --- ports/aws-c-common/CONTROL | 3 + ports/aws-c-common/portfile.cmake | 34 ++ ports/aws-c-event-stream/CONTROL | 4 + ports/aws-c-event-stream/portfile.cmake | 35 ++ ports/aws-checksums/CONTROL | 3 + ports/aws-checksums/portfile.cmake | 33 + ports/aws-sdk-cpp/CONTROL | 118 +++- ports/aws-sdk-cpp/CONTROL.in | 4 +- ports/aws-sdk-cpp/compute_build_only.cmake | 950 ++++++++++++++++------------- ports/aws-sdk-cpp/portfile.cmake | 167 ++--- 10 files changed, 846 insertions(+), 505 deletions(-) create mode 100644 ports/aws-c-common/CONTROL create mode 100644 ports/aws-c-common/portfile.cmake create mode 100644 ports/aws-c-event-stream/CONTROL create mode 100644 ports/aws-c-event-stream/portfile.cmake create mode 100644 ports/aws-checksums/CONTROL create mode 100644 ports/aws-checksums/portfile.cmake diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL new file mode 100644 index 000000000..702ff2aa3 --- /dev/null +++ b/ports/aws-c-common/CONTROL @@ -0,0 +1,3 @@ +Source: aws-c-common +Version: 0.3.0 +Description: AWS common library for C \ No newline at end of file diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake new file mode 100644 index 000000000..681964791 --- /dev/null +++ b/ports/aws-c-common/portfile.cmake @@ -0,0 +1,34 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-common + REF v0.3.0 + SHA512 604b4289f19be662f15dc5ba80c20b78856975332b485796f979580e45f8d778eb8ce0cc2c02dcbaf27bc1159f473e02676cd951b674b7c8478ed26438a04541 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common + ${CURRENT_PACKAGES_DIR}/lib/aws-c-common + ) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-common RENAME copyright) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/share +) \ No newline at end of file diff --git a/ports/aws-c-event-stream/CONTROL b/ports/aws-c-event-stream/CONTROL new file mode 100644 index 000000000..25dd1c936 --- /dev/null +++ b/ports/aws-c-event-stream/CONTROL @@ -0,0 +1,4 @@ +Source: aws-c-event-stream +Version: 0.1.1 +Description: C99 implementation of the vnd.amazon.event-stream content-type. +Build-Depends: aws-c-common, aws-checksums \ No newline at end of file diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake new file mode 100644 index 000000000..c5ee56933 --- /dev/null +++ b/ports/aws-c-event-stream/portfile.cmake @@ -0,0 +1,35 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-event-stream + REF v0.1.1 + SHA512 974311cdface59bb5a95c7c249ad31cf694ebefd5c7b25f280f6817c6dc8d9ab1fdc8f75030099efe573be41a93676f199fda797d2a7bb41533f7e15f05de120 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake" +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-event-stream/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream + ${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream + ) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-event-stream RENAME copyright) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/share +) \ No newline at end of file diff --git a/ports/aws-checksums/CONTROL b/ports/aws-checksums/CONTROL new file mode 100644 index 000000000..67b14f8f5 --- /dev/null +++ b/ports/aws-checksums/CONTROL @@ -0,0 +1,3 @@ +Source: aws-checksums +Version: 0.1.2 +Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake new file mode 100644 index 000000000..6a409c09e --- /dev/null +++ b/ports/aws-checksums/portfile.cmake @@ -0,0 +1,33 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-checksums + REF v0.1.2 + SHA512 d924918fce5179e2f42c0aeb86cb3bfda22f92bf3950e179f248a8d3e72c05a4f1015982970fd4075bb687a0a6e03120eee2134c0f017ec8ef69ae066881aa0d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-checksums/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums + ${CURRENT_PACKAGES_DIR}/lib/aws-checksums +) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-checksums RENAME copyright) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/share +) \ No newline at end of file diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index 18d0bbaa9..ac8859a7e 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,7 +1,7 @@ Source: aws-sdk-cpp -Version: 1.6.47 +Version: 1.7.38 Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) +Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream Default-Features: dynamodb, s3, kinesis # Automatically generated by generateFeatures.ps1 @@ -11,15 +11,30 @@ 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 @@ -38,6 +53,12 @@ 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 @@ -47,6 +68,9 @@ 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 @@ -101,6 +125,9 @@ 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 @@ -113,6 +140,9 @@ 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 @@ -125,9 +155,15 @@ 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 @@ -146,6 +182,9 @@ 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 @@ -179,12 +218,21 @@ 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 @@ -218,6 +266,18 @@ 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 @@ -230,6 +290,9 @@ 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 @@ -245,6 +308,9 @@ 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 @@ -254,12 +320,18 @@ 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 @@ -275,6 +347,9 @@ 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 @@ -293,6 +368,9 @@ 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 @@ -302,9 +380,15 @@ 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 @@ -314,9 +398,18 @@ 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 @@ -329,18 +422,27 @@ 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 @@ -350,6 +452,12 @@ 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 @@ -362,9 +470,15 @@ 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 diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in index 13b206bfa..501e0e839 100644 --- a/ports/aws-sdk-cpp/CONTROL.in +++ b/ports/aws-sdk-cpp/CONTROL.in @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.4.30-1 +Version: 1.7.38 Description: AWS SDK for C++ -Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) +Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index f4a139153..66576f241 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -1,418 +1,532 @@ -# Automatically generated by generateFeatures.ps1 -if("access-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY access-management) -endif() -if("acm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY acm) -endif() -if("alexaforbusiness" IN_LIST FEATURES) - list(APPEND BUILD_ONLY alexaforbusiness) -endif() -if("apigateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigateway) -endif() -if("application-autoscaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY application-autoscaling) -endif() -if("appstream" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appstream) -endif() -if("appsync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appsync) -endif() -if("athena" IN_LIST FEATURES) - list(APPEND BUILD_ONLY athena) -endif() -if("autoscaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY autoscaling) -endif() -if("autoscaling-plans" IN_LIST FEATURES) - list(APPEND BUILD_ONLY autoscaling-plans) -endif() -if("AWSMigrationHub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY AWSMigrationHub) -endif() -if("batch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY batch) -endif() -if("budgets" IN_LIST FEATURES) - list(APPEND BUILD_ONLY budgets) -endif() -if("ce" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ce) -endif() -if("cloud9" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloud9) -endif() -if("clouddirectory" IN_LIST FEATURES) - list(APPEND BUILD_ONLY clouddirectory) -endif() -if("cloudformation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudformation) -endif() -if("cloudfront" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudfront) -endif() -if("cloudhsm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudhsm) -endif() -if("cloudhsmv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudhsmv2) -endif() -if("cloudsearch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudsearch) -endif() -if("cloudsearchdomain" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudsearchdomain) -endif() -if("cloudtrail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudtrail) -endif() -if("codebuild" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codebuild) -endif() -if("codecommit" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codecommit) -endif() -if("codedeploy" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codedeploy) -endif() -if("codepipeline" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codepipeline) -endif() -if("codestar" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar) -endif() -if("cognito-identity" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-identity) -endif() -if("cognito-idp" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-idp) -endif() -if("cognito-sync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-sync) -endif() -if("comprehend" IN_LIST FEATURES) - list(APPEND BUILD_ONLY comprehend) -endif() -if("config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY config) -endif() -if("connect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connect) -endif() -if("cur" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cur) -endif() -if("datapipeline" IN_LIST FEATURES) - list(APPEND BUILD_ONLY datapipeline) -endif() -if("dax" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dax) -endif() -if("devicefarm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY devicefarm) -endif() -if("directconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY directconnect) -endif() -if("discovery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY discovery) -endif() -if("dms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dms) -endif() -if("ds" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ds) -endif() -if("dynamodb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dynamodb) -endif() -if("dynamodbstreams" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dynamodbstreams) -endif() -if("ec2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ec2) -endif() -if("ecr" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecr) -endif() -if("ecs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecs) -endif() -if("elasticache" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticache) -endif() -if("elasticbeanstalk" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticbeanstalk) -endif() -if("elasticfilesystem" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticfilesystem) -endif() -if("elasticloadbalancing" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticloadbalancing) -endif() -if("elasticloadbalancingv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticloadbalancingv2) -endif() -if("elasticmapreduce" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticmapreduce) -endif() -if("elastictranscoder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elastictranscoder) -endif() -if("email" IN_LIST FEATURES) - list(APPEND BUILD_ONLY email) -endif() -if("es" IN_LIST FEATURES) - list(APPEND BUILD_ONLY es) -endif() -if("events" IN_LIST FEATURES) - list(APPEND BUILD_ONLY events) -endif() -if("firehose" IN_LIST FEATURES) - list(APPEND BUILD_ONLY firehose) -endif() -if("gamelift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY gamelift) -endif() -if("glacier" IN_LIST FEATURES) - list(APPEND BUILD_ONLY glacier) -endif() -if("glue" IN_LIST FEATURES) - list(APPEND BUILD_ONLY glue) -endif() -if("greengrass" IN_LIST FEATURES) - list(APPEND BUILD_ONLY greengrass) -endif() -if("guardduty" IN_LIST FEATURES) - list(APPEND BUILD_ONLY guardduty) -endif() -if("health" IN_LIST FEATURES) - list(APPEND BUILD_ONLY health) -endif() -if("iam" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iam) -endif() -if("identity-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY identity-management) -endif() -if("importexport" IN_LIST FEATURES) - list(APPEND BUILD_ONLY importexport) -endif() -if("inspector" IN_LIST FEATURES) - list(APPEND BUILD_ONLY inspector) -endif() -if("iot" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot) -endif() -if("iot-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-data) -endif() -if("iot-jobs-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-jobs-data) -endif() -if("kinesis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis) -endif() -if("kinesis-video-archived-media" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-archived-media) -endif() -if("kinesis-video-media" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-media) -endif() -if("kinesisanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisanalytics) -endif() -if("kinesisvideo" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisvideo) -endif() -if("kms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kms) -endif() -if("lambda" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lambda) -endif() -if("lex" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lex) -endif() -if("lex-models" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lex-models) -endif() -if("lightsail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lightsail) -endif() -if("logs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY logs) -endif() -if("machinelearning" IN_LIST FEATURES) - list(APPEND BUILD_ONLY machinelearning) -endif() -if("marketplace-entitlement" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplace-entitlement) -endif() -if("marketplacecommerceanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplacecommerceanalytics) -endif() -if("mediaconvert" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediaconvert) -endif() -if("medialive" IN_LIST FEATURES) - list(APPEND BUILD_ONLY medialive) -endif() -if("mediapackage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackage) -endif() -if("mediastore" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediastore) -endif() -if("mediastore-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediastore-data) -endif() -if("meteringmarketplace" IN_LIST FEATURES) - list(APPEND BUILD_ONLY meteringmarketplace) -endif() -if("mobile" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mobile) -endif() -if("mobileanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mobileanalytics) -endif() -if("monitoring" IN_LIST FEATURES) - list(APPEND BUILD_ONLY monitoring) -endif() -if("mq" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mq) -endif() -if("mturk-requester" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mturk-requester) -endif() -if("opsworks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opsworks) -endif() -if("opsworkscm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opsworkscm) -endif() -if("organizations" IN_LIST FEATURES) - list(APPEND BUILD_ONLY organizations) -endif() -if("pinpoint" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint) -endif() -if("polly" IN_LIST FEATURES) - list(APPEND BUILD_ONLY polly) -endif() -if("pricing" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pricing) -endif() -if("queues" IN_LIST FEATURES) - list(APPEND BUILD_ONLY queues) -endif() -if("rds" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rds) -endif() -if("redshift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift) -endif() -if("rekognition" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rekognition) -endif() -if("resource-groups" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resource-groups) -endif() -if("resourcegroupstaggingapi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resourcegroupstaggingapi) -endif() -if("route53" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53) -endif() -if("route53domains" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53domains) -endif() -if("s3" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3) -endif() -if("s3-encryption" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3-encryption) -endif() -if("sagemaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker) -endif() -if("sagemaker-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-runtime) -endif() -if("sdb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sdb) -endif() -if("serverlessrepo" IN_LIST FEATURES) - list(APPEND BUILD_ONLY serverlessrepo) -endif() -if("servicecatalog" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicecatalog) -endif() -if("servicediscovery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicediscovery) -endif() -if("shield" IN_LIST FEATURES) - list(APPEND BUILD_ONLY shield) -endif() -if("sms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sms) -endif() -if("snowball" IN_LIST FEATURES) - list(APPEND BUILD_ONLY snowball) -endif() -if("sns" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sns) -endif() -if("sqs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sqs) -endif() -if("ssm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm) -endif() -if("states" IN_LIST FEATURES) - list(APPEND BUILD_ONLY states) -endif() -if("storagegateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY storagegateway) -endif() -if("sts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sts) -endif() -if("support" IN_LIST FEATURES) - list(APPEND BUILD_ONLY support) -endif() -if("swf" IN_LIST FEATURES) - list(APPEND BUILD_ONLY swf) -endif() -if("text-to-speech" IN_LIST FEATURES) - list(APPEND BUILD_ONLY text-to-speech) -endif() -if("transcribe" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transcribe) -endif() -if("transfer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transfer) -endif() -if("translate" IN_LIST FEATURES) - list(APPEND BUILD_ONLY translate) -endif() -if("waf" IN_LIST FEATURES) - list(APPEND BUILD_ONLY waf) -endif() -if("waf-regional" IN_LIST FEATURES) - list(APPEND BUILD_ONLY waf-regional) -endif() -if("workdocs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workdocs) -endif() -if("workmail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workmail) -endif() -if("workspaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workspaces) -endif() -if("xray" IN_LIST FEATURES) - list(APPEND BUILD_ONLY xray) -endif() +# Automatically generated by generateFeatures.ps1 +if("access-management" IN_LIST FEATURES) + list(APPEND BUILD_ONLY access-management) +endif() +if("acm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY acm) +endif() +if("acm-pca" IN_LIST FEATURES) + list(APPEND BUILD_ONLY acm-pca) +endif() +if("alexaforbusiness" IN_LIST FEATURES) + list(APPEND BUILD_ONLY alexaforbusiness) +endif() +if("amplify" IN_LIST FEATURES) + list(APPEND BUILD_ONLY amplify) +endif() +if("apigateway" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apigateway) +endif() +if("apigatewaymanagementapi" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apigatewaymanagementapi) +endif() +if("apigatewayv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apigatewayv2) +endif() +if("application-autoscaling" IN_LIST FEATURES) + list(APPEND BUILD_ONLY application-autoscaling) +endif() +if("appmesh" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appmesh) +endif() +if("appstream" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appstream) +endif() +if("appsync" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appsync) +endif() +if("athena" IN_LIST FEATURES) + list(APPEND BUILD_ONLY athena) +endif() +if("autoscaling" IN_LIST FEATURES) + list(APPEND BUILD_ONLY autoscaling) +endif() +if("autoscaling-plans" IN_LIST FEATURES) + list(APPEND BUILD_ONLY autoscaling-plans) +endif() +if("AWSMigrationHub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY AWSMigrationHub) +endif() +if("awstransfer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY awstransfer) +endif() +if("backup" IN_LIST FEATURES) + list(APPEND BUILD_ONLY backup) +endif() +if("batch" IN_LIST FEATURES) + list(APPEND BUILD_ONLY batch) +endif() +if("budgets" IN_LIST FEATURES) + list(APPEND BUILD_ONLY budgets) +endif() +if("ce" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ce) +endif() +if("chime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime) +endif() +if("cloud9" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloud9) +endif() +if("clouddirectory" IN_LIST FEATURES) + list(APPEND BUILD_ONLY clouddirectory) +endif() +if("cloudformation" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudformation) +endif() +if("cloudfront" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudfront) +endif() +if("cloudhsm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudhsm) +endif() +if("cloudhsmv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudhsmv2) +endif() +if("cloudsearch" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudsearch) +endif() +if("cloudsearchdomain" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudsearchdomain) +endif() +if("cloudtrail" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudtrail) +endif() +if("codebuild" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codebuild) +endif() +if("codecommit" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codecommit) +endif() +if("codedeploy" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codedeploy) +endif() +if("codepipeline" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codepipeline) +endif() +if("codestar" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codestar) +endif() +if("cognito-identity" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cognito-identity) +endif() +if("cognito-idp" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cognito-idp) +endif() +if("cognito-sync" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cognito-sync) +endif() +if("comprehend" IN_LIST FEATURES) + list(APPEND BUILD_ONLY comprehend) +endif() +if("comprehendmedical" IN_LIST FEATURES) + list(APPEND BUILD_ONLY comprehendmedical) +endif() +if("config" IN_LIST FEATURES) + list(APPEND BUILD_ONLY config) +endif() +if("connect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connect) +endif() +if("cur" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cur) +endif() +if("datapipeline" IN_LIST FEATURES) + list(APPEND BUILD_ONLY datapipeline) +endif() +if("datasync" IN_LIST FEATURES) + list(APPEND BUILD_ONLY datasync) +endif() +if("dax" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dax) +endif() +if("devicefarm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY devicefarm) +endif() +if("directconnect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY directconnect) +endif() +if("discovery" IN_LIST FEATURES) + list(APPEND BUILD_ONLY discovery) +endif() +if("dlm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dlm) +endif() +if("dms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dms) +endif() +if("docdb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY docdb) +endif() +if("ds" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ds) +endif() +if("dynamodb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dynamodb) +endif() +if("dynamodbstreams" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dynamodbstreams) +endif() +if("ec2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ec2) +endif() +if("ecr" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ecr) +endif() +if("ecs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ecs) +endif() +if("eks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY eks) +endif() +if("elasticache" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticache) +endif() +if("elasticbeanstalk" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticbeanstalk) +endif() +if("elasticfilesystem" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticfilesystem) +endif() +if("elasticloadbalancing" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticloadbalancing) +endif() +if("elasticloadbalancingv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticloadbalancingv2) +endif() +if("elasticmapreduce" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticmapreduce) +endif() +if("elastictranscoder" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elastictranscoder) +endif() +if("email" IN_LIST FEATURES) + list(APPEND BUILD_ONLY email) +endif() +if("es" IN_LIST FEATURES) + list(APPEND BUILD_ONLY es) +endif() +if("events" IN_LIST FEATURES) + list(APPEND BUILD_ONLY events) +endif() +if("firehose" IN_LIST FEATURES) + list(APPEND BUILD_ONLY firehose) +endif() +if("fms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY fms) +endif() +if("fsx" IN_LIST FEATURES) + list(APPEND BUILD_ONLY fsx) +endif() +if("gamelift" IN_LIST FEATURES) + list(APPEND BUILD_ONLY gamelift) +endif() +if("glacier" IN_LIST FEATURES) + list(APPEND BUILD_ONLY glacier) +endif() +if("globalaccelerator" IN_LIST FEATURES) + list(APPEND BUILD_ONLY globalaccelerator) +endif() +if("glue" IN_LIST FEATURES) + list(APPEND BUILD_ONLY glue) +endif() +if("greengrass" IN_LIST FEATURES) + list(APPEND BUILD_ONLY greengrass) +endif() +if("guardduty" IN_LIST FEATURES) + list(APPEND BUILD_ONLY guardduty) +endif() +if("health" IN_LIST FEATURES) + list(APPEND BUILD_ONLY health) +endif() +if("iam" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iam) +endif() +if("identity-management" IN_LIST FEATURES) + list(APPEND BUILD_ONLY identity-management) +endif() +if("importexport" IN_LIST FEATURES) + list(APPEND BUILD_ONLY importexport) +endif() +if("inspector" IN_LIST FEATURES) + list(APPEND BUILD_ONLY inspector) +endif() +if("iot" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot) +endif() +if("iot-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot-data) +endif() +if("iot-jobs-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot-jobs-data) +endif() +if("iot1click-devices" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot1click-devices) +endif() +if("iot1click-projects" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot1click-projects) +endif() +if("iotanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotanalytics) +endif() +if("kafka" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kafka) +endif() +if("kinesis" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis) +endif() +if("kinesis-video-archived-media" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-archived-media) +endif() +if("kinesis-video-media" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-media) +endif() +if("kinesisanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesisanalytics) +endif() +if("kinesisanalyticsv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesisanalyticsv2) +endif() +if("kinesisvideo" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesisvideo) +endif() +if("kms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kms) +endif() +if("lambda" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lambda) +endif() +if("lex" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lex) +endif() +if("lex-models" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lex-models) +endif() +if("license-manager" IN_LIST FEATURES) + list(APPEND BUILD_ONLY license-manager) +endif() +if("lightsail" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lightsail) +endif() +if("logs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY logs) +endif() +if("machinelearning" IN_LIST FEATURES) + list(APPEND BUILD_ONLY machinelearning) +endif() +if("macie" IN_LIST FEATURES) + list(APPEND BUILD_ONLY macie) +endif() +if("marketplace-entitlement" IN_LIST FEATURES) + list(APPEND BUILD_ONLY marketplace-entitlement) +endif() +if("marketplacecommerceanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY marketplacecommerceanalytics) +endif() +if("mediaconnect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediaconnect) +endif() +if("mediaconvert" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediaconvert) +endif() +if("medialive" IN_LIST FEATURES) + list(APPEND BUILD_ONLY medialive) +endif() +if("mediapackage" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediapackage) +endif() +if("mediastore" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediastore) +endif() +if("mediastore-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediastore-data) +endif() +if("mediatailor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediatailor) +endif() +if("meteringmarketplace" IN_LIST FEATURES) + list(APPEND BUILD_ONLY meteringmarketplace) +endif() +if("mobile" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mobile) +endif() +if("mobileanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mobileanalytics) +endif() +if("monitoring" IN_LIST FEATURES) + list(APPEND BUILD_ONLY monitoring) +endif() +if("mq" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mq) +endif() +if("mturk-requester" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mturk-requester) +endif() +if("neptune" IN_LIST FEATURES) + list(APPEND BUILD_ONLY neptune) +endif() +if("opsworks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opsworks) +endif() +if("opsworkscm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opsworkscm) +endif() +if("organizations" IN_LIST FEATURES) + list(APPEND BUILD_ONLY organizations) +endif() +if("pi" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pi) +endif() +if("pinpoint" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pinpoint) +endif() +if("pinpoint-email" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pinpoint-email) +endif() +if("polly" IN_LIST FEATURES) + list(APPEND BUILD_ONLY polly) +endif() +if("pricing" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pricing) +endif() +if("queues" IN_LIST FEATURES) + list(APPEND BUILD_ONLY queues) +endif() +if("quicksight" IN_LIST FEATURES) + list(APPEND BUILD_ONLY quicksight) +endif() +if("ram" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ram) +endif() +if("rds" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rds) +endif() +if("rds-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rds-data) +endif() +if("redshift" IN_LIST FEATURES) + list(APPEND BUILD_ONLY redshift) +endif() +if("rekognition" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rekognition) +endif() +if("resource-groups" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resource-groups) +endif() +if("resourcegroupstaggingapi" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resourcegroupstaggingapi) +endif() +if("robomaker" IN_LIST FEATURES) + list(APPEND BUILD_ONLY robomaker) +endif() +if("route53" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53) +endif() +if("route53domains" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53domains) +endif() +if("route53resolver" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53resolver) +endif() +if("s3" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3) +endif() +if("s3-encryption" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3-encryption) +endif() +if("s3control" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3control) +endif() +if("sagemaker" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker) +endif() +if("sagemaker-runtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-runtime) +endif() +if("sdb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sdb) +endif() +if("secretsmanager" IN_LIST FEATURES) + list(APPEND BUILD_ONLY secretsmanager) +endif() +if("securityhub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY securityhub) +endif() +if("serverlessrepo" IN_LIST FEATURES) + list(APPEND BUILD_ONLY serverlessrepo) +endif() +if("servicecatalog" IN_LIST FEATURES) + list(APPEND BUILD_ONLY servicecatalog) +endif() +if("servicediscovery" IN_LIST FEATURES) + list(APPEND BUILD_ONLY servicediscovery) +endif() +if("shield" IN_LIST FEATURES) + list(APPEND BUILD_ONLY shield) +endif() +if("signer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY signer) +endif() +if("sms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sms) +endif() +if("sms-voice" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sms-voice) +endif() +if("snowball" IN_LIST FEATURES) + list(APPEND BUILD_ONLY snowball) +endif() +if("sns" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sns) +endif() +if("sqs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sqs) +endif() +if("ssm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ssm) +endif() +if("states" IN_LIST FEATURES) + list(APPEND BUILD_ONLY states) +endif() +if("storagegateway" IN_LIST FEATURES) + list(APPEND BUILD_ONLY storagegateway) +endif() +if("sts" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sts) +endif() +if("support" IN_LIST FEATURES) + list(APPEND BUILD_ONLY support) +endif() +if("swf" IN_LIST FEATURES) + list(APPEND BUILD_ONLY swf) +endif() +if("text-to-speech" IN_LIST FEATURES) + list(APPEND BUILD_ONLY text-to-speech) +endif() +if("transcribe" IN_LIST FEATURES) + list(APPEND BUILD_ONLY transcribe) +endif() +if("transfer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY transfer) +endif() +if("translate" IN_LIST FEATURES) + list(APPEND BUILD_ONLY translate) +endif() +if("waf" IN_LIST FEATURES) + list(APPEND BUILD_ONLY waf) +endif() +if("waf-regional" IN_LIST FEATURES) + list(APPEND BUILD_ONLY waf-regional) +endif() +if("workdocs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workdocs) +endif() +if("workmail" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workmail) +endif() +if("workspaces" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workspaces) +endif() +if("xray" IN_LIST FEATURES) + list(APPEND BUILD_ONLY xray) +endif() diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index a7b1b6a68..c4ad3be31 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -1,83 +1,84 @@ -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO aws/aws-sdk-cpp - REF 1.6.47 - SHA512 84d8ec8672f5de97735587aa25af410e77a4e827648379ab9683911133c2a05517e0a435fa1b8e0931cae8aa8f0e74500fa8ed8e75d493171919dfcc665bbf1c - HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) - -set(BUILD_ONLY core) - -include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) - -if(CMAKE_HOST_WIN32) - string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}") -else() - string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}") -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_UNITY_BUILD=ON - -DENABLE_TESTING=OFF - -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT} - -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE - "-DBUILD_ONLY=${BUILD_ONLY}" -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) - -vcpkg_copy_pdbs() - -file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") -foreach(AWS_TARGET IN LISTS AWS_TARGETS) - file(READ ${AWS_TARGET} _contents) - string(REGEX REPLACE - "bin\\/([A-Za-z0-9_.-]+\\.lib)" - "lib/\\1" - _contents "${_contents}") - file(WRITE ${AWS_TARGET} "${_contents}") -endforeach() - -file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") -list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") -foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) - file(READ "${AWS_CONFIG}" _contents) - file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") -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 - ${CURRENT_PACKAGES_DIR}/debug/nuget -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) - if(LIB_FILES) - file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(REMOVE ${LIB_FILES}) - endif() - file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) - if(DEBUG_LIB_FILES) - file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(REMOVE ${DEBUG_LIB_FILES}) - endif() - - file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") -endif() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright) +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aws/aws-sdk-cpp + REF 1.7.38 + SHA512 01f06d007a5a3d65d377b14e57f864c48020e7f109c4f84caf0ef2b37a5dd4843e12de88af68030c17f2ecb1f88da0f8a021b8bea94b812d43925783d4e219d2 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) + +set(BUILD_ONLY core) + +include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) + +if(CMAKE_HOST_WIN32) + string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}") +else() + string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_UNITY_BUILD=ON + -DENABLE_TESTING=OFF + -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT} + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + "-DBUILD_ONLY=${BUILD_ONLY}" + -DBUILD_DEPS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) + +vcpkg_copy_pdbs() + +file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") +foreach(AWS_TARGET IN LISTS AWS_TARGETS) + file(READ ${AWS_TARGET} _contents) + string(REGEX REPLACE + "bin\\/([A-Za-z0-9_.-]+\\.lib)" + "lib/\\1" + _contents "${_contents}") + file(WRITE ${AWS_TARGET} "${_contents}") +endforeach() + +file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") +list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") +foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) + file(READ "${AWS_CONFIG}" _contents) + file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") +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 + ${CURRENT_PACKAGES_DIR}/debug/nuget +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) + if(LIB_FILES) + file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE ${LIB_FILES}) + endif() + file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + if(DEBUG_LIB_FILES) + file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${DEBUG_LIB_FILES}) + endif() + + file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright) -- cgit v1.2.3 From bab298c970df72ab4dd202bfe3e163b97f8c9053 Mon Sep 17 00:00:00 2001 From: Daniel Marshall Date: Fri, 25 Jan 2019 21:07:17 +0000 Subject: Added port for effolkronium-random (#5203) --- ports/effolkronium-random/CONTROL | 3 +++ ports/effolkronium-random/portfile.cmake | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 ports/effolkronium-random/CONTROL create mode 100644 ports/effolkronium-random/portfile.cmake diff --git a/ports/effolkronium-random/CONTROL b/ports/effolkronium-random/CONTROL new file mode 100644 index 000000000..33e61c639 --- /dev/null +++ b/ports/effolkronium-random/CONTROL @@ -0,0 +1,3 @@ +Source: effolkronium-random +Version: 1.2.0 +Description: Random with a modern C++ API diff --git a/ports/effolkronium-random/portfile.cmake b/ports/effolkronium-random/portfile.cmake new file mode 100644 index 000000000..d96401e22 --- /dev/null +++ b/ports/effolkronium-random/portfile.cmake @@ -0,0 +1,25 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO effolkronium/random + REF v1.2.0 + SHA512 92c5447196601d7dfb0320b517494f4e75cb55011c800cd2f18655cd4ab867672ad39830a3dbb3fc5f39a41c8ae03b6a6910f1eac4a2f131cffca896554be561 + HEAD_REF master +) + +vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt "effolkronium_random" "effolkronium-random") +vcpkg_replace_string(${SOURCE_PATH}/cmake/config.cmake.in "effolkronium_random" "effolkronium-random") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRandom_BuildTests=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/effolkronium-random) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/effolkronium-random RENAME copyright) -- cgit v1.2.3 From af4e9288446b1237096d8cb91615fcb1aafaee84 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 26 Jan 2019 05:44:47 +0800 Subject: [xtl] Add new port (#5145) * [xtl] Add new port * [xtl] Update to 0.5.3 --- ports/xtl/CONTROL | 4 ++++ ports/xtl/portfile.cmake | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ports/xtl/CONTROL create mode 100644 ports/xtl/portfile.cmake diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL new file mode 100644 index 000000000..f5158ebe5 --- /dev/null +++ b/ports/xtl/CONTROL @@ -0,0 +1,4 @@ +Source: xtl +Version: 0.5.3 +Build-Depends: nlohmann-json +Description: The x template library. diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake new file mode 100644 index 000000000..23a6f9f44 --- /dev/null +++ b/ports/xtl/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xtl + REF 0.5.3 + SHA512 340e10a113d88be81833e8c123835de0fd30bc9b80387cd260edbff5e54ff2d78a72f77ec8803e3031f54f32c7f189a7afc9e0c1b7446fc6340a4482f308ccbf + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDOWNLOAD_GTEST=OFF + -DTF_BUILD_EXAMPLES=OFF + -DTF_BUILD_TESTS=OFF + -DTF_BUILD_BENCHMARKS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -- cgit v1.2.3 From 5e2cc262c631d67354d04cdc0312503186b387ab Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Sat, 26 Jan 2019 00:14:30 +0100 Subject: Update fmi4cpp to v0.5.3 (#5183) --- ports/fmi4cpp/CONTROL | 10 ++++++++-- ports/fmi4cpp/portfile.cmake | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL index 35090616d..38d3b8e7f 100644 --- a/ports/fmi4cpp/CONTROL +++ b/ports/fmi4cpp/CONTROL @@ -1,4 +1,10 @@ Source: fmi4cpp -Version: 0.4.0 +Version: 0.5.3 Description: FMI 2.0 implementation written in modern C++ -Build-Depends: boost-property-tree, boost-ublas, boost-odeint, bzip2 (linux), openssl (linux), libzip +Build-Depends: boost-property-tree, bzip2 (linux), openssl (linux), libzip, spdlog + +Feature: odeint +Build-Depends: boost-ublas, boost-odeint +Description: Adds support for wrapping Model Exchange models as Co-simulation models using odeint solvers + + diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake index 435ab2c51..676efea3e 100644 --- a/ports/fmi4cpp/portfile.cmake +++ b/ports/fmi4cpp/portfile.cmake @@ -14,18 +14,25 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO SFI-Mechatronics/FMI4cpp - REF v0.4.0 - SHA512 356485da5799a5720b3bea9bd935a76c36eb5c242cecfd2325f47175bad0eafa1e088fb1b96b639b8419e2a5a39f7b07fbe9d89d3f8e568e00b8910b7e991111 + REPO NTNU-IHB/FMI4cpp + REF v0.5.3 + SHA512 1c62f1fce4d3c0c18bc0a470827be13bc143ec8152ac75781e4d61d332b97389afc5943001e7cb8ae0ea7ebc141d88b00033de73a3d5696923a3f1c05f8ff904 HEAD_REF master ) +set(WITH_ODEINT OFF) +if("odeint" IN_LIST FEATURES) + set(WITH_ODEINT ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS + -DFMI4CPP_BUILD_TOOL=OFF -DFMI4CPP_BUILD_TESTS=OFF -DFMI4CPP_BUILD_EXAMPLES=OFF + -DFMI4CPP_WITH_ODEINT=${WITH_ODEINT} ) vcpkg_install_cmake() @@ -37,4 +44,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmi4cpp RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() -- cgit v1.2.3 From a26c95b0e30ece44ee84de6539feba4e73146a00 Mon Sep 17 00:00:00 2001 From: hlysunnaram Date: Sat, 26 Jan 2019 03:34:31 +0100 Subject: [gdal] update to 2.4.0 (#5195) * [gdal] update to 2.4.0 (#5132) * [gdal] update CONTROL file (#5132) --- ports/gdal/CONTROL | 2 +- ports/gdal/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 7686d13ab..810c12e41 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,5 +1,5 @@ Source: gdal -Version: 2.3.2 +Version: 2.4.0 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma Default-Features: mysql-libmysql diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3d46cbccc..d1ae296af 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,10 +1,10 @@ # vcpkg portfile.cmake for GDAL # # NOTE: update the version and checksum for new GDAL release -set(GDAL_VERSION_STR "2.3.2") -set(GDAL_VERSION_PKG "232") -set(GDAL_VERSION_LIB "203") -set(GDAL_PACKAGE_SUM "9eb26be57657b1f1eaada4794859584d53bd58e0d504eb12ab97e9c60353d0a565dc894a89829ee50fc549cb7d069a75b7895c0dd4cea887e010671f63e945b8") +set(GDAL_VERSION_STR "2.4.0") +set(GDAL_VERSION_PKG "240") +set(GDAL_VERSION_LIB "204") +set(GDAL_PACKAGE_SUM "a8543425d7bdbb5ab94638a490fe5b62e37983fbb89e1eea98b0e31d5fa76b7568e7b633c90ac429c87a6c9e8d9e1358b48428f3885aac8d574d1f01e9631f7f") if (TRIPLET_SYSTEM_ARCH MATCHES "arm") message(FATAL_ERROR "ARM is currently not supported.") -- cgit v1.2.3 From f154dad96e018e2835bb767c115eaf6a0bb94225 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Sat, 26 Jan 2019 21:45:54 +0100 Subject: [selene] Update to v0.3. (#5192) * [selene] Update to v0.3. Add libtiff as a dependency. Update release hash. Remove the `vcpkg_check_linkage` call, since the relevant symbols for shared libraries are now explicitly exported. * [selene] Update to v0.3.1. Also reinstate linkage check. --- ports/selene/CONTROL | 4 ++-- ports/selene/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/selene/CONTROL b/ports/selene/CONTROL index df460687e..ce266e859 100644 --- a/ports/selene/CONTROL +++ b/ports/selene/CONTROL @@ -1,4 +1,4 @@ Source: selene -Version: 0.2-1 +Version: 0.3.1 Description: A C++17 image representation, processing and I/O library. -Build-Depends: zlib, libpng, libjpeg-turbo +Build-Depends: zlib, libpng, libjpeg-turbo, tiff diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake index e427c99c2..97f05a38b 100644 --- a/ports/selene/portfile.cmake +++ b/ports/selene/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kmhofmann/selene - REF v0.2 - SHA512 9ec1c767541cbe0b349302b7db13a55869003a230669636b6bc37de01be833633be0741b80f58109140b9563b7a7f4c6a5b7ab46ecb142688170a47dba24bdc4 + REF v0.3.1 + SHA512 7bc57ebe9e2442da2716eb5c1af11f8d610b0b09fe96e3122d1028575732b6045a987c499bbf7de53003edd627b8809d86c80ea4975fc2264a1c61d5891a46c3 HEAD_REF master ) -- cgit v1.2.3 From 89c6f6ff892c45050ccc57d2ac8b08c80eda08c0 Mon Sep 17 00:00:00 2001 From: smlee-hdactech <43371933+smlee-hdactech@users.noreply.github.com> Date: Sun, 27 Jan 2019 05:55:11 +0900 Subject: [json-spirit] Add initial port (#5157) * [json-spirit] Add initial port * Modify PR to using pn85, enable some features json-spirit is a weird case because the main repo that package managers tend to use appears to not be actively maintained. Nevertheless, vcpkg tries to use the "official" source of a repository if at all possible. In order to do this, I've made the following changes to the PR: - I've changed the upstream REPO, REF, and SHA512. - I've passed options to disable building the demos and tests - I've made the project build only as a static library. The reason for this is that vcpkg does not support dynamical linkin. Another reason is that the library as it is in the repo does not have all the definitions correctly annotated.smlee-hdactech has made a PR against the major upstream repo to fix this, butwe are going to defer to the main repo until that change is accepted. --- ports/json-spirit/CONTROL | 4 ++++ ports/json-spirit/portfile.cmake | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 ports/json-spirit/CONTROL create mode 100644 ports/json-spirit/portfile.cmake diff --git a/ports/json-spirit/CONTROL b/ports/json-spirit/CONTROL new file mode 100644 index 000000000..dcfc407d7 --- /dev/null +++ b/ports/json-spirit/CONTROL @@ -0,0 +1,4 @@ +Source: json-spirit +Version: 4.1.0 +Description: json parser using boost library +Build-Depends: boost-config, boost-integer, boost-smart-ptr, boost-variant, boost-spirit diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake new file mode 100644 index 000000000..d33737d79 --- /dev/null +++ b/ports/json-spirit/portfile.cmake @@ -0,0 +1,23 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO png85/json_spirit + REF 5e16cca59b31d8beda0f07e3917ce11dcd43b3db + SHA512 6ac0f15726391c9003e516213535c8d30e98b6c33bca0b03e9bf38e7085824bfc6cfaab267b1dfccbfcc567638d26f722d7e331f4e3b60d3acd5c717cb1fafcc + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_STATIC_LIBS=on -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json-spirit RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_copy_pdbs() -- cgit v1.2.3 From 715aefc2138ae0c3577294cfd3e2bdf94126122d Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Sat, 26 Jan 2019 21:56:41 +0100 Subject: new port Spectralib 0.7.0 (#5129) * add CONTROL and portfile for spectralib 0.7.0 * Rename spectralib -> spectra I'm making this change based on the naming in the other repositories that the library is packaged in (DPorts, FreeBSD Ports) and the terminology used on the website. Code examples use Spectra* for the prefixes, so I think using "Spectra" is better than "spectralib". --- ports/spectra/CONTROL | 4 ++++ ports/spectra/portfile.cmake | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 ports/spectra/CONTROL create mode 100644 ports/spectra/portfile.cmake diff --git a/ports/spectra/CONTROL b/ports/spectra/CONTROL new file mode 100644 index 000000000..a53636ce7 --- /dev/null +++ b/ports/spectra/CONTROL @@ -0,0 +1,4 @@ +Source: spectra +Version: 0.7.0 +Description: A header-only C++ library for large scale eigenvalue problems https://spectralib.org +Build-Depends: eigen3 diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake new file mode 100644 index 000000000..66765259a --- /dev/null +++ b/ports/spectra/portfile.cmake @@ -0,0 +1,12 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yixuan/spectra + REF v0.7.0 + SHA512 2a1cd9eed6cebabb551cc2f662d38d75c6b24edc8f19ee4feb122958653ecb4533b936447d36712225b48a4f1aa6590b17ca5076d78d506a515e8701752bf32d + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spectra RENAME copyright) -- cgit v1.2.3 From da0fc542dcd9dd068dfe8efcf347036aaaf3ae2f Mon Sep 17 00:00:00 2001 From: Octavian Dima Date: Sat, 26 Jan 2019 22:01:25 +0100 Subject: Add sqlpp11 libraries (#4747) * Add sqlpp11 * Add sqlpp11-connector-mysql * Add sqlpp11-connector-sqlite3 * Apply a patch for MSVC --- ports/sqlpp11-connector-mysql/CONTROL | 4 ++++ ports/sqlpp11-connector-mysql/portfile.cmake | 26 ++++++++++++++++++++++++ ports/sqlpp11-connector-sqlite3/CONTROL | 4 ++++ ports/sqlpp11-connector-sqlite3/portfile.cmake | 24 ++++++++++++++++++++++ ports/sqlpp11/CONTROL | 4 ++++ ports/sqlpp11/FixForMSVC.patch | 24 ++++++++++++++++++++++ ports/sqlpp11/portfile.cmake | 28 ++++++++++++++++++++++++++ 7 files changed, 114 insertions(+) create mode 100644 ports/sqlpp11-connector-mysql/CONTROL create mode 100644 ports/sqlpp11-connector-mysql/portfile.cmake create mode 100644 ports/sqlpp11-connector-sqlite3/CONTROL create mode 100644 ports/sqlpp11-connector-sqlite3/portfile.cmake create mode 100644 ports/sqlpp11/CONTROL create mode 100644 ports/sqlpp11/FixForMSVC.patch create mode 100644 ports/sqlpp11/portfile.cmake diff --git a/ports/sqlpp11-connector-mysql/CONTROL b/ports/sqlpp11-connector-mysql/CONTROL new file mode 100644 index 000000000..690e9d1ab --- /dev/null +++ b/ports/sqlpp11-connector-mysql/CONTROL @@ -0,0 +1,4 @@ +Source: sqlpp11-connector-mysql +Version: 0.25 +Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11. +Build-Depends: date, libmariadb, sqlpp11 \ No newline at end of file diff --git a/ports/sqlpp11-connector-mysql/portfile.cmake b/ports/sqlpp11-connector-mysql/portfile.cmake new file mode 100644 index 000000000..37b8ca147 --- /dev/null +++ b/ports/sqlpp11-connector-mysql/portfile.cmake @@ -0,0 +1,26 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbock/sqlpp11-connector-mysql + REF 0.25 + SHA512 1351161eff5ecc3c2bc720f537e474fadc8f4843999e33274a9b1bccf21fd2b5785eb9588dedc951dcf1c09e4a90c8e2193e9046a43a1bc9d355045aaec71740 + HEAD_REF master +) + +# Use sqlpp11-connector-mysql's own build process, skipping tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_TESTS:BOOL=OFF + -DDATE_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright) diff --git a/ports/sqlpp11-connector-sqlite3/CONTROL b/ports/sqlpp11-connector-sqlite3/CONTROL new file mode 100644 index 000000000..35a65250b --- /dev/null +++ b/ports/sqlpp11-connector-sqlite3/CONTROL @@ -0,0 +1,4 @@ +Source: sqlpp11-connector-sqlite3 +Version: 0.29 +Description: A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11. +Build-Depends: date, sqlite3, sqlpp11 \ No newline at end of file diff --git a/ports/sqlpp11-connector-sqlite3/portfile.cmake b/ports/sqlpp11-connector-sqlite3/portfile.cmake new file mode 100644 index 000000000..6937abff2 --- /dev/null +++ b/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbock/sqlpp11-connector-sqlite3 + REF 0.29 + SHA512 99d1b36209dc879b12b99ed0809f1d21f760c62c25aa32d8f83b571d0819e35783ad20be0754288da9cd5fcb81cbb672031928d159ff9a64c3635dcbc4bda8fa + HEAD_REF master +) + +# Use sqlpp11-connector-sqlite3's own build process, skipping tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_TESTS:BOOL=OFF + -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright) diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL new file mode 100644 index 000000000..7c75d17d9 --- /dev/null +++ b/ports/sqlpp11/CONTROL @@ -0,0 +1,4 @@ +Source: sqlpp11 +Version: 0.57 +Description: A type safe embedded domain specific language for SQL queries and results in C++. +Build-Depends: date \ No newline at end of file diff --git a/ports/sqlpp11/FixForMSVC.patch b/ports/sqlpp11/FixForMSVC.patch new file mode 100644 index 000000000..753590707 --- /dev/null +++ b/ports/sqlpp11/FixForMSVC.patch @@ -0,0 +1,24 @@ +diff --git a/include/sqlpp11/char_sequence.h b/include/sqlpp11/char_sequence.h +index 5759525..96cdbd0 100644 +--- a/include/sqlpp11/char_sequence.h ++++ b/include/sqlpp11/char_sequence.h +@@ -54,16 +54,16 @@ namespace sqlpp + } + }; + +- template ++ template + struct make_char_sequence_impl; + +- template ++ template + struct make_char_sequence_impl> + { + using type = char_sequence; + }; + +- template ++ template + using make_char_sequence = + typename make_char_sequence_impl>::type; + } // namespace sqlpp diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake new file mode 100644 index 000000000..61b930da5 --- /dev/null +++ b/ports/sqlpp11/portfile.cmake @@ -0,0 +1,28 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbock/sqlpp11 + REF 0.57 + SHA512 6bf48189f35cf2ff20b09e27ab83b6fb36415bed7e5c818c1ea2c9b30b5fe0a60c0f7e9930e92a0637c7b567ccfead4a9208a3aff99be89fed361778cf8c45f1 + HEAD_REF master + PATCHES FixForMSVC.patch +) + +# Use sqlpp11's own build process, skipping tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_TESTS:BOOL=OFF +) + +vcpkg_install_cmake() + +# Move CMake config files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +# Delete redundant and unnecessary directories +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11 RENAME copyright) -- cgit v1.2.3 From bbb8efe794ca72f9102c976343b3dcca87056e96 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Sat, 26 Jan 2019 17:45:27 -0500 Subject: [freetype] Add mirror (#5073) --- ports/freetype/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index e60f9ecb3..13926dd19 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) set(FT_VERSION 2.8.1) vcpkg_download_distfile(ARCHIVE - URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2" + URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2" "https://downloads.sourceforge.net/project/freetype/freetype2/${FT_VERSION}/freetype-${FT_VERSION}.tar.bz2" FILENAME "freetype-${FT_VERSION}.tar.bz2" SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823 ) -- cgit v1.2.3 From ebb2d1a44fa74f4928bfb1e229e343bd4a721472 Mon Sep 17 00:00:00 2001 From: Todor Prokopov Date: Sun, 27 Jan 2019 02:28:29 +0200 Subject: [amqpcpp] Add new port (#5201) * [amqpcpp] Add new port * Force static linkage for amqpcpp The documentation for this library says that shared linkage on Windows is unsupported. Furthermore, the build currently errors out on Windows because shared DLLs are not placed correctly. vcpkg only supports static linkage on Linux and macOS, so I'm categorically making amqpcpp build with static linkage on all platforms. This unifies the platforms and gives consistent behavior --- ports/amqpcpp/CONTROL | 4 ++++ ports/amqpcpp/find-openssl.patch | 16 ++++++++++++++++ ports/amqpcpp/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 ports/amqpcpp/CONTROL create mode 100644 ports/amqpcpp/find-openssl.patch create mode 100644 ports/amqpcpp/portfile.cmake diff --git a/ports/amqpcpp/CONTROL b/ports/amqpcpp/CONTROL new file mode 100644 index 000000000..3cf199118 --- /dev/null +++ b/ports/amqpcpp/CONTROL @@ -0,0 +1,4 @@ +Source: amqpcpp +Version: 4.1.2 +Description: AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker +Build-Depends: openssl (linux) diff --git a/ports/amqpcpp/find-openssl.patch b/ports/amqpcpp/find-openssl.patch new file mode 100644 index 000000000..ad841edd3 --- /dev/null +++ b/ports/amqpcpp/find-openssl.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 645bb32..3ef5c4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,6 +89,11 @@ else() + add_library(${PROJECT_NAME} STATIC ${src_MAIN} ${src_LINUX_TCP}) + endif() + ++if(AMQP-CPP_LINUX_TCP) ++ find_path(OPENSSL_INCLUDE_DIR openssl/ssl.h) ++ include_directories(${OPENSSL_INCLUDE_DIR}) ++endif() ++ + # install rules + # ------------------------------------------------------------------------------------------------------ + diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake new file mode 100644 index 000000000..64b02f686 --- /dev/null +++ b/ports/amqpcpp/portfile.cmake @@ -0,0 +1,34 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CopernicaMarketingSoftware/AMQP-CPP + REF v4.1.2 + SHA512 e2015d3958d434532591f9a304c625bdebb9bb075af1e2b684c9b8b061df8a2fd6a407200c802ad7b88ee954bcdad854f44a43512f76adf225addf145fc0fb44 + HEAD_REF master + PATCHES + find-openssl.patch +) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(LINUX_TCP ON) +else() + set(LINUX_TCP OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DAMQP-CPP_BUILD_SHARED=OFF + -DAMQP-CPP_LINUX_TCP=${LINUX_TCP} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/amqpcpp RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -- cgit v1.2.3 From 65d866786a3d32ab5791bf8ec16ee219540f0648 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sun, 27 Jan 2019 08:31:21 +0800 Subject: [xsimd] Add new port (#5194) * [xsimd] Add new port * Add a header include guard to xsimd's algorithm.hpp algorithm.hpp is not guarded by a header include guard, which can cause difficulty for users. xhihaoy asked that we be sure to include this patch because it caused a lot of pain. --- ports/xsimd/CONTROL | 7 ++++++ ports/xsimd/PatchHeaderIncludeGuard.patch | 24 +++++++++++++++++++ ports/xsimd/portfile.cmake | 40 +++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 ports/xsimd/CONTROL create mode 100644 ports/xsimd/PatchHeaderIncludeGuard.patch create mode 100644 ports/xsimd/portfile.cmake diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL new file mode 100644 index 000000000..f75d920ab --- /dev/null +++ b/ports/xsimd/CONTROL @@ -0,0 +1,7 @@ +Source: xsimd +Version: 7.1.2 +Description: Modern, portable C++ wrappers for SIMD intrinsics + +Feature: xcomplex +Description: xtl complex support +Build-Depends: xtl diff --git a/ports/xsimd/PatchHeaderIncludeGuard.patch b/ports/xsimd/PatchHeaderIncludeGuard.patch new file mode 100644 index 000000000..73ba4a9bf --- /dev/null +++ b/ports/xsimd/PatchHeaderIncludeGuard.patch @@ -0,0 +1,24 @@ +diff --git a/include/xsimd/stl/algorithms.hpp b/include/xsimd/stl/algorithms.hpp +index 4cb2b79..1590b89 100644 +--- a/include/xsimd/stl/algorithms.hpp ++++ b/include/xsimd/stl/algorithms.hpp +@@ -6,6 +6,9 @@ + * The full license is in the file LICENSE, distributed with this software. * + ****************************************************************************/ + ++#ifndef XSIMD_ALGORITHMS_HPP ++#define XSIMD_ALGORITHMS_HPP ++ + #include "xsimd/memory/xsimd_load_store.hpp" + + namespace xsimd +@@ -126,4 +129,6 @@ namespace xsimd + + #undef XSIMD_LOOP_MACRO + } +-} +\ No newline at end of file ++} ++ ++#endif +\ No newline at end of file diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake new file mode 100644 index 000000000..7e128cd8f --- /dev/null +++ b/ports/xsimd/portfile.cmake @@ -0,0 +1,40 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xsimd + REF 7.1.2 + SHA512 9479eb6188a68388d470e38ec7b08aaeeb03a1028a574258b52e1c39ce0b1b1aaf97a5cb898447f68c989badd23903ba7a059f5daf59160c660ba751d668c0eb + HEAD_REF master + PATCHES PatchHeaderIncludeGuard.patch +) + +if("xcomplex" IN_LIST FEATURES) + set(ENABLE_XTL_COMPLEX ON) +else() + set(ENABLE_XTL_COMPLEX OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_FALLBACK=OFF + -DENABLE_XTL_COMPLEX=${ENABLE_XTL_COMPLEX} + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +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) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 54abff84a1d7e2d37f46d4a61141de6734d60a1f Mon Sep 17 00:00:00 2001 From: Nicolai Grodzitski Date: Sun, 27 Jan 2019 03:35:48 +0300 Subject: Update RESTinio to v.0.4.8.5. (#5235) --- ports/restinio/CONTROL | 2 +- ports/restinio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL index 5b41dfb39..83752b6c4 100644 --- a/ports/restinio/CONTROL +++ b/ports/restinio/CONTROL @@ -1,4 +1,4 @@ Source: restinio -Version: 0.4.8.4 +Version: 0.4.8.5 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests. Build-Depends: asio, fmt, http-parser diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 7acf213b7..8d5d07615 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO sobjectizerteam/restinio-0.4 - REF v.0.4.8.4 - SHA512 de3461ad5b4315d2b5846063cb69d57a14da29f80652d38a6fe96d27d05586d76363053af3284db97c0c9c6da02038960f2812697737eb23a02006e491fb57f7 + REF v.0.4.8.5 + SHA512 e689033360af9a50f9e8c22e0852fa1ce5a7199484d8fc629570c6511f49b480434ee51efe2ae0f768f3e351e401ba100fd794657c5340e5750b4c5c19e37d71 ) vcpkg_configure_cmake( -- cgit v1.2.3 From 01a64a9371adeab3b3a2f297ed3639fc8e0c65b2 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sun, 27 Jan 2019 08:44:25 +0800 Subject: [xtensor] Add new port (#5196) --- ports/xtensor/CONTROL | 12 +++++++++++ ports/xtensor/portfile.cmake | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 ports/xtensor/CONTROL create mode 100644 ports/xtensor/portfile.cmake diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL new file mode 100644 index 000000000..01614cba0 --- /dev/null +++ b/ports/xtensor/CONTROL @@ -0,0 +1,12 @@ +Source: xtensor +Version: 2019-01-20 +Description: C++ tensors with broadcasting and lazy computing +Build-Depends: nlohmann-json, xtl + +Feature: xsimd +Description: xtensor with xsimd support +Build-Depends: xsimd + +Feature: tbb +Description: xtensor with tbb support +Build-Depends: tbb diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake new file mode 100644 index 000000000..795bb3ce8 --- /dev/null +++ b/ports/xtensor/portfile.cmake @@ -0,0 +1,51 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xtensor + REF ca0cfdbde852ee61a3ef20076e2733030f3d6479 + SHA512 d960a3c1c3e6c9250c6bc5ed4e641486980a3ffa4179696eabb92fee50673901324cd2174b76cbd74ab07e6f3c175a26cb564b3087863602c3dce0a83a263da6 + HEAD_REF master +) + +if("xsimd" IN_LIST FEATURES) + set(XTENSOR_USE_XSIMD ON) +else() + set(XTENSOR_USE_XSIMD OFF) +endif() + +if("tbb" IN_LIST FEATURES) + set(XTENSOR_USE_TBB ON) +else() + set(XTENSOR_USE_TBB OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DXTENSOR_USE_XSIMD=${XTENSOR_USE_XSIMD} + -DXTENSOR_USE_TBB=${XTENSOR_USE_TBB} + -DXTENSOR_ENABLE_ASSERT=OFF + -DXTENSOR_CHECK_DIMENSION=OFF + -DBUILD_TESTS=OFF + -DBUILD_BENCHMARK=OFF + -DDOWNLOAD_GTEST=OFF + -DDOWNLOAD_GBENCHMARK=OFF + -DDEFAULT_COLUMN_MAJOR=OFF + -DDISABLE_VS2017=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +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) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 7ec45860e0e5d7e6f5be1c0ab42b4ed824bd9698 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Sun, 27 Jan 2019 21:56:38 +0300 Subject: [cli11] Update to 1.7.0 (#5241) --- ports/cli11/CONTROL | 2 +- ports/cli11/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index 1e75d2a70..74f611944 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,3 @@ Source: cli11 -Version: 1.6.2 +Version: 1.7.0 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 08fb83dc9..4752f5973 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.6.2 - SHA512 0160323a7a87ecdf5cff081a4270a30977b87f0592041d8fde84ec655b28cdbc40813567f95df375a4f6f953b60a638deacfb3cc5dec562c4d348dcc532f0ab7 + REF v1.7.0 + SHA512 e8a1fa8c09c2c2e4d805c5faa119f5d3d2bd3d18ca6bbc28be8890adbc53ea8c53a5b73ee2911fff7dadef6b0d4b870b1b574367ed520a790ee6ce34cbfe9c59 HEAD_REF master ) -- cgit v1.2.3 From b3a450578b118c00db0e56c771056140f20d5366 Mon Sep 17 00:00:00 2001 From: Thibaut Date: Sun, 27 Jan 2019 20:04:16 +0100 Subject: [tsl-hopscotch-map] Add new port. (#5233) * [tsl-hopscotch-map] Add new port. * Use PORT variable instead of hard coded tsl-hopscotch-map. --- ports/tsl-hopscotch-map/CONTROL | 3 +++ ports/tsl-hopscotch-map/portfile.cmake | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ports/tsl-hopscotch-map/CONTROL create mode 100644 ports/tsl-hopscotch-map/portfile.cmake diff --git a/ports/tsl-hopscotch-map/CONTROL b/ports/tsl-hopscotch-map/CONTROL new file mode 100644 index 000000000..91f048054 --- /dev/null +++ b/ports/tsl-hopscotch-map/CONTROL @@ -0,0 +1,3 @@ +Source: tsl-hopscotch-map +Version: 2.2.0 +Description: C++ implementation of a fast hash map and hash set using hopscotch hashing diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake new file mode 100644 index 000000000..2542360a3 --- /dev/null +++ b/ports/tsl-hopscotch-map/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/hopscotch-map + REF v2.2.0 + SHA512 a3cd0fe47ff16de6d556c24e0bd96e420c1f06f2e44388e4f223fd8cf30a6cf0af20ade46af46f8cb5bbfd86a0fce2ca65658999cc2c14f4998d949f12afff2f +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) -- cgit v1.2.3 From 9e9a05b377308e0553acb2f381ee8deafb878076 Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Sun, 27 Jan 2019 13:29:46 -0600 Subject: [xtensor-blas] Add new port (#5240) This accomplishes #5140 by making the linalg namespace works. --- ports/xtensor-blas/CONTROL | 4 ++++ ports/xtensor-blas/portfile.cmake | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 ports/xtensor-blas/CONTROL create mode 100644 ports/xtensor-blas/portfile.cmake diff --git a/ports/xtensor-blas/CONTROL b/ports/xtensor-blas/CONTROL new file mode 100644 index 000000000..578687b8e --- /dev/null +++ b/ports/xtensor-blas/CONTROL @@ -0,0 +1,4 @@ +Source: xtensor-blas +Version: 0.15.1 +Description: BLAS extension to xtensor +Build-Depends: xtensor diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake new file mode 100644 index 000000000..ad5991af7 --- /dev/null +++ b/ports/xtensor-blas/portfile.cmake @@ -0,0 +1,37 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xtensor-blas + REF 0.15.1 + SHA512 c80def1cc106efec1ee4c33f3724b6b63af4c826e45e2a5a8dc066d368867b3a1d909ae490e09c615c2119b3aad3ef5b739fe86925d0229a69329ddee09c3d66 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_RELEASE -DCXXBLAS_DEBUG=OFF + OPTIONS_DEBUG -DCXXBLAS_DEBUG=ON + OPTIONS + -DXTENSOR_USE_FLENS_BLAS=OFF + -DBUILD_TESTS=OFF + -DBUILD_BENCHMARK=OFF + -DDOWNLOAD_GTEST=OFF + -DDOWNLOAD_GBENCHMARK=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xflens/cxxblas/netlib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 581fd4501bb9e107f33bf971d474f1a8c9fc10a5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 28 Jan 2019 15:37:23 -0800 Subject: [vcpkg_find_acquire_program] Improve robustness of finding bison --- 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 0c3a9bca2..87b6fb4fe 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -155,7 +155,7 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) - if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4" AND SUBDIR STREQUAL "win_flex-2.5.16") + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4") file(REMOVE_RECURSE "${PATHS}") endif() else() @@ -171,6 +171,9 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4") + file(REMOVE_RECURSE "${PATHS}") + endif() else() set(PROGNAME bison) set(APT_PACKAGE_NAME bison) -- cgit v1.2.3 From 2c4d4f2a47b3ee8678f9bb871a70fcffafb9c77c Mon Sep 17 00:00:00 2001 From: RT222 Date: Tue, 29 Jan 2019 02:41:57 +0100 Subject: [nano-signal-slot] (#5243) Initial port --- ports/nano-signal-slot/CONTROL | 3 +++ ports/nano-signal-slot/portfile.cmake | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 ports/nano-signal-slot/CONTROL create mode 100644 ports/nano-signal-slot/portfile.cmake diff --git a/ports/nano-signal-slot/CONTROL b/ports/nano-signal-slot/CONTROL new file mode 100644 index 000000000..dbccb32b7 --- /dev/null +++ b/ports/nano-signal-slot/CONTROL @@ -0,0 +1,3 @@ +Source: nano-signal-slot +Version: commit-25aa2aa90d450d3c7550c535c7993a9e2ed0764a +Description: Pure C++17 Signals and Slots diff --git a/ports/nano-signal-slot/portfile.cmake b/ports/nano-signal-slot/portfile.cmake new file mode 100644 index 000000000..55a879d1d --- /dev/null +++ b/ports/nano-signal-slot/portfile.cmake @@ -0,0 +1,22 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage( + ONLY_STATIC_LIBRARY +) + +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + message(FATAL_ERROR "Error: UWP builds not supported yet.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NoAvailableAlias/nano-signal-slot + REF 25aa2aa90d450d3c7550c535c7993a9e2ed0764a + SHA512 35dc9d0d9cce116a5bcea59ab9562c87dba9f6db999807ccbef7df1fb05513eaa71132ba2996eb43f0f241288096419892ac31a400ec6cb5013438e6b670194d + HEAD_REF master +) + +file(GLOB INCLUDES ${SOURCE_PATH}/*.hpp) +file(INSTALL ${INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nano-signal-slot RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From d48cf920a40d54c9e8addc1929a7c07e4374ac64 Mon Sep 17 00:00:00 2001 From: newbie Date: Tue, 29 Jan 2019 09:59:29 +0800 Subject: add seqan library for vcpkg (#5238) --- ports/seqan/CONTROL | 3 +++ ports/seqan/portfile.cmake | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 ports/seqan/CONTROL create mode 100644 ports/seqan/portfile.cmake diff --git a/ports/seqan/CONTROL b/ports/seqan/CONTROL new file mode 100644 index 000000000..09185ccf4 --- /dev/null +++ b/ports/seqan/CONTROL @@ -0,0 +1,3 @@ +Source: seqan +Version: 2.4.0 +Description: SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data. diff --git a/ports/seqan/portfile.cmake b/ports/seqan/portfile.cmake new file mode 100644 index 000000000..8741a7090 --- /dev/null +++ b/ports/seqan/portfile.cmake @@ -0,0 +1,14 @@ +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/seqan-library-2.4.0) +vcpkg_download_distfile(ARCHIVE + URLS "http://packages.seqan.de/seqan-library/seqan-library-2.4.0.zip" + FILENAME "seqan-library-2.4.0.zip" + SHA512 9a1b4fe9dff9ad49a8761798a6a6eaeebce683ccb5e2dd78ea4b8829093918606830a16ea458d67bf3f652531ddc55b550c12cb257be913bb187c8940d96a575 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/share/doc/seqan/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/seqan RENAME copyright) + +# Copy the seqan header files +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") -- cgit v1.2.3 From 373884761c6f4916530c38bd2fdce811311a259e Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 16 Nov 2018 21:24:03 +0800 Subject: [stxxl] Add new port --- ports/stxxl/CONTROL | 3 +++ ports/stxxl/portfile.cmake | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 ports/stxxl/CONTROL create mode 100644 ports/stxxl/portfile.cmake diff --git a/ports/stxxl/CONTROL b/ports/stxxl/CONTROL new file mode 100644 index 000000000..e8541a27d --- /dev/null +++ b/ports/stxxl/CONTROL @@ -0,0 +1,3 @@ +Source: stxxl +Version: 2018-11-15 +Description: Standard Template Library for Extra Large Data Sets diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake new file mode 100644 index 000000000..af574d287 --- /dev/null +++ b/ports/stxxl/portfile.cmake @@ -0,0 +1,66 @@ +include(vcpkg_common_functions) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message("stxxl currently only supports static library linkage.") + set(VCPKG_LIBRARY_LINKAGE static) + set(VCPKG_CRT_LINKAGE static) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stxxl/stxxl + REF b9e44f0ecba7d7111fbb33f3330c3e53f2b75236 + SHA512 800a8fb95b52b21256cecb848f95645c54851f4dc070e0cd64fb5009f7663c0c962a24ca3f246e54d6d45e81a5c734309268d7ea6f0b0987336a50a3dcb99616 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_STATIC_LIBS=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_EXTRAS=OFF + -DUSE_BOOST=OFF + -DTRY_COMPILE_HEADERS=OFF + -DUSE_STD_THREADS=ON + -DNO_CXX11=OFF + -DUSE_VALGRIND=OFF + -DUSE_MALLOC_COUNT=OFF + -DUSE_GCOV=OFF + -DUSE_TPIE=OFF + OPTIONS_DEBUG + -DSTXXL_DEBUG_ASSERTIONS=ON + OPTIONS_RELEASE + -DSTXXL_DEBUG_ASSERTIONS=OFF +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +endif() + +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/bin) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 6f189f10142eae2eb24dcfdf035015fc51950b20 Mon Sep 17 00:00:00 2001 From: Mark Ian Holland Date: Tue, 29 Jan 2019 19:09:38 +0000 Subject: [vcglib] inital port (#4626) --- ports/vcglib/CONTROL | 4 + ports/vcglib/consume-vcpkg-eigen3.patch | 225 ++++++++++++++++++++++++++++++++ ports/vcglib/portfile.cmake | 15 +++ 3 files changed, 244 insertions(+) create mode 100644 ports/vcglib/CONTROL create mode 100644 ports/vcglib/consume-vcpkg-eigen3.patch create mode 100644 ports/vcglib/portfile.cmake diff --git a/ports/vcglib/CONTROL b/ports/vcglib/CONTROL new file mode 100644 index 000000000..7f52548f4 --- /dev/null +++ b/ports/vcglib/CONTROL @@ -0,0 +1,4 @@ +Source: vcglib +Version: 1.0.1 +Description: library for manipulation, processing, cleaning, simplifying triangle meshes. +Build-Depends: eigen3 \ No newline at end of file diff --git a/ports/vcglib/consume-vcpkg-eigen3.patch b/ports/vcglib/consume-vcpkg-eigen3.patch new file mode 100644 index 000000000..35e9f5537 --- /dev/null +++ b/ports/vcglib/consume-vcpkg-eigen3.patch @@ -0,0 +1,225 @@ +diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h +index 5b9d858..f091b4b 100644 +--- a/vcg/complex/algorithms/curve_on_manifold.h ++++ b/vcg/complex/algorithms/curve_on_manifold.h +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/vcg/complex/algorithms/harmonic.h b/vcg/complex/algorithms/harmonic.h +index d004d7b..13d5167 100644 +--- a/vcg/complex/algorithms/harmonic.h ++++ b/vcg/complex/algorithms/harmonic.h +@@ -24,7 +24,7 @@ + #define __VCGLIB_HARMONIC_FIELD + + #include +-#include ++#include + + namespace vcg { + namespace tri { +diff --git a/vcg/complex/algorithms/implicit_smooth.h b/vcg/complex/algorithms/implicit_smooth.h +index 2e1e24f..76311e2 100644 +--- a/vcg/complex/algorithms/implicit_smooth.h ++++ b/vcg/complex/algorithms/implicit_smooth.h +@@ -23,7 +23,7 @@ + #ifndef __VCG_IMPLICIT_SMOOTHER + #define __VCG_IMPLICIT_SMOOTHER + +-#include ++#include + #include + #include + #include +diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h +index 41b5a29..f25d6f9 100644 +--- a/vcg/complex/algorithms/inertia.h ++++ b/vcg/complex/algorithms/inertia.h +@@ -24,8 +24,8 @@ + #define _VCG_INERTIA_ + + +-#include +-#include ++#include ++#include + #include + + namespace vcg +diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h +index cf5c36d..3b8f1a5 100644 +--- a/vcg/complex/algorithms/parametrization/poisson_solver.h ++++ b/vcg/complex/algorithms/parametrization/poisson_solver.h +@@ -24,7 +24,7 @@ + #ifndef VCG_POISSON_SOLVER + #define VCG_POISSON_SOLVER + +-#include ++#include + + #include + #include +diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h +index 441121b..0a96146 100644 +--- a/vcg/complex/algorithms/update/curvature.h ++++ b/vcg/complex/algorithms/update/curvature.h +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + namespace vcg { + namespace tri { +diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h +index b2b8c63..ab04b6b 100644 +--- a/vcg/complex/algorithms/update/curvature_fitting.h ++++ b/vcg/complex/algorithms/update/curvature_fitting.h +@@ -38,11 +38,11 @@ + #include + #include + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + + namespace vcg { +diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h +index bd2c94f..fd837d7 100644 +--- a/vcg/complex/algorithms/update/fitmaps.h ++++ b/vcg/complex/algorithms/update/fitmaps.h +@@ -34,10 +34,10 @@ + #include + #include "vcg/complex/algorithms/update/curvature_fitting.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include + +diff --git a/vcg/math/eigen.h b/vcg/math/eigen.h +index 5cae402..81f32ff 100644 +--- a/vcg/math/eigen.h ++++ b/vcg/math/eigen.h +@@ -53,10 +53,10 @@ struct ei_to_vcgtype; + } + + #include "base.h" +-#include "../../eigenlib/Eigen/LU" +-#include "../../eigenlib/Eigen/Geometry" +-#include "../../eigenlib/Eigen/Array" +-#include "../../eigenlib/Eigen/Core" ++#include "../../eigen3/Eigen/LU" ++#include "../../eigen3/Eigen/Geometry" ++#include "../../eigen3/Eigen/Array" ++#include "../../eigen3/Eigen/Core" + + // add support for unsigned char and short int + namespace Eigen { +diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h +index a138e57..5291e0e 100644 +--- a/vcg/math/matrix44.h ++++ b/vcg/math/matrix44.h +@@ -30,8 +30,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + + namespace vcg { + +diff --git a/vcg/math/polar_decomposition.h b/vcg/math/polar_decomposition.h +index deabf86..bd725d1 100644 +--- a/vcg/math/polar_decomposition.h ++++ b/vcg/math/polar_decomposition.h +@@ -26,8 +26,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + + namespace vcg{ + +diff --git a/vcg/math/quadric.h b/vcg/math/quadric.h +index 8522056..99a9de1 100644 +--- a/vcg/math/quadric.h ++++ b/vcg/math/quadric.h +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + + namespace vcg { + namespace math { +diff --git a/vcg/space/fitting3.h b/vcg/space/fitting3.h +index e9e238a..6861969 100644 +--- a/vcg/space/fitting3.h ++++ b/vcg/space/fitting3.h +@@ -29,8 +29,8 @@ + #include + #include + +-#include +-#include ++#include ++#include + + namespace vcg { + +diff --git a/vcg/space/point_matching.h b/vcg/space/point_matching.h +index e9ac0ff..c6ff376 100644 +--- a/vcg/space/point_matching.h ++++ b/vcg/space/point_matching.h +@@ -27,8 +27,8 @@ + #include + #include + +-#include +-#include ++#include ++#include + #include + + namespace vcg +diff --git a/wrap/igl/smooth_field.h b/wrap/igl/smooth_field.h +index e1208cf..a403d54 100644 +--- a/wrap/igl/smooth_field.h ++++ b/wrap/igl/smooth_field.h +@@ -25,7 +25,7 @@ + #define SMOOTHER_FIELD_H + + //eigen stuff +-#include ++#include + + //vcg stuff + #include diff --git a/ports/vcglib/portfile.cmake b/ports/vcglib/portfile.cmake new file mode 100644 index 000000000..5389a69fb --- /dev/null +++ b/ports/vcglib/portfile.cmake @@ -0,0 +1,15 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cnr-isti-vclab/vcglib + REF v1.0.1 + SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 + PATCHES consume-vcpkg-eigen3.patch + ) + +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vcglib/copyright COPYONLY) + +file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg) +file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap) +file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img) -- cgit v1.2.3 From 2f875f461b49e30d631503d9841f10e5c1509e88 Mon Sep 17 00:00:00 2001 From: smlee-hdactech <43371933+smlee-hdactech@users.noreply.github.com> Date: Wed, 30 Jan 2019 05:42:10 +0900 Subject: [json-spirit] patch for building dll library (#5251) * [json-spirit] Add initial port * Modify PR to using pn85, enable some features json-spirit is a weird case because the main repo that package managers tend to use appears to not be actively maintained. Nevertheless, vcpkg tries to use the "official" source of a repository if at all possible. In order to do this, I've made the following changes to the PR: - I've changed the upstream REPO, REF, and SHA512. - I've passed options to disable building the demos and tests - I've made the project build only as a static library. The reason for this is that vcpkg does not support dynamical linkin. Another reason is that the library as it is in the repo does not have all the definitions correctly annotated.smlee-hdactech has made a PR against the major upstream repo to fix this, butwe are going to defer to the main repo until that change is accepted. * patch for building dll. --- ports/json-spirit/dll-wins.patch | 281 +++++++++++++++++++++++++++++++++++++++ ports/json-spirit/portfile.cmake | 9 +- 2 files changed, 287 insertions(+), 3 deletions(-) create mode 100644 ports/json-spirit/dll-wins.patch diff --git a/ports/json-spirit/dll-wins.patch b/ports/json-spirit/dll-wins.patch new file mode 100644 index 000000000..18c60e580 --- /dev/null +++ b/ports/json-spirit/dll-wins.patch @@ -0,0 +1,281 @@ +diff --git a/.travis.yml b/.travis.yml +index e5b56eb..87f2926 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -14,4 +14,4 @@ script: + - cmake --build . --target all -- + + after_script: +- - ctest ++ - ctest +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb24877..a10a49f 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,15 +60,17 @@ endif() + + message(${CMAKE_INSTALL_INCLUDEDIR}) + +- ++ + set(CPACK_PACKAGE_VERSION_MAJOR 4) + set(CPACK_PACKAGE_VERSION_MINOR 0) + set(CPACK_PACKAGE_VERSION_PATCH 8) + set(CPACK_PACKAGE_DESCRIPTION "A C++ JSON Parser/Generator Implemented with Boost Spirit") + include(CPack) +- ++ ++set(EXPORT_HEADERS ) + INSTALL( + FILES ++ json_spirit/json_spirit_global.h + json_spirit/json_spirit.h + json_spirit/json_spirit_error_position.h + json_spirit/json_spirit_reader.h +@@ -80,4 +82,4 @@ INSTALL( + json_spirit/json_spirit_writer_template.h + json_spirit/json_spirit_writer_options.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json_spirit) +- ++ +diff --git a/json_spirit/CMakeLists.txt b/json_spirit/CMakeLists.txt +index 23da64c..10d4e2b 100755 +--- a/json_spirit/CMakeLists.txt ++++ b/json_spirit/CMakeLists.txt +@@ -15,13 +15,19 @@ SET(JSON_SPIRIT_SRCS + FIND_PACKAGE(Boost 1.34 REQUIRED) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + +- ++ + OPTION(BUILD_STATIC_LIBS "Build static libraries" OFF) + + if(BUILD_STATIC_LIBS) + ADD_LIBRARY(json_spirit STATIC ${JSON_SPIRIT_SRCS}) +- install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + else(BUILD_STATIC_LIBS) + ADD_LIBRARY(json_spirit SHARED ${JSON_SPIRIT_SRCS}) +- install(TARGETS json_spirit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(WIN32) ++ install(TARGETS json_spirit RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ else() ++ install(TARGETS json_spirit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif() ++ + endif(BUILD_STATIC_LIBS) +diff --git a/json_spirit/json_spirit_global.h b/json_spirit/json_spirit_global.h +new file mode 100644 +index 0000000..07a7d2c +--- /dev/null ++++ b/json_spirit/json_spirit_global.h +@@ -0,0 +1,18 @@ ++#ifndef JSON_SPIRIT_GLOBAL_H ++#define JSON_SPIRIT_GLOBAL_H ++ ++#if (defined _WIN32) || (defined _WIN64) ++ #define DECL_EXPORT __declspec(dllexport) ++ #define DECL_IMPORT __declspec(dllimport) ++#else ++ #define DECL_EXPORT ++ #define DECL_IMPORT ++#endif ++ ++#if defined(json_spirit_EXPORTS) ++# define json_spirit_EXPORT DECL_EXPORT ++#else ++# define json_spirit_EXPORT DECL_IMPORT ++#endif ++ ++#endif +\ No newline at end of file +diff --git a/json_spirit/json_spirit_reader.h b/json_spirit/json_spirit_reader.h +index a6cfac7..50cc6f5 100755 +--- a/json_spirit/json_spirit_reader.h ++++ b/json_spirit/json_spirit_reader.h +@@ -11,6 +11,7 @@ + # pragma once + #endif + ++#include "json_spirit_global.h" + #include "json_spirit_value.h" + #include "json_spirit_error_position.h" + #include +@@ -20,43 +21,43 @@ namespace json_spirit + // functions to reads a JSON values + + #ifdef JSON_SPIRIT_VALUE_ENABLED +- bool read( const std::string& s, Value& value ); +- bool read( std::istream& is, Value& value ); +- bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); ++ json_spirit_EXPORT bool read( const std::string& s, Value& value ); ++ json_spirit_EXPORT bool read( std::istream& is, Value& value ); ++ json_spirit_EXPORT bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); + +- void read_or_throw( const std::string& s, Value& value ); +- void read_or_throw( std::istream& is, Value& value ); +- void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); ++ json_spirit_EXPORT void read_or_throw( const std::string& s, Value& value ); ++ json_spirit_EXPORT void read_or_throw( std::istream& is, Value& value ); ++ json_spirit_EXPORT void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); + #endif + + #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- bool read( const std::wstring& s, wValue& value ); +- bool read( std::wistream& is, wValue& value ); +- bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); ++ json_spirit_EXPORT bool read( const std::wstring& s, wValue& value ); ++ json_spirit_EXPORT bool read( std::wistream& is, wValue& value ); ++ json_spirit_EXPORT bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); + +- void read_or_throw( const std::wstring& s, wValue& value ); +- void read_or_throw( std::wistream& is, wValue& value ); +- void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); ++ json_spirit_EXPORT void read_or_throw( const std::wstring& s, wValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wistream& is, wValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); + #endif + + #ifdef JSON_SPIRIT_MVALUE_ENABLED +- bool read( const std::string& s, mValue& value ); +- bool read( std::istream& is, mValue& value ); +- bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); ++ json_spirit_EXPORT bool read( const std::string& s, mValue& value ); ++ json_spirit_EXPORT bool read( std::istream& is, mValue& value ); ++ json_spirit_EXPORT bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); + +- void read_or_throw( const std::string& s, mValue& value ); +- void read_or_throw( std::istream& is, mValue& value ); +- void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); ++ json_spirit_EXPORT void read_or_throw( const std::string& s, mValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::istream& is, mValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); + #endif + + #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- bool read( const std::wstring& s, wmValue& value ); +- bool read( std::wistream& is, wmValue& value ); +- bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); ++ json_spirit_EXPORT bool read( const std::wstring& s, wmValue& value ); ++ json_spirit_EXPORT bool read( std::wistream& is, wmValue& value ); ++ json_spirit_EXPORT bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); + +- void read_or_throw( const std::wstring& s, wmValue& value ); +- void read_or_throw( std::wistream& is, wmValue& value ); +- void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); ++ json_spirit_EXPORT void read_or_throw( const std::wstring& s, wmValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wistream& is, wmValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); + #endif + } + +diff --git a/json_spirit/json_spirit_writer.h b/json_spirit/json_spirit_writer.h +index 2722780..f60dc07 100755 +--- a/json_spirit/json_spirit_writer.h ++++ b/json_spirit/json_spirit_writer.h +@@ -11,6 +11,7 @@ + # pragma once + #endif + ++#include "json_spirit_global.h" + #include "json_spirit_value.h" + #include "json_spirit_writer_options.h" + #include +@@ -20,44 +21,44 @@ namespace json_spirit + // these functions to convert JSON Values to text + + #ifdef JSON_SPIRIT_VALUE_ENABLED +- void write( const Value& value, std::ostream& os, unsigned int options = 0 ); +- std::string write( const Value& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const Value& value, std::ostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::string write( const Value& value, unsigned int options = 0 ); + #endif + + #ifdef JSON_SPIRIT_MVALUE_ENABLED +- void write( const mValue& value, std::ostream& os, unsigned int options = 0 ); +- std::string write( const mValue& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const mValue& value, std::ostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::string write( const mValue& value, unsigned int options = 0 ); + #endif + + #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write( const wValue& value, std::wostream& os, unsigned int options = 0 ); +- std::wstring write( const wValue& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const wValue& value, std::wostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::wstring write( const wValue& value, unsigned int options = 0 ); + #endif + + #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write( const wmValue& value, std::wostream& os, unsigned int options = 0 ); +- std::wstring write( const wmValue& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const wmValue& value, std::wostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::wstring write( const wmValue& value, unsigned int options = 0 ); + #endif + + // these "formatted" versions of the "write" functions are the equivalent of the above functions + // with option "pretty_print" + + #ifdef JSON_SPIRIT_VALUE_ENABLED +- void write_formatted( const Value& value, std::ostream& os ); +- std::string write_formatted( const Value& value ); ++ json_spirit_EXPORT void write_formatted( const Value& value, std::ostream& os ); ++ json_spirit_EXPORT std::string write_formatted( const Value& value ); + #endif + #ifdef JSON_SPIRIT_MVALUE_ENABLED +- void write_formatted( const mValue& value, std::ostream& os ); +- std::string write_formatted( const mValue& value ); ++ json_spirit_EXPORT void write_formatted( const mValue& value, std::ostream& os ); ++ json_spirit_EXPORT std::string write_formatted( const mValue& value ); + #endif + + #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write_formatted( const wValue& value, std::wostream& os ); +- std::wstring write_formatted( const wValue& value ); ++ json_spirit_EXPORT void write_formatted( const wValue& value, std::wostream& os ); ++ json_spirit_EXPORT std::wstring write_formatted( const wValue& value ); + #endif + #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write_formatted( const wmValue& value, std::wostream& os ); +- std::wstring write_formatted( const wmValue& value ); ++ json_spirit_EXPORT void write_formatted( const wmValue& value, std::wostream& os ); ++ json_spirit_EXPORT std::wstring write_formatted( const wmValue& value ); + #endif + } + +diff --git a/json_test/json_spirit_value_test.cpp b/json_test/json_spirit_value_test.cpp +index e055dae..faab022 100755 +--- a/json_test/json_spirit_value_test.cpp ++++ b/json_test/json_spirit_value_test.cpp +@@ -381,9 +381,15 @@ namespace + Container_constructor_runner() + { + vector< double > vd = list_of( 1.2 )( 1.3 ); test_container_constructor( vd ); ++ #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900) ++ vector< int > vi = { 1 }; test_container_constructor( vi ); ++ vi = { 1, 2 }; test_container_constructor( vi ); ++ vi = { 1, 2, 3 }; test_container_constructor( vi ); ++ #else + vector< int > vi = list_of( 1 ); test_container_constructor( vi ); + vi = list_of( 1 )( 2 ); test_container_constructor( vi ); + vi = list_of( 1 )( 2 )( 3 ); test_container_constructor( vi ); ++ #endif + list< double > ld = list_of( 1.2 )( 1.3 ); test_container_constructor( ld ); + list< int > li = list_of( 1 ); test_container_constructor( li ); + li = list_of( 1 )( 2 ); test_container_constructor( li ); +@@ -447,9 +453,15 @@ namespace + } + + vector< double > vd = list_of( 1.2 )( 1.3 ); test_variant_array_constructor< double > ( vd ); ++ #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900) ++ vector< int > vi = { 1 }; test_variant_array_constructor< int >( vi ); ++ vi = { 1, 2 }; test_variant_array_constructor< int >( vi ); ++ vi = { 1, 2, 3 }; test_variant_array_constructor< int >( vi ); ++ #else + vector< int > vi = list_of( 1 ); test_variant_array_constructor< int >( vi ); + vi = list_of( 1 )( 2 ); test_variant_array_constructor< int >( vi ); + vi = list_of( 1 )( 2 )( 3 ); test_variant_array_constructor< int >( vi ); ++ #endif + list< double > ld = list_of( 1.2 )( 1.3 ); test_variant_array_constructor< double >( ld ); + list< int > li = list_of( 1 ); test_variant_array_constructor< int >( li ); + li = list_of( 1 )( 2 ); test_variant_array_constructor< int >( li ); diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake index d33737d79..05be540b3 100644 --- a/ports/json-spirit/portfile.cmake +++ b/ports/json-spirit/portfile.cmake @@ -1,7 +1,5 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO png85/json_spirit @@ -10,10 +8,15 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR}/dll-wins.patch +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_STATIC_LIBS=on -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off) + OPTIONS -DBUILD_STATIC_LIBS=off -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off) vcpkg_install_cmake() -- cgit v1.2.3 From cde34211a506a2efc7483c41d937b31dc8e24666 Mon Sep 17 00:00:00 2001 From: Wim Leflere Date: Tue, 29 Jan 2019 22:40:47 +0100 Subject: Generate dependeny tree graph (#5185) * use dashed link for optional dependency * output full dependency tree * add warning if requested package does not exist * [vcpkg] Formatting * [vcpkg] Fix issue when parsing qualified dependencies Before this change, "harfbuzz[glib] (!x86)" would parse as "harfbuzz[glib]||!x86" instead of the desired "harfbuzz|glib|!x86" * [vcpkg] Improve depend-info handling of features and qualified dependencies. --- toolsrc/src/vcpkg/commands.dependinfo.cpp | 96 ++++++++++++++++++------------- toolsrc/src/vcpkg/sourceparagraph.cpp | 7 +-- 2 files changed, 59 insertions(+), 44 deletions(-) diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp index 5f72e965b..455f3b7c5 100644 --- a/toolsrc/src/vcpkg/commands.dependinfo.cpp +++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp @@ -12,16 +12,16 @@ namespace vcpkg::Commands::DependInfo constexpr StringLiteral OPTION_DOT = "--dot"; constexpr StringLiteral OPTION_DGML = "--dgml"; - constexpr std::array DEPEND_SWITCHES = { { - { OPTION_DOT, "Creates graph on basis of dot" }, - { OPTION_DGML, "Creates graph on basis of dgml" }, - } }; + constexpr std::array DEPEND_SWITCHES = {{ + {OPTION_DOT, "Creates graph on basis of dot"}, + {OPTION_DGML, "Creates graph on basis of dgml"}, + }}; const CommandStructure COMMAND_STRUCTURE = { Help::create_example_string(R"###(depend-info [pat])###"), 0, - 1, - { DEPEND_SWITCHES,{} }, + SIZE_MAX, + {DEPEND_SWITCHES, {}}, nullptr, }; @@ -32,8 +32,7 @@ namespace vcpkg::Commands::DependInfo return output; } - std::string create_dot_as_string( - const std::vector>& source_control_files) + std::string create_dot_as_string(const std::vector>& source_control_files) { int empty_node_count = 0; @@ -53,7 +52,7 @@ namespace vcpkg::Commands::DependInfo s.append(Strings::format("%s;", name)); for (const Dependency& d : source_paragraph.depends) { - const std::string dependency_name = replace_dashes_with_underscore(d.name()); + const std::string dependency_name = replace_dashes_with_underscore(d.depend.name); s.append(Strings::format("%s -> %s;", name, dependency_name)); } } @@ -62,8 +61,7 @@ namespace vcpkg::Commands::DependInfo return s; } - std::string create_dgml_as_string( - const std::vector>& source_control_files) + std::string create_dgml_as_string(const std::vector>& source_control_files) { std::string s; s.append(""); @@ -79,16 +77,22 @@ namespace vcpkg::Commands::DependInfo // Iterate over dependencies. for (const Dependency& d : source_paragraph.depends) { - links.append(Strings::format("", name, d.name())); + if (d.qualifier.empty()) + links.append(Strings::format("", name, d.depend.name)); + else + links.append(Strings::format( + "", name, d.depend.name)); } // Iterate over feature dependencies. - const std::vector>& feature_paragraphs = source_control_file->feature_paragraphs; + const std::vector>& feature_paragraphs = + source_control_file->feature_paragraphs; for (const auto& feature_paragraph : feature_paragraphs) { for (const Dependency& d : feature_paragraph->depends) { - links.append(Strings::format("", name, d.name())); + links.append(Strings::format( + "", name, d.depend.name)); } } } @@ -101,9 +105,8 @@ namespace vcpkg::Commands::DependInfo return s; } - std::string create_graph_as_string( - const std::unordered_set& switches, - const std::vector>& source_control_files) + std::string create_graph_as_string(const std::unordered_set& switches, + const std::vector>& source_control_files) { if (Util::Sets::contains(switches, OPTION_DOT)) { @@ -116,35 +119,50 @@ namespace vcpkg::Commands::DependInfo return ""; } + void build_dependencies_list(std::set& packages_to_keep, + const std::string& requested_package, + const std::vector>& source_control_files) + { + const auto source_control_file = + Util::find_if(source_control_files, [&requested_package](const auto& source_control_file) { + return source_control_file->core_paragraph->name == requested_package; + }); + + if (source_control_file != source_control_files.end()) + { + const auto new_package = packages_to_keep.insert(requested_package).second; + + if (new_package) + { + for (const auto& dependency : (*source_control_file)->core_paragraph->depends) + { + build_dependencies_list(packages_to_keep, dependency.depend.name, source_control_files); + } + } + } + else + { + System::println(System::Color::warning, "package '%s' does not exist", requested_package); + } + } + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); auto source_control_files = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports); - if (args.command_arguments.size() == 1) + if (args.command_arguments.size() >= 1) { - const std::string filter = args.command_arguments.at(0); - - Util::erase_remove_if(source_control_files, - [&](const std::unique_ptr& source_control_file) { - const SourceParagraph& source_paragraph = *source_control_file->core_paragraph; - - if (Strings::case_insensitive_ascii_contains(source_paragraph.name, filter)) - { - return false; - } - - for (const Dependency& dependency : source_paragraph.depends) - { - if (Strings::case_insensitive_ascii_contains(dependency.name(), filter)) - { - return false; - } - } - - return true; - }); + std::set packages_to_keep; + for (const auto& requested_package : args.command_arguments) + { + build_dependencies_list(packages_to_keep, requested_package, source_control_files); + } + + Util::erase_remove_if(source_control_files, [&packages_to_keep](const auto& source_control_file) { + return !Util::Sets::contains(packages_to_keep, source_control_file->core_paragraph->name); + }); } if (!options.switches.empty()) diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index ed61cb42a..baa8b070b 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -194,16 +194,13 @@ namespace vcpkg auto pos = depend_string.find(' '); if (pos == std::string::npos) return Dependency::parse_dependency(depend_string, ""); // expect of the form "\w+ \[\w+\]" - Dependency dep; - - dep.depend.name = depend_string.substr(0, pos); if (depend_string.c_str()[pos + 1] != '(' || depend_string[depend_string.size() - 1] != ')') { // Error, but for now just slurp the entire string. return Dependency::parse_dependency(depend_string, ""); } - dep.qualifier = depend_string.substr(pos + 2, depend_string.size() - pos - 3); - return dep; + return Dependency::parse_dependency(depend_string.substr(0, pos), + depend_string.substr(pos + 2, depend_string.size() - pos - 3)); }); } -- cgit v1.2.3 From e6552f118071a9798a2ffada7ae4707f3b29ed14 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Tue, 29 Jan 2019 14:43:39 -0700 Subject: [BZip2] Fix Unix Dynamic Builds (#5184) * [BZip2] Fix Unix Dynamic Builds * [bzip2] Bump control version * [libgta] Only build one flavor * [vcpkg_configure_cmake] Resolve #2375 since we now use CMake >= 3.11 --- ports/bzip2/CMakeLists.txt | 19 ++++++++++--------- ports/bzip2/CONTROL | 2 +- ports/libgta/CONTROL | 2 +- ports/libgta/portfile.cmake | 13 +++++++------ scripts/cmake/vcpkg_configure_cmake.cmake | 3 --- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt index 2f70c5404..e2da221d7 100644 --- a/ports/bzip2/CMakeLists.txt +++ b/ports/bzip2/CMakeLists.txt @@ -5,7 +5,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) add_definitions(-DBZ_DEBUG) # enable extra assertions endif() -set(LIBBZ2_SOURCES +set(BZ2_SOURCES blocksort.c huffman.c crctable.c @@ -14,12 +14,13 @@ set(LIBBZ2_SOURCES decompress.c bzlib.c) -add_library(libbz2 ${LIBBZ2_SOURCES}) -set_target_properties(libbz2 PROPERTIES - ARCHIVE_OUTPUT_NAME bz2 # required for FindBzip2 to work - DEBUG_POSTFIX d) +add_library(bz2 ${BZ2_SOURCES}) +set_target_properties(bz2 PROPERTIES + DEBUG_POSTFIX d + VERSION 1.0.6 + SOVERSION 1.0) if(BUILD_SHARED_LIBS) - target_compile_definitions(libbz2 PRIVATE -DBZ_BUILD_DLL) + target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL) endif() if(MSVC) @@ -28,14 +29,14 @@ if(MSVC) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) endif() -install(TARGETS libbz2 +install(TARGETS bz2 RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) if(NOT BZIP2_SKIP_TOOLS) - add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES}) - add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES}) + add_executable(bzip2 bzip2.c ${BZ2_SOURCES}) + add_executable(bzip2recover bzip2recover.c ${BZ2_SOURCES}) install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2) endif() diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index fad303399..00995aed9 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,3 +1,3 @@ Source: bzip2 -Version: 1.0.6-3 +Version: 1.0.6-4 Description: High-quality data compressor. diff --git a/ports/libgta/CONTROL b/ports/libgta/CONTROL index 2f5e817f6..344c44c4d 100644 --- a/ports/libgta/CONTROL +++ b/ports/libgta/CONTROL @@ -1,4 +1,4 @@ Source: libgta -Version: 1.0.8 +Version: 1.0.8-1 Description: Libgta is a portable library that implements the Generic Tagged Array (GTA) file format. Build-Depends: bzip2, zlib, liblzma diff --git a/ports/libgta/portfile.cmake b/ports/libgta/portfile.cmake index 31fc64fd0..1bbe6325c 100644 --- a/ports/libgta/portfile.cmake +++ b/ports/libgta/portfile.cmake @@ -1,16 +1,18 @@ - include(vcpkg_common_functions) set(LIBGTA_VERSION 1.0.8) set(LIBGTA_HASH 99ec3d6317c9a12cf440a60bb989cc7a3fe35e0a1da3e65206e5cd52b69fb860850e61ea0f819511ef48ddc87c468c0ded710409990627096738886e1b358423) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libgta-${LIBGTA_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://download.savannah.nongnu.org/releases/gta/libgta-1.0.8.tar.xz" FILENAME "libgta-${LIBGTA_VERSION}.tar.xz" SHA512 ${LIBGTA_HASH}) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBGTA_VERSION} +) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIBS) @@ -18,12 +20,11 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIBS) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DGTA_BUILD_SHARED_LIBS=${ENABLE_SHARED_LIBS} - -DGTA_BUILD_STATIC_LIBS=${ENABLE_STATIC_LIBS} + OPTIONS -DGTA_BUILD_SHARED_LIB=${ENABLE_SHARED_LIBS} + -DGTA_BUILD_STATIC_LIB=${ENABLE_STATIC_LIBS} -DGTA_BUILD_DOCUMENTATION=OFF ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index cf3fc7861..f7b81de93 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -77,9 +77,6 @@ function(vcpkg_configure_cmake) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility set(NINJA_CAN_BE_USED OFF) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - # Arm64 usage should be allowed once github issue #2375 is resolved - set(NINJA_CAN_BE_USED OFF) endif() if(_csc_GENERATOR) -- cgit v1.2.3 From 05b31030cee412118a9710daf5b4652a684b7f50 Mon Sep 17 00:00:00 2001 From: chrullrich Date: Tue, 29 Jan 2019 23:35:33 +0100 Subject: Upgrade WTL to 10.0.8356. (#5262) --- 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 5fbab5c61..0eb3cf372 100644 --- a/ports/wtl/CONTROL +++ b/ports/wtl/CONTROL @@ -1,5 +1,5 @@ Source: wtl Maintainer: jfrederich@gmail.com -Version: 10.0-1 +Version: 10.0-2 Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components. Build-Depends: diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake index 6ee21e895..85cbca6e6 100644 --- a/ports/wtl/portfile.cmake +++ b/ports/wtl/portfile.cmake @@ -1,9 +1,9 @@ #header-only library include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE - URLS "https://downloads.sourceforge.net/project/wtl/WTL%2010/WTL%2010.0.7336/WTL10_7336.zip" - FILENAME "WTL10_7336.zip" - SHA512 68368be0b35fba97ed63fd684e98c077ab94ea2ce928693da7f1f48e2547486109e045e026218a7c8652aec46930b79572679c0b79afaa75a3dbf98572e4d9b5 + URLS "https://downloads.sourceforge.net/project/wtl/WTL%2010/WTL%2010.0.8356/WTL10_8356.zip" + FILENAME "WTL10_8356.zip" + SHA512 4eb24151f4009cdfebc17f08312cae65d46c8ea205ccc7b56f14c46b54d28d8d4e6290de3150e558dc076d7815a9dde2a8952695f46f4402c83b0da2bf65f241 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 397e1a5d6c7d6a694650e3455969060005b9a6f7 Mon Sep 17 00:00:00 2001 From: SunTY Date: Thu, 31 Jan 2019 05:41:51 +0800 Subject: libass dynamic library (#5244) * libass dynamic library it relies on fribidi, harfbuzz, fontconfig, libiconv * Remove references to iconv and fontconfig Because this port is currently Windows-only (Fribidi doesn't build on Linux with vcpkg because of an issue with Meson), we don't want to worry about FontConfig; DirectWrite should be enough. * Freetype is important! * Remove unnecessary fontconfig -- for real * Remove unnecessary comment --- ports/libass/CMakeLists.txt | 19 ++++++++++++++++--- ports/libass/libass.def | 46 +++++++++++++++++++++++++++++++++++++++++++++ ports/libass/portfile.cmake | 4 ++-- 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 ports/libass/libass.def diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 12e32f902..5570f3440 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -9,6 +9,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) # macOS - CONFIG_CORETEXT # linux - CONFIG_FONTCONFIG add_compile_definitions(CONFIG_DIRECTWRITE) +add_compile_definitions(CONFIG_FREETYPE) +add_compile_definitions(CONFIG_FRIBIDI) +add_compile_definitions(CONFIG_HARFBUZZ) file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) @@ -21,13 +24,23 @@ find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi.h PATH_SUFFIXES fribidi) +find_path(HARFBUZZ_INCLUDE_DIR + NAMES hb.h + PATH_SUFFIXES harfbuzz) + find_library(FRIBIDI_LIBRARY NAMES fribidi) +find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) -add_library(ass STATIC ${SOURCES}) +add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def) -target_include_directories(ass PRIVATE ${FRIBIDI_INCLUDE_DIR}) +target_include_directories(ass PRIVATE + ${FRIBIDI_INCLUDE_DIR} + ${HARFBUZZ_INCLUDE_DIR}) -target_link_libraries(ass PRIVATE Freetype::Freetype) +target_link_libraries(ass PRIVATE + Freetype::Freetype + ${FRIBIDI_LIBRARY} + ${HARFBUZZ_LIBRARY}) install(TARGETS ass RUNTIME DESTINATION bin diff --git a/ports/libass/libass.def b/ports/libass/libass.def new file mode 100644 index 000000000..58bfad3d6 --- /dev/null +++ b/ports/libass/libass.def @@ -0,0 +1,46 @@ +EXPORTS +ass_library_init +ass_library_done +ass_library_version +ass_set_fonts_dir +ass_set_extract_fonts +ass_set_style_overrides +ass_renderer_init +ass_renderer_done +ass_set_frame_size +ass_set_storage_size +ass_set_margins +ass_set_use_margins +ass_set_aspect_ratio +ass_set_font_scale +ass_set_hinting +ass_set_line_spacing +ass_get_available_font_providers +ass_set_fonts +ass_render_frame +ass_new_track +ass_free_track +ass_alloc_style +ass_alloc_event +ass_free_style +ass_free_event +ass_process_data +ass_process_codec_private +ass_process_chunk +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 64d49c985..040cadc66 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,8 +1,6 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass @@ -14,6 +12,8 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libass.def DESTINATION ${SOURCE_PATH}) + # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright) -- cgit v1.2.3 From fd56ffcf5c9a7ace36c8d4e0dc9785605b0fbd45 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Jan 2019 14:56:05 -0800 Subject: [vcpkg] Enable bootstrapping with VS2019 --- scripts/bootstrap.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 42eabd01b..0a24afa05 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -166,7 +166,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) if (Test-Path $VCFolder) { Write-Verbose "Picking: $instanceCandidate" - return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141" + return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142" } } @@ -192,7 +192,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) } } - throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed." + 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, @@ -396,7 +396,7 @@ if ($ec -ne 0) } Write-Host "`nBuilding vcpkg.exe... done.`n" -Write-Verbose("Placing vcpkg.exe in the correct location") +Write-Verbose "Placing vcpkg.exe in the correct location" Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" -- cgit v1.2.3 From 660745956a59f58bc95b1802b2d08ddaeff37eb7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Jan 2019 18:11:08 -0800 Subject: [boost][python3] Fix building with VS 2019 --- ports/boost-iostreams/CONTROL | 2 +- ports/boost-modular-build-helper/CONTROL | 2 +- .../boost-modular-build.cmake | 5 +- ports/python3/CONTROL | 2 +- ...t.VisualStudio.Setup.Configuration.Native.patch | 13 ++++++ ports/python3/dev16.patch | 17 +++++++ ports/python3/portfile.cmake | 2 + scripts/cmake/vcpkg_test_cmake.cmake | 5 ++ toolsrc/src/vcpkg/visualstudio.cpp | 54 ++++++++++++++++------ 9 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch create mode 100644 ports/python3/dev16.patch diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index f88cc5424..022aa76a7 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-iostreams Version: 1.68.0 -Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, 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 +Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-mpl, 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 Description: Boost iostreams module diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index a598c741d..de02dea1d 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper -Version: 2018-10-19 +Version: 2019-01-25 diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 2dfb19f6b..2ff2bb0d6 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -228,7 +228,7 @@ function(boost_modular_build) file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT) set(TOOLSET_OPTIONS " /EHsc -Zm800 -nologo") if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + if(NOT VCPKG_PLATFORM_TOOLSET MATCHES "v140") find_path(PATH_TO_CL cl.exe) find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH) if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND") @@ -251,7 +251,7 @@ function(boost_modular_build) 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) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + if(VCPKG_PLATFORM_TOOLSET MATCHES "v141" OR VCPKG_PLATFORM_TOOLSET MATCHES "v142") list(APPEND _bm_OPTIONS toolset=msvc-14.1) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140") list(APPEND _bm_OPTIONS toolset=msvc-14.0) @@ -342,6 +342,7 @@ function(boost_modular_build) string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries + string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL index 26a0bce93..6c5a835da 100644 --- a/ports/python3/CONTROL +++ b/ports/python3/CONTROL @@ -1,3 +1,3 @@ Source: python3 -Version: 3.6.4-2 +Version: 3.6.4-3 Description: The Python programming language as an embeddable library \ No newline at end of file diff --git a/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch b/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch new file mode 100644 index 000000000..50b728340 --- /dev/null +++ b/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch @@ -0,0 +1,13 @@ +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 0f01852..6e63711 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -71,7 +71,7 @@ + + + version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies) +- %(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName) ++ %(AdditionalLibraryDirectories);$(PySourcePath)PC\external\v140\$(ArchName) + 0x1e000000 + + diff --git a/ports/python3/dev16.patch b/ports/python3/dev16.patch new file mode 100644 index 000000000..38a968729 --- /dev/null +++ b/ports/python3/dev16.patch @@ -0,0 +1,17 @@ +diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props +index 9a096bc..0647cf8 100644 +--- a/PCbuild/pyproject.props ++++ b/PCbuild/pyproject.props +@@ -94,9 +94,9 @@ + Inputs="$(PySourcePath)Include\patchlevel.h" + Outputs="$(IntDir)pythonnt_rc.h"> + + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 576a35e8a..e3bbfd2f5 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_from_github( PATCHES ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-iomodule-for-RS4-SDK.patch ${CMAKE_CURRENT_LIST_DIR}/0005-Fix-DefaultWindowsSDKVersion.patch + dev16.patch + Microsoft.VisualStudio.Setup.Configuration.Native.patch ) # We need per-triplet directories because we need to patch the project files differently based on the linkage diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake index 718b2f69c..29654346a 100644 --- a/scripts/cmake/vcpkg_test_cmake.cmake +++ b/scripts/cmake/vcpkg_test_cmake.cmake @@ -27,6 +27,11 @@ function(vcpkg_test_cmake) set(PACKAGE_TYPE CONFIG) endif() + if(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") + message(STATUS "Skipping CMake integration test due to v142 / CMake interaction issues") + return() + endif() + message(STATUS "Performing CMake integration test") file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test) diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index 83a530a10..d2fccc716 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -12,6 +12,7 @@ namespace vcpkg::VisualStudio static constexpr CStringView V_120 = "v120"; static constexpr CStringView V_140 = "v140"; static constexpr CStringView V_141 = "v141"; + static constexpr CStringView V_142 = "v142"; struct VisualStudioInstance { @@ -213,35 +214,62 @@ namespace vcpkg::VisualStudio for (const fs::path& subdir : msvc_subdirectories) { + auto toolset_version_full = subdir.filename().u8string(); + auto toolset_version_prefix = toolset_version_full.substr(0, 4); + CStringView toolset_version; + std::string vcvars_option; + if (toolset_version_prefix.size() != 4) + { + // unknown toolset + continue; + } + else if (toolset_version_prefix[3] == '1') + { + toolset_version = V_141; + vcvars_option = "-vcvars_ver=14.1"; + } + else if (toolset_version_prefix[3] == '2') + { + toolset_version = V_142; + vcvars_option = "-vcvars_ver=14.2"; + } + else + { + // unknown toolset minor version + continue; + } const fs::path dumpbin_path = subdir / "bin" / "HostX86" / "x86" / "dumpbin.exe"; paths_examined.push_back(dumpbin_path); if (fs.exists(dumpbin_path)) { - const Toolset v141_toolset{ - vs_instance.root_path, dumpbin_path, vcvarsall_bat, {}, V_141, supported_architectures}; + Toolset toolset{vs_instance.root_path, + dumpbin_path, + vcvarsall_bat, + {vcvars_option}, + toolset_version, + supported_architectures}; const auto english_language_pack = dumpbin_path.parent_path() / "1033"; if (!fs.exists(english_language_pack)) { - excluded_toolsets.push_back(v141_toolset); - break; + excluded_toolsets.push_back(std::move(toolset)); + continue; } - found_toolsets.push_back(v141_toolset); + found_toolsets.push_back(std::move(toolset)); if (v140_is_available) { - const Toolset v140_toolset{vs_instance.root_path, - dumpbin_path, - vcvarsall_bat, - {"-vcvars_ver=14.0"}, - V_140, - supported_architectures}; - found_toolsets.push_back(v140_toolset); + found_toolsets.push_back({vs_instance.root_path, + dumpbin_path, + vcvarsall_bat, + {"-vcvars_ver=14.0"}, + V_140, + supported_architectures}); } - break; + continue; } } -- cgit v1.2.3 From 74e0c1a7849a898ddd5bd6863bf191dc2a60ddef Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 29 Jan 2019 13:49:45 -0800 Subject: [vcpkg] Add additional checks for 32-bit hosted and targetting windows store when using VS2019 --- toolsrc/src/vcpkg/vcpkgpaths.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index a92a5673e..47994660c 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -192,6 +192,26 @@ namespace vcpkg vs_root_path.generic_string()); } + if (prebuildinfo.cmake_system_name == "WindowsStore") + { + // For now, cmake does not support VS 2019 when using the MSBuild generator. + Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; }); + Checks::check_exit(VCPKG_LINE_INFO, + !candidates.empty(), + "With the current CMake version, UWP binaries can only be built with toolset version " + "v141 or below. Please install the v141 toolset in VS 2019."); + } + + if (System::get_host_processor() == System::CPUArchitecture::X86) + { + // For now, cmake does not support VS 2019 when using the MSBuild generator. + Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; }); + Checks::check_exit(VCPKG_LINE_INFO, + !candidates.empty(), + "With the current CMake version, 32-bit machines can build with toolset version " + "v141 or below. Please install the v141 toolset in VS 2019."); + } + Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "No suitable Visual Studio instances were found"); return *candidates.front(); -- cgit v1.2.3 From 0e759709ddc7dbad0b881f9f068f1b04b2092773 Mon Sep 17 00:00:00 2001 From: Andrew McMahon Date: Thu, 31 Jan 2019 10:04:17 +1000 Subject: [boost] update boost to 1.69. Fixes #5023 #4961 (#5059) * Update boost to 1.69. Fixes #5023 - Remove boost-signal (rationale: deprecated and removed in 1.69) - Remove boost-hana workaround by xiangfan-ms #4186 #3579 (rationale: 1.69 incorporates required fixes in hana master branch; builds fine in VS2017 15.9) * [boost-signals] Restore signals from boost 1.68 because it is required by wt * [boost-vcpkg-helpers] Improve dependency detection * [boost-iostreams] Revert to cmake build to enable dependencies * [boost-iostreams] Fix use of zstd in static builds * [libtorrent] Update to 1.2.0 * [wt] Update to 4.0.5 * [boost-safe-numerics] [boost-vcpkg-helpers] Added safe_numerics; slight mod to regex match * [hpx] Backport boost 1.69 fixes * [libtorrent] Clean up cmake file installation * [boost-type-traits] Fix MSVC arm --- 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 | 4 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-array/CONTROL | 2 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-asio/CONTROL | 4 +- ports/boost-asio/portfile.cmake | 4 +- ports/boost-assert/CONTROL | 2 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assign/CONTROL | 4 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-atomic/CONTROL | 2 +- ports/boost-atomic/portfile.cmake | 4 +- 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 | 12 +- 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 | 4 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-compatibility/CONTROL | 2 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compute/CONTROL | 4 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-concept-check/CONTROL | 4 +- ports/boost-concept-check/portfile.cmake | 4 +- ports/boost-config/CONTROL | 4 +- 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 | 4 +- ports/boost-context/portfile.cmake | 6 +- ports/boost-contract/CONTROL | 2 +- ports/boost-contract/portfile.cmake | 4 +- ports/boost-conversion/CONTROL | 4 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-convert/CONTROL | 2 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-core/CONTROL | 4 +- 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 | 4 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-date-time/CONTROL | 2 +- ports/boost-date-time/portfile.cmake | 4 +- ports/boost-detail/CONTROL | 4 +- ports/boost-detail/portfile.cmake | 4 +- ports/boost-disjoint-sets/CONTROL | 2 +- ports/boost-disjoint-sets/portfile.cmake | 4 +- ports/boost-dll/CONTROL | 4 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dynamic-bitset/CONTROL | 2 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-endian/CONTROL | 4 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-exception/CONTROL | 4 +- ports/boost-exception/portfile.cmake | 4 +- ports/boost-fiber/CONTROL | 2 +- ports/boost-fiber/portfile.cmake | 4 +- ports/boost-filesystem/CONTROL | 4 +- 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 | 4 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-functional/CONTROL | 4 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-fusion/CONTROL | 2 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-geometry/CONTROL | 2 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-gil/CONTROL | 4 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-graph-parallel/CONTROL | 4 +- ports/boost-graph-parallel/portfile.cmake | 4 +- ports/boost-graph/CONTROL | 2 +- ports/boost-graph/portfile.cmake | 4 +- ports/boost-hana-msvc/CONTROL | 4 - ports/boost-hana-msvc/portfile.cmake | 12 - ports/boost-hana/CONTROL | 6 +- ports/boost-hana/portfile.cmake | 12 +- ports/boost-heap/CONTROL | 4 +- ports/boost-heap/portfile.cmake | 4 +- ports/boost-hof/CONTROL | 2 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-icl/CONTROL | 4 +- 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 | 2 +- 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 +- ports/boost-iostreams/CMakeLists.txt | 7 +- ports/boost-iostreams/CONTROL | 4 +- ports/boost-iostreams/portfile.cmake | 6 +- ports/boost-iterator/CONTROL | 2 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-lambda/CONTROL | 2 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-lexical-cast/CONTROL | 4 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-local-function/CONTROL | 2 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-locale/CONTROL | 2 +- ports/boost-locale/portfile.cmake | 4 +- ports/boost-lockfree/CONTROL | 4 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-log/CONTROL | 2 +- ports/boost-log/portfile.cmake | 4 +- ports/boost-logic/CONTROL | 2 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-math/CONTROL | 2 +- ports/boost-math/portfile.cmake | 4 +- ports/boost-metaparse/CONTROL | 2 +- ports/boost-metaparse/portfile.cmake | 4 +- 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 | 4 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mpi/CONTROL | 2 +- ports/boost-mpi/portfile.cmake | 4 +- ports/boost-mpl/CONTROL | 4 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-msm/CONTROL | 2 +- 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 | 4 +- ports/boost-multiprecision/portfile.cmake | 4 +- ports/boost-numeric-conversion/CONTROL | 4 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-odeint/CONTROL | 2 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-optional/CONTROL | 4 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-parameter-python/CONTROL | 5 + ports/boost-parameter-python/portfile.cmake | 14 + ports/boost-parameter/CONTROL | 4 +- ports/boost-parameter/portfile.cmake | 4 +- 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 | 4 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-pool/CONTROL | 4 +- 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 | 4 +- ports/boost-python/portfile.cmake | 5 +- ports/boost-qvm/CONTROL | 2 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-random/CONTROL | 2 +- 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 | 4 +- ports/boost-regex/portfile.cmake | 4 +- ports/boost-safe-numerics/CONTROL | 5 + ports/boost-safe-numerics/portfile.cmake | 14 + ports/boost-scope-exit/CONTROL | 4 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-serialization/CONTROL | 2 +- ports/boost-serialization/portfile.cmake | 4 +- 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 | 4 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-stacktrace/CONTROL | 2 +- ports/boost-stacktrace/portfile.cmake | 4 +- ports/boost-statechart/CONTROL | 4 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-static-assert/CONTROL | 2 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-system/CONTROL | 4 +- 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 | 4 +- 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 | 4 +- ports/boost-type-traits/msvc-arm-2.patch | 44 +++ ports/boost-type-traits/msvc-arm.patch | 440 +++++++++++++++++++++ ports/boost-type-traits/portfile.cmake | 7 +- ports/boost-typeof/CONTROL | 4 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-ublas/CONTROL | 2 +- ports/boost-ublas/portfile.cmake | 4 +- 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 | 4 +- 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-vcpkg-helpers/generate-ports.ps1 | 113 +++--- .../post-build-stubs/config.cmake | 7 + .../post-build-stubs/context.cmake | 6 + .../post-build-stubs/exception.cmake | 3 + .../post-build-stubs/predef.cmake | 2 + .../post-build-stubs/test.cmake | 14 + ports/boost-vmd/CONTROL | 2 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-wave/CONTROL | 2 +- ports/boost-wave/portfile.cmake | 4 +- ports/boost-winapi/CONTROL | 2 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-xpressive/CONTROL | 4 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-yap/CONTROL | 2 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost/CONTROL | 4 +- ports/hpx/CONTROL | 2 +- ports/hpx/boost-1.69.patch | 36 ++ ports/hpx/portfile.cmake | 1 + ports/libtorrent/CONTROL | 4 +- ports/libtorrent/add-datetime-to-boost-libs.patch | 29 +- ports/libtorrent/boost-167.patch | 48 --- ports/libtorrent/portfile.cmake | 32 +- ports/wt/0001-boost-1.66.patch | 370 ----------------- ports/wt/portfile.cmake | 1 - 293 files changed, 1129 insertions(+), 1010 deletions(-) delete mode 100644 ports/boost-hana-msvc/CONTROL delete mode 100644 ports/boost-hana-msvc/portfile.cmake create mode 100644 ports/boost-parameter-python/CONTROL create mode 100644 ports/boost-parameter-python/portfile.cmake create mode 100644 ports/boost-safe-numerics/CONTROL create mode 100644 ports/boost-safe-numerics/portfile.cmake create mode 100644 ports/boost-type-traits/msvc-arm-2.patch create mode 100644 ports/boost-type-traits/msvc-arm.patch create mode 100644 ports/boost-vcpkg-helpers/post-build-stubs/config.cmake create mode 100644 ports/boost-vcpkg-helpers/post-build-stubs/context.cmake create mode 100644 ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake create mode 100644 ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake create mode 100644 ports/boost-vcpkg-helpers/post-build-stubs/test.cmake create mode 100644 ports/hpx/boost-1.69.patch delete mode 100644 ports/libtorrent/boost-167.patch delete mode 100644 ports/wt/0001-boost-1.66.patch diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL index 4b72307ca..d25e19fc6 100644 --- a/ports/boost-accumulators/CONTROL +++ b/ports/boost-accumulators/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-accumulators -Version: 1.68.0 +Version: 1.69.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-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers Description: Boost accumulators module diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 1dc10c580..7b27e076f 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.68.0 - SHA512 a85e2f307a2f6c08378f595bca14d458da6ffb1b0f078d2be789a4ae8290296b2256ba91ed22ed89542a585efd8f6c1f7041711d8000649bd6141b22f1c77b81 + REF boost-1.69.0 + SHA512 82bb844f96ba5bc3ef97171830e2c7acd35eb500af211e2946aa51d1de1350acc2965200906d0656b8fd28eaf7d4781cc4e60b70fcbdad6c272ce8f6b47c608b HEAD_REF master ) diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL index 2d392879d..fc11fcd75 100644 --- a/ports/boost-algorithm/CONTROL +++ b/ports/boost-algorithm/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-algorithm -Version: 1.68.0 +Version: 1.69.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 Description: Boost algorithm module diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 631f93053..ae1ce12a0 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.68.0 - SHA512 e5d6fd1a64d2c153b8135a12ce8fdd830a8e8138ac34dca8c0737eee5ec95238159dcd7422377f1cc50860ab47d918faa3ae802bfcab0d3e86dce689c2933114 + REF boost-1.69.0 + SHA512 1f3711ce69db9c8d0e7f2703fe03f2743c0e3d8d8a5342122fa3603cd89733764c23b8758e3cfeb4a92e9ec9f4d33f115e79c84de5b53e816ae467233080bab7 HEAD_REF master ) diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL index f53211a11..a977e771e 100644 --- a/ports/boost-align/CONTROL +++ b/ports/boost-align/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-align -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers Description: Boost align module diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index 74656ba75..5a96db899 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.68.0 - SHA512 70379431769ffbfd3e5a6f1d9580a0d70933925ba7cf6a862fbe0f257b4ccb66b86ece6af7d78c16835d836012811708f179da2956c0851388f4ce38ff056b5c + REF boost-1.69.0 + SHA512 7a2a05bed07c589c72ed87dce4f03b2e803a860e5696c958b6a393297ac95001d3cf521e121710b105a6e742d8160c9e52934d8ace9bdd91b524a69e64fd95bf HEAD_REF master ) diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL index f41679d93..6efa9ab4e 100644 --- a/ports/boost-any/CONTROL +++ b/ports/boost-any/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-any -Version: 1.68.0 -Build-Depends: boost-config, boost-core, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost any module diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 3020577ab..9c40ed38a 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.68.0 - SHA512 bf9a7c3c761496a67a25cbb00ea5b7858ea629a6f99627f946a55e60b6c65c9eb0facd2e6aa613247001eebe4da34983083325e198869dc07854f7a41a799478 + REF boost-1.69.0 + SHA512 e6ca491c071992e542a480512d2b79add63c57428a527d4cffa5bf85448d9e7b7d2e7356e62d0346704cf881d62b2ca1c9cb3dcb68671b32623660d5cdd2ee96 HEAD_REF master ) diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL index 04b1dc039..2cb22727c 100644 --- a/ports/boost-array/CONTROL +++ b/ports/boost-array/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-array -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers Description: Boost array module diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 817cdc01a..90a6ec6aa 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.68.0 - SHA512 cf6fa97a21f688888fc2c8c3982681602ddcba04f7821c6af0ad512074983c9a93befdf8e0dcf4336f5dc6d26117f4376fecc508b4ada9bb7f186ce7592a1102 + REF boost-1.69.0 + SHA512 7d9eaea992faf31af6c0cf793d543e53dee6a5d827c232e3cc86b639cd4e5dc0d3b6daec46144fc1953083aa7d60e87d6292fa518be1d1b499bc58804c28a443 HEAD_REF master ) diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL index b85abb532..e1a35aeff 100644 --- a/ports/boost-asio/CONTROL +++ b/ports/boost-asio/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-asio -Version: 1.68.0-1 -Build-Depends: boost-core, boost-coroutine (!uwp), boost-date-time, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-vcpkg-helpers, openssl +Version: 1.69.0-1 +Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), 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 Description: Boost asio module diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index ec0ccbee6..9dd127495 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.68.0 - SHA512 287aa7b4e37e97df10d196b1b409d38c19a025c18228df1ba9bb7dc19d53c9f51b69699e71b04ddee030710e08cb9c4b34eb08f8284d3fa88a762ed6fd096dbe + REF boost-1.69.0 + SHA512 46597ccac219ceb484c638be06ba51a812f8b0e9559fe059542a2dbe5ed397f179f3430a3f24a3225e273de2bf351b44354c4f550c48ce491dff62d99618a64b HEAD_REF master ) diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL index c2fa170a7..7ab47b739 100644 --- a/ports/boost-assert/CONTROL +++ b/ports/boost-assert/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-assert -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-vcpkg-helpers Description: Boost assert module diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 1b162fd25..2a7ad1e15 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.68.0 - SHA512 fd5ffc755f9f0926adeb1d0f3ceea448094e5dcd94c3c9eaa203676bb790729c8e02e66633535f7eaa1df186d88eeb983ed894c181666489a6a3bf9323a8eac0 + REF boost-1.69.0 + SHA512 d96dfd50ab45f71f67f0bb87624b71dff8bb74bfbba8d014896dd1f68ec3163b877394732567ff0fe4e4feb837ff248291b0fcc0743a907df11397b4cd94a275 HEAD_REF master ) diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL index 842661699..9c4e469d5 100644 --- a/ports/boost-assign/CONTROL +++ b/ports/boost-assign/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-assign -Version: 1.68.0 -Build-Depends: boost-array, boost-config, boost-detail, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost assign module diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index e223ea18b..6ac289794 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.68.0 - SHA512 95c2d653e5523d54664e7ed7844d0aa2ccb01c73be2c777b6f8f3c1c738f1bd41c20332d52add7fc6c46621558a09c986a6757b6374a0a54dddfba004a9bb3a0 + REF boost-1.69.0 + SHA512 c83961ff2281421001a041a77ab785f81fba1b3538fc96a2b8a5ea6ca950e9088ed820d46758cf4d076c0f31b6b92d948a39384f7e2f796659a76434e7b089b9 HEAD_REF master ) diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL index b207ebc10..384cae7fc 100644 --- a/ports/boost-atomic/CONTROL +++ b/ports/boost-atomic/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-atomic -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers Description: Boost atomic module diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index ae7fd3141..634ad1bb4 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.68.0 - SHA512 651c02ce0b58458114d4e196eecaf614a781c383ae9b42646d040b3e84babf9983efebed08bb60343eb9beeb566a6ae508ad230ffebae1e7731053529c723eab + REF boost-1.69.0 + SHA512 17fe0249f1ceb8d9f6d1f2426a1ea1987bed2a33301cc03debc584f2557e48252a4b1c399f5f71764ef07bdfe48acd9a36a692c59710b64e5656a54a0703427f HEAD_REF master ) diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL index 71ac84478..1f7e1942f 100644 --- a/ports/boost-beast/CONTROL +++ b/ports/boost-beast/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-beast -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-align, boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi Description: Boost beast module diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 2a9658e11..c5ce1a1c3 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.68.0 - SHA512 889b5285dd7cca86561bc81c8d152dbc1c281b6b9fedfdb95710de94c8582aaaa150ee1a9d9e11f18f79ef1b336ff44dbd2f7614b06342ea9d7b6ad8f2eb60dc + REF boost-1.69.0 + SHA512 bb6e3763f610abc1fa621f03e8f3e82b4c8e8643bf41eba5353c65d8bf3e84b10161a108148459f1dd8786204d7a3783e0c00caf88233f977b3e3ce93d7f0495 HEAD_REF master ) diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL index 64e293c97..7f6bd2f0e 100644 --- a/ports/boost-bimap/CONTROL +++ b/ports/boost-bimap/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-bimap -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-concept-check, boost-config, boost-container-hash, 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 Description: Boost bimap module diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 51ee94385..a9dcaa467 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.68.0 - SHA512 f8e994043e41eef2270f78e7d310ac3b86e667be93e7aa04e0fb97a207f75ee1c587fd4cfda741ab19e0e7e8313b24dafe57e93d9d78a6a08cc306fdff3f41d6 + REF boost-1.69.0 + SHA512 f6241910a5e94d10f9bc9b5c8dd2bd21c298145ff4eeff30e673e1bd421b962f07fd9c79b99952f896d11fa6874f5ecd64a8d060cf53ab1183735ae361879f40 HEAD_REF master ) diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL index bb6c1825d..a80dc4c38 100644 --- a/ports/boost-bind/CONTROL +++ b/ports/boost-bind/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-bind -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers Description: Boost bind module diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 3f7696f31..4b4a6771a 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.68.0 - SHA512 da8c25851bf1083aceafe2972393544009ddefedbdfc40184c95e6a7fe9403ca73cbdfc4a8d583503952cefb6fe14c2f7068eb8019916100fe00aaf205198470 + REF boost-1.69.0 + SHA512 8445e5359d52cf71f0a818c507cfe4746e7966694691e6acaf7284855532245228bbfc3b26fb89d631e1a4d8de72d1a28e50ee60255c8955bef6a28a04b92105 HEAD_REF master ) diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index db12d3b3d..2886f3399 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,3 @@ Source: boost-build -Version: 1.68.0 +Version: 1.69.0 Description: Boost.Build diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index e420fc1a5..6c54d0555 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -11,21 +11,21 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build - REF boost-1.68.0 - SHA512 ede4ea6bba966bfdc590ea21b8787f090c690db851fd6eb19644f089de8828b6cec504a7f4be203d57017de2a0288f0e12772e50d9017287221520dca1676a79 + REF boost-1.69.0 + SHA512 e8d89e75c83a08bab29f52b5100fccf1d2ddf492a532ae4cb8121a5f49819aebb8157d1a1fd7d514bd8a0fe444e5ebb1103b10c8579d5c234ab81110d9c334a8 HEAD_REF master ) vcpkg_download_distfile(ARCHIVE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.68.0/LICENSE_1_0.txt" + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/LICENSE_1_0.txt" FILENAME "boost_LICENSE_1_0.txt" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) vcpkg_download_distfile(BOOSTCPP_ARCHIVE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.68.0/boostcpp.jam" - FILENAME "boost-1.68.0-boostcpp.jam" - SHA512 4d887b05b4873e651fd9bc20f04fc072c7d801fd50445c989517cd39c3a8aa132ed46c407fb0efb35825fc0fc1035393d5ac0da5922be2c120cf2bfff952b3bc + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/boostcpp.jam" + FILENAME "boost-1.69.0-boostcpp.jam" + SHA512 1d05142f33b86a342674513cd5890b78601b0b3824540588f2c9e4c1fea43fadaa94f4a99495614445d3930861470fbfb8ad8c94b8bddf6a24ee65661a9bddc9 ) file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright) diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL index 637b50d0e..60083adf5 100644 --- a/ports/boost-callable-traits/CONTROL +++ b/ports/boost-callable-traits/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-callable-traits -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-vcpkg-helpers Description: Boost callable_traits module diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 166fb666a..985c900cf 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.68.0 - SHA512 1c8d7e95d92996a046cc849216e00ee781b1ad8d9f6e4b7d584ea77bedf7a86a17ba0b43863d445f870a1a7991022e9c1a34fa7039de6fbd419a1bbc2e0e94e5 + REF boost-1.69.0 + SHA512 0bdff6650b996b640b5853c540dab0a22cb6da13182512bfc34608d9bbb8f99ecd01b018106f91b827e5c9c2a9a7c7373128c85f4b533f472c81efab4eef45eb HEAD_REF master ) diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL index 2b34389d5..7c154c473 100644 --- a/ports/boost-chrono/CONTROL +++ b/ports/boost-chrono/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-chrono -Version: 1.68.0 +Version: 1.69.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 Description: Boost chrono module diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index c743a1919..562f3ea1e 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.68.0 - SHA512 a124d6588839405163dcf5de1a81bb8bc57cc0e8914b16ba1dc4cd2dd5497617a03c940c7ef53328ed724a3ee518169454af439168b7f257ad0b6ea8219c986c + REF boost-1.69.0 + SHA512 7de2282c65b4c25086f99602fcb4dc21b0470f327d1d8db530387754cd5710588ea196e0382b64df8c2160274d7d229ebf307d37cd7d0052b1beb182ac9dc641 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL index 01fb2cc36..e56de0eb5 100644 --- a/ports/boost-circular-buffer/CONTROL +++ b/ports/boost-circular-buffer/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-circular-buffer -Version: 1.68.0 -Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-iterator, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost circular_buffer module diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 24c85c55b..f8f815b2b 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.68.0 - SHA512 da2f34f331b3fb24ed6147a67b242f3f4d14eac5fdf524ff57ac6acff0fe73b91bd1d374e61f0314465d5f09d3002bdb442cf2ac5c505b1276d4dbdf75b8cc2a + REF boost-1.69.0 + SHA512 2340ef5d04dff2be8dc6aadd697dd11992c86fcf84da4ea48cac17992b85ebd8f11b26e3772d77110db1ea7b81076c5c29647e8c13a17bbe47063ea1b511f809 HEAD_REF master ) diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL index d7aab8193..f59e7b652 100644 --- a/ports/boost-compatibility/CONTROL +++ b/ports/boost-compatibility/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-compatibility -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-vcpkg-helpers Description: Boost compatibility module diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index 4f3b3258f..f2c362ed4 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.68.0 - SHA512 73124528957098af9480e776419d3a5ed86ec954695c020075e16730de5bbfd8f104e9463bdbc8996423d89ab5a775dc76b5b9127a44a2f53e4691324776bf17 + REF boost-1.69.0 + SHA512 2bac082f818b9138c529089751aea29d3848b90ee213ca58639667b3ffb8fa93235d4d5b3bc248f36dfa8fe79a30fc1f4628adc2637f09df1e0fac7b45e0a893 HEAD_REF master ) diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL index 2bcd3d1e1..858e9b4e3 100644 --- a/ports/boost-compute/CONTROL +++ b/ports/boost-compute/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-compute -Version: 1.68.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-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.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 (!arm), boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers Description: Boost compute module diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index 61441381f..43449f136 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.68.0 - SHA512 f80233128e18b68a592c0585c3721254378a45615a79f8d379ad1654548428a86defe7a5147caa8ad955f3f45a568b81e7d97c08cde46f36f7908e670162ed3f + REF boost-1.69.0 + SHA512 885c91598fc5687e6b6054c49777713dc43843b755898700b6de519e115e1431cd9d11a533d30ad782412da0c2912995bea1a86bb6df7f45ee246cfabe86d452 HEAD_REF master ) diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL index 3d215f848..e50fd5877 100644 --- a/ports/boost-concept-check/CONTROL +++ b/ports/boost-concept-check/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-concept-check -Version: 1.68.0 -Build-Depends: boost-config, boost-mpl, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Description: Boost concept_check module diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 69ba3a7d2..a656e9806 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.68.0 - SHA512 6f7f819fb8e8d03eb8f2f323e50dda583254e4ead58093c74d84271cb4d2ea5c25cac0c0aeffe97a8e209425d844dd6d7fcd687d0690e09b5e8c6edcd0ea6af2 + REF boost-1.69.0 + SHA512 4a3c9833f8269d20486b1fb7e99a9203116f71ed8c6a4339abfe02982fbc3443e2d447e97a7a3915b3fa77db6ba66dc196dc249d3769b741421bb7377b58a061 HEAD_REF master ) diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL index 49fc221ac..db6e4af38 100644 --- a/ports/boost-config/CONTROL +++ b/ports/boost-config/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-config -Version: 1.68.0 -Build-Depends: boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-compatibility, boost-vcpkg-helpers Description: Boost config module diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 899814d49..362560350 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.68.0 - SHA512 2b10be87e3d1a9a64b8b4459ca3427bf6187c53eeaf4551cf3755e4ee6b45e16a28539db0780e6392a3bf862feccffb38042cfb3a8d7f230caa5139ee94b713e + REF boost-1.69.0 + SHA512 c5c6fabbe17f42bbfd0efcb42697eaaf688ceeb6d3a5e16c15e9e60353d99c593eb9b9587c3514642fccab23a869f7235e2531f57ab4e06840e8013f808cf8d8 HEAD_REF master ) diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL index 2facaaa42..4660d76cb 100644 --- a/ports/boost-container-hash/CONTROL +++ b/ports/boost-container-hash/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-container-hash -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Description: Boost container_hash module diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index 223bd63eb..caf24b39a 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.68.0 - SHA512 a0d259fbf66444edbebfcbc02215d2c9bda1a7affa841caca49635bf627a434a8bcde6a8f8e8a49ca6a506d2705d5b6d9a62c7da2fa0626a84690f7c4515991b + REF boost-1.69.0 + SHA512 120a1b6d15344507ab3f81454e9c6059fd2fa3a16fc81b6b2a02c93ed5e4b8d1b180343726a38b44d60c25fcfd6427a2c3741c9e9cf18a26c878d4ad2b806b40 HEAD_REF master ) diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL index 7f1ebd197..2e6613b0d 100644 --- a/ports/boost-container/CONTROL +++ b/ports/boost-container/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-container -Version: 1.68.0 +Version: 1.69.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 Description: Boost container module diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index cebcd4034..dcf82dd8b 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.68.0 - SHA512 648fe7ee8442ac56604e515d64a7932f852319a216b345745714db4d37fce80cf46140a8b14d939c25d12372fb6ee3db55ebaf23f0928388735330d8ddeff7c1 + REF boost-1.69.0 + SHA512 8acfa595a188870f1cfb30bf1600997300260d81f56b8a28de8ab12065e0206b91c27d1203aa2541261ea734a09084d205d197097dbacd4858a736db56c9280a HEAD_REF master ) diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL index 72a71a27f..fa0348e55 100644 --- a/ports/boost-context/CONTROL +++ b/ports/boost-context/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-context -Version: 1.68.0-1 -Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread (!arm), boost-vcpkg-helpers Description: Boost context module diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index fbfdb98f0..78d5efa24 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.68.0 - SHA512 6010cac31d408a9e4a47640b521da810240c697b529e85f97650f022397a55f1b509baf72076fa6e9ebec556c7a38d3da5045e9584c4dbde3d85fa61a5f91043 + REF boost-1.69.0 + SHA512 9764013a43d0c5d73b52a6da625c24ffa36b164eddce52157593e75b9d810a1bff5364a73735e848804be82fc356ef13dd5d796f80e6491fb4c9c57797f0a89d HEAD_REF master ) @@ -24,4 +24,4 @@ boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp) file(WRITE ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp "#error \"#include is no longer supported by boost_context.\"") -endif() \ No newline at end of file +endif() diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL index 55bd2d2f6..1667b1d72 100644 --- a/ports/boost-contract/CONTROL +++ b/ports/boost-contract/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-contract -Version: 1.68.0 +Version: 1.69.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 (!arm), boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost contract module diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 98dc19d93..7a81ef146 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.68.0 - SHA512 bcf68ae08245449f9bbe5987c7afc3a20b2b77c80d615e2463b6f215331032cefdf217976077e0c9622f1376d0226b53aae64ae4b4e53265179d208a0a0f743f + REF boost-1.69.0 + SHA512 d1d0e8c2bb12a5176933e1848d7abdffee5ce58cb15ff73dbf24723cd436a632629023a28ce25fb4fd2d650b5fffd38cac700d5587f239a654a87b6a0c791755 HEAD_REF master ) diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL index 9d59d42ff..b3a43bcba 100644 --- a/ports/boost-conversion/CONTROL +++ b/ports/boost-conversion/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-conversion -Version: 1.68.0 -Build-Depends: boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-config, boost-throw-exception, boost-typeof, boost-utility, boost-vcpkg-helpers Description: Boost conversion module diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 4821ee6a0..e89c3a0e9 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.68.0 - SHA512 7b207134766cf68607e575374cb936c3718328a4d0e9ae1cc245bb0ef727a9d6961a11974cffb2b9abe99f82948d0f7b7f1e9404a55091d88fbce9aab1d673f5 + REF boost-1.69.0 + SHA512 19e8c50e317166595d0b11927e040994c13bda8cab91b2fbc33de5875ac8270fbc4cef43d11149906f4fdd081a46d5e6635793a825c1e4984ec186a03c5f4121 HEAD_REF master ) diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL index 96f967ed5..5bfa01743 100644 --- a/ports/boost-convert/CONTROL +++ b/ports/boost-convert/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-convert -Version: 1.68.0 +Version: 1.69.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 Description: Boost convert module diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 5b85d0a77..b42f37b33 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.68.0 - SHA512 8493a2dcba56c6d7fe9cfb1cea1c4225be5112903071c450a2044462adc46e81bc4c98e3a1a5096b146069686250895dae00d0bdb7e1fbc2627325666e9b744d + REF boost-1.69.0 + SHA512 2461fd507ddefbae59f2357cc5627d52826555913660a4c58910f8562815d0d0e41e7ad169075404ed72fe215d93850775c30f4a0335dc282868dd51f7e0b9be HEAD_REF master ) diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL index 82b3cf767..200efff69 100644 --- a/ports/boost-core/CONTROL +++ b/ports/boost-core/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-core -Version: 1.68.0 -Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-vcpkg-helpers Description: Boost core module diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 1273a72c9..be16b6b2a 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.68.0 - SHA512 3870a595e146172a9e126d0894b4809bc776d66490f3f77112ca34f2c5c559576c732e3dd381d9366b25e46ace6a548741875b9992949aafa7cb5d395e3c9c48 + REF boost-1.69.0 + SHA512 43851113e0202e8b0d1fc479fb6e87a75152577f4309796335e9d23b26b00631beaf7780fb7404f421e1239a7e1c449c3d1c3634f697c562927c1b623fbd0d76 HEAD_REF master ) diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL index e2fcae43d..7fad1876a 100644 --- a/ports/boost-coroutine/CONTROL +++ b/ports/boost-coroutine/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-coroutine -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-range, boost-system, boost-thread (!arm), boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost coroutine module diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 6f4f8d92f..4ae5275a9 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.68.0 - SHA512 47edf91ffdcd4ec8acb98b54f7baa19f280b4d865a6810ee26bbb13cc8f9233e8bbeb8771fa796e2b2fef393352981b737c7987da31095ef65f48f62a8a2d092 + REF boost-1.69.0 + SHA512 12e8abb698d7b71fc39659e43386a7b33227065cb0ccc1f7c4ff972e0d75dca02e26306214a8aea613f4bd2f3741ca930bf412666312465d0b504cee68b27582 HEAD_REF master ) diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL index c5ba714e0..13eb90846 100644 --- a/ports/boost-coroutine2/CONTROL +++ b/ports/boost-coroutine2/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-coroutine2 -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-context (!uwp), boost-detail, boost-vcpkg-helpers Description: Boost coroutine2 module diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 9ede6c004..7fe2063d9 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.68.0 - SHA512 62601d2081a592394ce443b295a9e755513a5e0b10c8791c33dbc4436c37775765a9ac9e49a8a74182759796e1953d1d9fa13e6dcb021b602386eae77d6eda78 + REF boost-1.69.0 + SHA512 278fdeedb5624d17a07ee4b9c1ea8864eb695042c19d59cd4cf519d89a9f33774bc2ee38b5e5c2eea18074abd23711d123549c0df414f65ecdb562256be5b3c3 HEAD_REF master ) diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL index bd8f43151..06b2b72c8 100644 --- a/ports/boost-crc/CONTROL +++ b/ports/boost-crc/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-crc -Version: 1.68.0 -Build-Depends: boost-compatibility, boost-config, boost-integer, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers Description: Boost crc module diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 03f0a43de..3ac1963a4 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.68.0 - SHA512 8d29e20bae0b86bb7592b08a25d0a5c2b8ff83c1ee5aeef1cb9f1b97fe798f743b4ad6c3f1dc59fec54761b2440fc6c8cdfe6f7f4eb7c7352a3ff90c383abf87 + REF boost-1.69.0 + SHA512 10cebe78edc8201bed71dd21fe3cab5e1cc7fe1bcb5a52be253f1ec33fabd7f9bb7e7c553785dd1752548c4b8ddd7262de83b84f476cafe8da8a71ac5a0e9e85 HEAD_REF master ) diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL index 348290261..8e8d74c82 100644 --- a/ports/boost-date-time/CONTROL +++ b/ports/boost-date-time/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-date-time -Version: 1.68.0 +Version: 1.69.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-mpl, 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 Description: Boost date_time module diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 0e664c2de..114d9255e 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.68.0 - SHA512 c48d488cf72bc2a7e10e6068fe1b541718bf1f402ec20bbae56da4b0f712804e21ed7613dbcd5fcc6f90adc59d867bb88c4ddd35d3200e50d291ec9d213660f3 + REF boost-1.69.0 + SHA512 5e95ba32467b1431cd0d353f4bebdbf031d6ad6f18c3f462de5931a272b4448b628a68682ced538b11f28c1be0817378800d5e62764feb23736f7b5e96f33d1d HEAD_REF master ) diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL index 3782d8900..da02cc028 100644 --- a/ports/boost-detail/CONTROL +++ b/ports/boost-detail/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-detail -Version: 1.68.0 -Build-Depends: boost-compatibility, boost-config, boost-core, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers Description: Boost detail module diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 0a4e1b2e1..f4cb94553 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.68.0 - SHA512 0e8188bc2ec189754a078b2b875d996dd485972ac995a999bf5ebbc6379ef299e7ba8d38066efac2d37d6a12e7ed6ee97d120ac334ea022a54609a18bd2447ec + REF boost-1.69.0 + SHA512 f787d14e9d980b5f568320982952bdb122402d3a017d26e90a7552f3dfe4f4a8ffff12f6f7a83ba9434ae1affa6946016a549ae27df829fd323a7543e5f7a7ec HEAD_REF master ) diff --git a/ports/boost-disjoint-sets/CONTROL b/ports/boost-disjoint-sets/CONTROL index bce4318a6..800b96123 100644 --- a/ports/boost-disjoint-sets/CONTROL +++ b/ports/boost-disjoint-sets/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-disjoint-sets -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-graph, boost-vcpkg-helpers Description: Boost disjoint_sets module diff --git a/ports/boost-disjoint-sets/portfile.cmake b/ports/boost-disjoint-sets/portfile.cmake index 71afb65e0..5821422f1 100644 --- a/ports/boost-disjoint-sets/portfile.cmake +++ b/ports/boost-disjoint-sets/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/disjoint_sets - REF boost-1.68.0 - SHA512 3ce49942da8b37ad9a094bfbb7eda38efea2d50f70192246e955d4d34970b1069e1c04bdfa1272e6d92a31875b335e2eb2333ed66dbb8231d8206c5faac618a4 + REF boost-1.69.0 + SHA512 2d43ec3020249c232b35ce6ab6be541e4dbdddc4dbe9f0e2f92796e3200670df03c40651c0d7fe3f91f89b2524b0f023a4152e80d8b3ee7738ea5fa6880801e3 HEAD_REF master ) diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL index f1787f9e1..6a06ccf7e 100644 --- a/ports/boost-dll/CONTROL +++ b/ports/boost-dll/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-dll -Version: 1.68.0 -Build-Depends: boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-move, boost-mpl, 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 +Version: 1.69.0 +Build-Depends: boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-mpl, 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 Description: Boost dll module diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 485476cc7..875401da8 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.68.0 - SHA512 5f45561397b8860da4cf9839bb7dbc79127c90f4134d038933414eb44cd1b2af422ee83df08ff6561e7dbab408159e64ef1c34594d1037a978478bd3fb4fa3ca + REF boost-1.69.0 + SHA512 b2948d2e7dc7899533a4ee073d6386166ccaf2fcb40feaa2a98e86f453cd58d74d7e75100cb0e85064ef11fe7caf065e165344463cbe3631333b4c8a3c6a8f50 HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL index 9f7c179e2..95e899824 100644 --- a/ports/boost-dynamic-bitset/CONTROL +++ b/ports/boost-dynamic-bitset/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-dynamic-bitset -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-serialization, boost-vcpkg-helpers Description: Boost dynamic_bitset module diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 8ff4350fb..95798b5da 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.68.0 - SHA512 7fa486d3088966fedcc30cced1282b997da39134dc1dcae3382a532c5b64a1965b761f8fd130ca7901aabd77375a84c66597c509c612ba1f99c238c0a754974c + REF boost-1.69.0 + SHA512 80e8b4f8f1fb0d5955e7f9ec92d6d39a214e0443d3a85b633dbc3abdb29d9b401ca1698097e12a25bbc94b6bd722a9cf7698ab4deb61a69ca8a2d84083765290 HEAD_REF master ) diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL index 325a29aa1..bc2baadc4 100644 --- a/ports/boost-endian/CONTROL +++ b/ports/boost-endian/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-endian -Version: 1.68.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost endian module diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 79adace7e..2fa8f985e 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.68.0 - SHA512 40d7b241198f3146b0dc4ff7ea637f8fdc28b2dca12badaeea6434ba1c56f2bd6ab0027e84da3805ba57daf9e3f99994bb2fbcac491eca39bec4e16b363c7da1 + REF boost-1.69.0 + SHA512 13f96af6696b8ba353ab7c11dc2b26db50038b44c44287dd927b78b7ff55fa6fb37002980c878e850cfbe7b1d264722bd632db88404ac2df641b5094229e5e99 HEAD_REF master ) diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL index f1d18a047..737e7876a 100644 --- a/ports/boost-exception/CONTROL +++ b/ports/boost-exception/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-exception -Version: 1.68.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost exception module diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index e84166be9..bc699965c 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.68.0 - SHA512 91eb014c73afe3dcedeacc827e12705530d97f1f3797cadcd17972ce016df630bb22eff27c5f2aec7380047264b90072ba4f17d37e93dbccd5cac7fdd7e32b2e + REF boost-1.69.0 + SHA512 25dd5e1721e6c4668530a90c7bcd4d0adf7312562dbb62dc3a34ac88cb8d4206072dbd365608cd5fb1b3f5eab82686035bd4fba1f4e76b603b95e6d51b090e7d HEAD_REF master ) diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL index 1dd685de9..b25d07ded 100644 --- a/ports/boost-fiber/CONTROL +++ b/ports/boost-fiber/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-fiber -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers Description: Boost fiber module diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index 7fddd97ef..bf09a86c9 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.68.0 - SHA512 54325a9b6fcb7d153fd8705a44a802ad34d55af042bee9b74beebda6c66e470cf08bfe49ada6c8d9f2603847d7b695ceba7ebed8eaf1dc3fdf069d07717a47a9 + REF boost-1.69.0 + SHA512 c76794d63742ce9b4cc2d0aea2bc806071ea8ce03bda3759ab225edfd2c92c30bb437027e8bb8d6e526406180589f1021f64611a001545a68be41c9a41714a47 HEAD_REF master ) diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL index cf685a086..71630d843 100644 --- a/ports/boost-filesystem/CONTROL +++ b/ports/boost-filesystem/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-filesystem -Version: 1.68.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost filesystem module diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index d177e7b18..8fe22e891 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.68.0 - SHA512 0861e64016e5c133f811735701814e0d35b99366835fdb9de0238e6c194b1c029d8fae9a1bb32e518729eab33f4e65700f8a5e5f14f06c64085873946dbb9163 + REF boost-1.69.0 + SHA512 d278883d80245018a431fe5c169ecbfbf21380b3a1fb491a49aa74ad26a2db6336ef5309143ad19a08aacc9c647a264714823f415ef9fe3d4795f4b2d5cdcde9 HEAD_REF master ) diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL index 0817a8d62..0f6e0c74a 100644 --- a/ports/boost-flyweight/CONTROL +++ b/ports/boost-flyweight/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-flyweight -Version: 1.68.0 +Version: 1.69.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 Description: Boost flyweight module diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index cf4c0a141..4d30fe96d 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.68.0 - SHA512 0d27d844d3f0899013d70f29c507cbefc67b76a4b9803aada0201946907705b1ac81aefda88855252806284e3ea9e074769f26eb65ae1d82e3ffec4a0ab59951 + REF boost-1.69.0 + SHA512 85d2d5045c920bf46d0715805ecf3de13b59974b9a7add7baa66c9d726fdcb20e4e481a24724e52aaff050615d8c52742b764397512676065e654aeba50e81aa HEAD_REF master ) diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL index 914f3b565..4acd878b4 100644 --- a/ports/boost-foreach/CONTROL +++ b/ports/boost-foreach/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-foreach -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost foreach module diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 4e84360d8..e5379ea48 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.68.0 - SHA512 501f7caf4f0f4119e110aaacd6530cc7ed6df75b39e9fbd4e3423e4089f7ebdf2ae918a09ae140fdee4ef4eb9f787df21fe1c664aa031cdf1bf4fc447c9c69b0 + REF boost-1.69.0 + SHA512 fc7f18b8fbc4bbbe15c32ac8d75b8a783f4a24ae7e90371b57c3ac1571486d0c8ceae88ac943e8192fae5a8ee8e6ec6b59b17c295a4855762f148269a16d087d HEAD_REF master ) diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL index c23ee8cf7..0b2637ef5 100644 --- a/ports/boost-format/CONTROL +++ b/ports/boost-format/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-format -Version: 1.68.0 +Version: 1.69.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 Description: Boost format module diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 7e0537e06..783702c4f 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.68.0 - SHA512 556acda0d0c7f7dc16cb83d0184aaa14dd0b1978f09c52dacc02a3e86d5d39a18e58d46818a18be36f781177538aa927c74cc48cc7bf5647aafc0ff1d4097d56 + REF boost-1.69.0 + SHA512 094cdc1dee2020b20c78f10b1478f820948ca31c0edb258c8fc38b21b8fcdee3648eba50d536805ca19536b83e54516160e43895e44ba5403f7e7c4b5dc75d90 HEAD_REF master ) diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL index 9a9bcb58c..cdfde4442 100644 --- a/ports/boost-function-types/CONTROL +++ b/ports/boost-function-types/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-function-types -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers Description: Boost function_types module diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 06ea8e7d3..580bb7496 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.68.0 - SHA512 1b3c41f5bb63b2ac6e2c303c66846c0e0041c536630dc0fe8260d72e91997d991fede951dc22809523c56f6bd951bf61e5c26f9fcef5d0b1721a1fcfa678008d + REF boost-1.69.0 + SHA512 642f95aa23254edfc650dc2eb729eb541f507de2ad8d20091e8bde35f4e471b04ab6a8140cd8bf891866e74ce739e3821fddae653a4cd11a2066d1d93061b253 HEAD_REF master ) diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL index 67885ee6b..a5d118abb 100644 --- a/ports/boost-function/CONTROL +++ b/ports/boost-function/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-function -Version: 1.68.0 -Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost function module diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 277bfb99a..b5c19fc38 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.68.0 - SHA512 71e472987e07a3b60a60231b8e8e18a5ea7883ac9535741fd3ee1e95358e92ac4e00ed94f2428e31483f68632504704b245ad9bc42500a987eb11bbdbce9a7cd + REF boost-1.69.0 + SHA512 58d764e454aacaffb0baf299483be98e3eacdbd8a4e209a6b91727a18c9839e561da5316b8238b397c62a6d9e49631226239d9d3ba20e77b9b1ce648ce3bf940 HEAD_REF master ) diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL index 5abca38fb..912eec3a2 100644 --- a/ports/boost-functional/CONTROL +++ b/ports/boost-functional/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-functional -Version: 1.68.0 -Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost functional module diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 0dc76ca80..88956532b 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.68.0 - SHA512 ca784716ed5fe2991cffd60534088e810854fcae1286fc9483d972e2d3c4f5fa6141943d276afcd3064a85f7407ee6db44fd3fb29580501972f6f3ebb8d3bcf2 + REF boost-1.69.0 + SHA512 08d4efb9732a1d3fcd91fcbf90cfbac0a4db80b50101c5466a5ade3bee90c7a5dd42375061fd302d9aea1e2f8d9f9b7986f2ed05f3f224c617741bd76776ceec HEAD_REF master ) diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL index 679e8267b..c648924a2 100644 --- a/ports/boost-fusion/CONTROL +++ b/ports/boost-fusion/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-fusion -Version: 1.68.0 +Version: 1.69.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 Description: Boost fusion module diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 0a3848099..0d6f6a962 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.68.0 - SHA512 335400ecf1e9ce1e2cb40beb449a06e4d620d018c17383ffb6ee26a5fd676e2add905636db777e839d63639724b5745b740a65d92578e213b25ce2041afe14f6 + REF boost-1.69.0 + SHA512 fdf2dac6416f46c5d1dae6401bd224a55d693cfb7aee72f189d7cf7bc8103df2b68123f8d17e9a8081eacb83fa334e7a031098bd8626e77ef1cfc15617e821ad HEAD_REF master ) diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL index 1d044e1a2..4d1326f47 100644 --- a/ports/boost-geometry/CONTROL +++ b/ports/boost-geometry/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-geometry -Version: 1.68.0 +Version: 1.69.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 (!arm), boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers Description: Boost geometry module diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 320e8f6ca..9e4211f34 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.68.0 - SHA512 eecfacd3398238651d3bf02d6d8a8eaac15b262fca8652c6a5a60292ce6ded940176a061a705acdf7176732f48fe20ae388fff65c96b5742275506dd0a587e3c + REF boost-1.69.0 + SHA512 a79a377497bb8270282032e77c62ba3afb25c2201dfdb26de37373141e1a4fa4edb3da4b2de22a1fccb1cbcb52c164ce98c8bb2b30b097509a38e062df85d3d6 HEAD_REF master ) diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL index 0326d1318..f3ad97c66 100644 --- a/ports/boost-gil/CONTROL +++ b/ports/boost-gil/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-gil -Version: 1.68.0 -Build-Depends: boost-algorithm, boost-bind, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-iterator, boost-lambda, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-bind, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-iterator, boost-lambda, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost gil module diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index e278c7e99..dcf0da0cd 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.68.0 - SHA512 d3a965aca410f91c214d8f433273e08eefcc20f0e470baa2aba3385ce45a0e18307aae3b81ea619abe39066e4fd924476b7f29c8f45e1aff25a2a7d3eb4062fb + REF boost-1.69.0 + SHA512 2875d2e41ce429c1e2b8175efcda75319383431887c30c07da0051cf7816e16ce0db13093bc4fff89d4d2f2f0224ebb6d3c8a00eb38c130f9234046fd52fe006 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL index d63394336..861b1e550 100644 --- a/ports/boost-graph-parallel/CONTROL +++ b/ports/boost-graph-parallel/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-graph-parallel -Version: 1.68.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, 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 +Version: 1.69.0 +Build-Depends: boost-assert, boost-compatibility, 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 Description: Boost graph_parallel module diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 26323675b..195508e2f 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.68.0 - SHA512 668f8d2569cad12e5b5b173b0da012c1c43eb27e4a74d036b7bacdee3417a5148c8b30ecccbbd1b2cd30a8ffc92b6272a268b5595d5965a22a068779f8c2d1c7 + REF boost-1.69.0 + SHA512 4a475e105cb6c310c9edc59a43a272635af48c3b7fcc7c1b8f5d9f2f921f64a9a4e50dbc558a7f8d07038fd9f6af39b152a7997c9dc0c9094efdb11ff5ab9114 HEAD_REF master ) diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL index ffc3d629f..b6df893ab 100644 --- a/ports/boost-graph/CONTROL +++ b/ports/boost-graph/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-graph -Version: 1.68.0 +Version: 1.69.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 Description: Boost graph module diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index b8285391c..fcbfc07de 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.68.0 - SHA512 97c05b444d5a4fbf8a881d5f674098b88afc6a331867357ff46c5372bd666847431e49e5f9fdca39a54bb1f56654c8c23a3cbfcf254e56743e7e9b20fe7fcd30 + REF boost-1.69.0 + SHA512 9e8a165d87c100e0b10ec0f1a88c29fe35c6056163a9c657b9a02a064199bb511a17b03720204e37b0651468690c5bb704ef28778ef718e8593930375e9e4a2e HEAD_REF master ) diff --git a/ports/boost-hana-msvc/CONTROL b/ports/boost-hana-msvc/CONTROL deleted file mode 100644 index 0d2f178f8..000000000 --- a/ports/boost-hana-msvc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: boost-hana-msvc -Version: 1.67.0-1 -Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers -Description: Boost hana module diff --git a/ports/boost-hana-msvc/portfile.cmake b/ports/boost-hana-msvc/portfile.cmake deleted file mode 100644 index a736e9324..000000000 --- a/ports/boost-hana-msvc/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO boostorg/hana - REF 7f1ae3b1bb52f6eb329300a93dc02309c94dfe01 - SHA512 5fe1962ae270901b58eec83750edd02cc7192b4fae4add72849efbb9989dd5f9a0e3a85f3e3a7525fce38e6ef5bca210993b89d04a1c39bd0421bd0a6f4c92cb - HEAD_REF develop -) - -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL index df3af582a..ef0cff420 100644 --- a/ports/boost-hana/CONTROL +++ b/ports/boost-hana/CONTROL @@ -1,5 +1,5 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-hana -Version: 1.68.0-1 -Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers, boost-hana-msvc (windows), boost-hana-msvc (uwp) +Version: 1.69.0 +Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers Description: Boost hana module diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index ebc34aac3..ac7e385a3 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -1,20 +1,14 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 include(vcpkg_common_functions) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) - message("The current MSVC releases can't compile boost hana yet.") - message("Use a fork from boost 1.67 which has source workarounds instead.") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.68.0 - SHA512 93b20dc496ac6fa58ae75d523b8782b7c17398e93286698b48666e59af0c7df7410153dc02a8c4ca940d02ed8b948ea6f47b8f884ae2867e0cc8741e09e643ff + REF boost-1.69.0 + SHA512 d997bad499b654ccab90fa30114fa99c2504e06d61151bf41250f9e606808bc0dfb11b00a563de485e830aed7867b6968541547e0e9c1a0795ae4a09bdba0283 HEAD_REF master ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) -endif() diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL index 9dbacc49b..1f7e4d7a4 100644 --- a/ports/boost-heap/CONTROL +++ b/ports/boost-heap/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-heap -Version: 1.68.0 -Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-integer, boost-intrusive, boost-iterator, boost-mpl, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Description: Boost heap module diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 4ac883b05..4ba500922 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.68.0 - SHA512 3aac4ee8f4ce4c578f83fefb19532aa859c966fa807a2f156a2428c4e9d44e3e5c09ff4588b43a9dfe46f32dadde03e942f8025551c267e677b3aad20343cbd1 + REF boost-1.69.0 + SHA512 331a8ccfb5d41f3881ada825162a6d1ddd33e161edbd5cece4d65844316a5280e9ba1932efa43a60d7c3c0f538cfde5941060183c09382f58955604e7e3b909e HEAD_REF master ) diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL index 38d3ebc63..f2cf84019 100644 --- a/ports/boost-hof/CONTROL +++ b/ports/boost-hof/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-hof -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-vcpkg-helpers Description: Boost hof module diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 5b8d97df0..358e67eb4 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.68.0 - SHA512 2400bd9f4329813802e569c608cf997c8fa571e042ab3811e780f7f95e69dc91ae9a31fc591aee75f80e85218147c442ed1b95aad533c5c4843310b5f9ced4ed + REF boost-1.69.0 + SHA512 a49e800a59a3c3733aa647676899bd935c7623d18e6213b949def6ed2aff5cea240a503eb4a1cc2446fd3c7ef01f0d03f546cf4e49b16d9dced3530797670924 HEAD_REF master ) diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL index 1464e6c7c..e723346ac 100644 --- a/ports/boost-icl/CONTROL +++ b/ports/boost-icl/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-icl -Version: 1.68.0 -Build-Depends: boost-assert, boost-concept-check, boost-config, 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 +Version: 1.69.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 Description: Boost icl module diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 8ab45b5f1..cf33c8ff9 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.68.0 - SHA512 cdeba509b2b41c8dfcd808c5c6d478035cf48b0110e66889a8f9bc2183a8f5635e263f761894a3370d5ca421a08f2ab8c4f03b384ff3fe3eaeb9dce113d3c2e5 + REF boost-1.69.0 + SHA512 520780eea6e2c7e0f9b81b899684d44655b95742fc4c3eaf812da527ff0dac607d760ab03bdeaeb2a963162651ed4a93a21c89101f957d0a959d3b88582623a1 HEAD_REF master ) diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL index 795c28fe9..85c1a888b 100644 --- a/ports/boost-integer/CONTROL +++ b/ports/boost-integer/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-integer -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers Description: Boost integer module diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 6c9e8140a..36c15e9f2 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.68.0 - SHA512 3d257bb5b8313c2a884fa9959efe1f6d287c06e1b5746cbc4f9ae5694e61dfb2821d07b355d7e544594c9922a1ec86009dc8f92de9fc4d7b74db3383a817b3ba + REF boost-1.69.0 + SHA512 69bb40592bdf3018facb083e9a9df12093f04e6f024526e39646cb3f4cc1ba5cf8468fd73a424050fc3b93046961fd3c83bb92e38e9f14b17324501ddec63115 HEAD_REF master ) diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL index eaab7fe54..566a7dbe2 100644 --- a/ports/boost-interprocess/CONTROL +++ b/ports/boost-interprocess/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-interprocess -Version: 1.68.0 +Version: 1.69.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 Description: Boost interprocess module diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 8a6ab0b60..3dd4adf4d 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.68.0 - SHA512 f3899c4b6aa4619ff93715c2cca13782c7504cbb871adfb2e74e57534bd130b132a109726ecd5c3e9cf63794a90fd39c19f34f4011f702e6c427058bdaf9aad0 + REF boost-1.69.0 + SHA512 1bad3bb5e9fa59c48607ea2d668b61fdc15d60ab0e9f6cd04d1fcd972932b2466e94203062a65142b1b810e26b0cb59fd0890aaa4b764ac03d16ab3c95454d73 HEAD_REF master ) diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL index 43d56a644..82c37ae68 100644 --- a/ports/boost-interval/CONTROL +++ b/ports/boost-interval/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-interval -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-compatibility, boost-config, boost-logic, boost-vcpkg-helpers Description: Boost interval module diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index dda65b7bc..7d2d747c7 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.68.0 - SHA512 68596d0516e21132d9ea490ad7cdc66ed17e58f27a4f2a602481ba5e1b38fa51d6d4300108c2eaa1c457493212ee36ecd6f1d2a4b6ca3d1a4fbee23ad0216b38 + REF boost-1.69.0 + SHA512 203e19a3c87fa50b22fe0c194f7774fc7dcf7ed7cd21add4bad8cdd1251783a7b173e1100cf33397d69aa3636a4dc4f2341f4a7dd8ac8c7c7f0781e9d48e1001 HEAD_REF master ) diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL index 7a2fb5c15..0bde2258f 100644 --- a/ports/boost-intrusive/CONTROL +++ b/ports/boost-intrusive/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-intrusive -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers Description: Boost intrusive module diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 20e28c310..6d358b98f 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.68.0 - SHA512 f37c6b1198dc811a8b169b9161ad89eb84db2283456b25f7d5eab770f2fe9ff1991da3655dceff23bc3d7bbf3b0d266f0f6f7e6e35fb44a3a6bdf8af651d4208 + REF boost-1.69.0 + SHA512 1f89c9d217934db8d5a3aa169a21deed59d0f50b49ac58258bbc1f8c539df7a03d6cac0cd8d1668e73747153599f24cac87c683b12e32d9cc5f7fda438ad1d66 HEAD_REF master ) diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL index 8167e9047..c5b043db0 100644 --- a/ports/boost-io/CONTROL +++ b/ports/boost-io/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-io -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-detail, boost-vcpkg-helpers Description: Boost io module diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index cfd71f00e..e2b759b91 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.68.0 - SHA512 a1971233e7deccc8354abeb6ab9b4e5955e4ed8b37ab563c0b07e8afaeec6f5c218f06dd60b19df8b836125f431a7032fad4f8b25e14484db5fac1eb9d1cbe01 + REF boost-1.69.0 + SHA512 d00c93d23edd21042888bd2abee97eef1a16a25d3621a66273fe10ae56c90381b3b5c94e1739afd2a4b829606f6dd16513bedf450f2d0109bb27108443dfab3f HEAD_REF master ) diff --git a/ports/boost-iostreams/CMakeLists.txt b/ports/boost-iostreams/CMakeLists.txt index 17e0af6de..454e74845 100644 --- a/ports/boost-iostreams/CMakeLists.txt +++ b/ports/boost-iostreams/CMakeLists.txt @@ -16,8 +16,8 @@ if(MSVC) set_property(TARGET boost_iostreams PROPERTY OUTPUT_NAME_RELEASE boost_iostreams-vc140-mt) set_property(TARGET boost_iostreams PROPERTY OUTPUT_NAME_DEBUG boost_iostreams-vc140-mt-gd) - set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_RELEASE boost_iostreams-vc141-mt-x32-1_67) - set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_DEBUG boost_iostreams-vc141-mt-gd-x32-1_67) + set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_RELEASE boost_iostreams) + set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_DEBUG boost_iostreamsd) endif() find_package(ZLIB REQUIRED) @@ -30,6 +30,9 @@ find_package(LibLZMA REQUIRED) target_include_directories(boost_iostreams PRIVATE ${LIBLZMA_INCLUDE_DIRS}) target_link_libraries(boost_iostreams PRIVATE ${LIBLZMA_LIBRARIES}) +find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static) +target_link_libraries(boost_iostreams PRIVATE ${ZSTD_LIBRARY}) + install(TARGETS boost_iostreams RUNTIME DESTINATION bin ARCHIVE DESTINATION lib diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index 022aa76a7..c8763146c 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-iostreams -Version: 1.68.0 -Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-mpl, 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 +Version: 1.69.0-3 +Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, 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 Description: Boost iostreams module diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 4463749be..d15007e70 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -5,10 +5,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.68.0 - SHA512 a0c008537c2ceb8ea4f9d1fe7e66fea01f55d753e3b349aa3f664f7a0cd129f11770e520645a18feabde4110f6471194e8bae2479b95ac6d13d8b42be43c5f2e + REF boost-1.69.0 + SHA512 263d06f2533a345eb4fe3926742c6606b486d9f7d024a001f00b09592201ee987854036174b44c39c6d9a47b52262a96f9a8ebf2af215ef217fa11aa1209fe86 HEAD_REF master - PATCHES "${CURRENT_PORT_DIR}/Removeseekpos.patch" + PATCHES Removeseekpos.patch ) vcpkg_download_distfile(LICENSE diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL index e428601ec..4d72f30c5 100644 --- a/ports/boost-iterator/CONTROL +++ b/ports/boost-iterator/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-iterator -Version: 1.68.0 +Version: 1.69.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 Description: Boost iterator module diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 88a664b8f..05cdb6957 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.68.0 - SHA512 e8e223bc5b9334618d676e2aefdeffdde6f31097b634d2ca1fa3d6e73976c42dd123ed76081e13d1f023a7d39f49cc53d63b28e541c2aae858cbf569818bd14e + REF boost-1.69.0 + SHA512 7f5fb06fdc48feb16eab33c6726713bc45fd4ed73598ffc55ba30a2cdd46ebc5d5fe858c0a2d93a348a0d3397891d8c33e6e2a5fce70aeca1d3be6586c269271 HEAD_REF master ) diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL index 9355d323f..460510402 100644 --- a/ports/boost-lambda/CONTROL +++ b/ports/boost-lambda/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-lambda -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost lambda module diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index b8303375c..d21189764 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.68.0 - SHA512 7395399071a6d63027685e00f67af1db87e1f89bba54f7f78ee05d1e80d0c7253382f451dcff7c077088f6075f5bdd52d0dfdc745b8a337f575075c5bfd87f6f + REF boost-1.69.0 + SHA512 6de7a65898b08ced82dc6ff0662d1373cedaa53f4aadb7a2c47f611fd67735ed8b88d539829047ce059c27404d33b119dea116661c0124a3445efa426da88f56 HEAD_REF master ) diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL index 24004d459..10a4c38de 100644 --- a/ports/boost-lexical-cast/CONTROL +++ b/ports/boost-lexical-cast/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-lexical-cast -Version: 1.68.0 -Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-mpl, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost lexical_cast module diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index bd61dffc0..2b975b3df 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.68.0 - SHA512 212bc947b64e07e2c3f41663dba157960895539a7662e13d53ccd3327c0cfb506d2294badd1b6c6f102ebc851ba602c384d1eaf85a4875e9d538dc23340cba75 + REF boost-1.69.0 + SHA512 3cb8d3a300656b550d22959552e512369239a72336310678c13277f6f94fe29725c1645fdac4a0ff6035a2728e30baa3bd97e2e412d910eda2f882eb263fe3ed HEAD_REF master ) diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL index ae5ba5580..4ee73b1a1 100644 --- a/ports/boost-local-function/CONTROL +++ b/ports/boost-local-function/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-local-function -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost local_function module diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index b28718cb9..b6c2696a9 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.68.0 - SHA512 063158b6a66f82521298b22a597442671219e76a038452cb163de6f095682cfbfaf998a2b69adcd2913f9cf8a633b7e99b1e540a60e3c95092162806b92d23f0 + REF boost-1.69.0 + SHA512 9bd3869a6abcaa0366adcb093dc13447b9402d4907b9df1433b74cee69651393a843e88ab16eb38f71c4549adef139796d43a55c28868b89415466f82e013ec3 HEAD_REF master ) diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 3bc4af166..bbe8232ba 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-locale -Version: 1.68.0 +Version: 1.69.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-thread (!arm), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) Description: Boost locale module diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index a6678b505..794c4e507 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.68.0 - SHA512 6e7c85a307ff8c8f41b1002e02c5c68d9ca5c89e95063adc0f134a5c96be728334f1a0548f92c07f85ed639b73588e49df1b0c2d964fa83cee86c746634d5b94 + REF boost-1.69.0 + SHA512 64f738c10f35627a0949e5fa37743374f6d6644c05372d5b019468fc0273e13c024068462961376a663168ee29e7abb2c9c9c07078fc5797bb93e0b15baef2be HEAD_REF master ) diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL index bc193d0ec..f389e1ced 100644 --- a/ports/boost-lockfree/CONTROL +++ b/ports/boost-lockfree/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-lockfree -Version: 1.68.0-1 -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-iterator, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost lockfree module diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index d3563af0c..e3800b3ad 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.68.0 - SHA512 ccdd2e1e1815140c6ef5f7ca7d2b5551038f14b4cebcc5ce95c15ee0799a2e9cc2c1027d166be975d06d9027386992ab5c40f8c1b633b9c82eb087c9ad648d8b + REF boost-1.69.0 + SHA512 e0ea8c20973512d173bb1ef15c5e8b7f946b346ebcc2040283945d0db663a8afd61b854290670cc3d281be516c787af7eb2dbc310b20aaca610ba38888062eef HEAD_REF master ) diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL index 0d3860587..57dd3bb14 100644 --- a/ports/boost-log/CONTROL +++ b/ports/boost-log/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-log -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-align, boost-array, boost-asio, 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 (!arm), boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive Description: Boost log module diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index cbc96ef87..1e52fe3cc 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.68.0 - SHA512 d12f9b2d8f782e4df5df16fe6c5267c87266348f6c7c400a9c6ff0b1b7af34ee8baf3d0b4dc4aef20b0a5faf4582d5c90d3429df84d903773bef3e61df93a0d9 + REF boost-1.69.0 + SHA512 d6ce7f8cc1ce2aac89adf920131b02197f37ced2d0f059a9353dc21770e34c539bbf771208f6ed293039cddb363b948b6ad4956f2819ed49478537a9305dba54 HEAD_REF master ) diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL index cad7c4d1c..b6797de7b 100644 --- a/ports/boost-logic/CONTROL +++ b/ports/boost-logic/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-logic -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers Description: Boost logic module diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index 65810e540..b16b1817c 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.68.0 - SHA512 9d37657394355cad8286bafceefd93112552c2b867e2d4508a16eae8f051922f14f67f3a2cf903f8c371618c4eeed7d70a4bf9067b8404b66b6f224fda5ad85e + REF boost-1.69.0 + SHA512 521144c4095b73fec427b8d424e8632de2795c9b34c5dd928499f2958a72d84f4ddaf20aa1a615ff1537506c7e088a45a1e4a7e17a9db9ea309309657e83b9c4 HEAD_REF master ) diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL index 3667203a4..244fc4e99 100644 --- a/ports/boost-math/CONTROL +++ b/ports/boost-math/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-math -Version: 1.68.0 +Version: 1.69.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-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost math module diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index 3ad1251b8..f4adc4d66 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.68.0 - SHA512 3727b6245fe3e6ba3af06f4653251b7d553dc01b83b06b812760e20fb9cd0bbbb2fe0bd7d3cc8b035f503d93e82e51ddb129b1e844944c1284560b212f663748 + REF boost-1.69.0 + SHA512 9aedd1d8e875d2c5ddd3e7feaeeeaf0524ee7111a26634559548f33f99d190ba33623951c781271c600880dbe8cf36d4b7f4c2212a6ec2c3804d488dec61c642 HEAD_REF master ) diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL index 23d84cff6..e5b51a0ff 100644 --- a/ports/boost-metaparse/CONTROL +++ b/ports/boost-metaparse/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-metaparse -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Description: Boost metaparse module diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index b07eff75f..15e02b1a1 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.68.0 - SHA512 2ab40e9ea0d14d4aa0b98b619a520d5fe974be9f89604d27eed0f1164762e239ce1b2d936faaed0574020dd5162dcc74a89a0ddf9835380abfa5aa10882cbe7a + REF boost-1.69.0 + SHA512 f2720f51ecaa67a61f43eac0112fad40f67ab3c6fef431adb012f644063a10c9870b85f3accf35b09bf163cea59715e25e06cb93d0ba6c9769c44cebc3205b68 HEAD_REF master ) diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index 997c1234e..d85c8d662 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.68.0 ; -constant BOOST_VERSION_ABI_TAG : 1_68 ; +constant BOOST_VERSION : 1.69.0 ; +constant BOOST_VERSION_ABI_TAG : 1_69 ; 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 2ff2bb0d6..8daa3265e 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -349,7 +349,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_68" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + string(REPLACE "-1_69" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME}) if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL index bfefee6c0..8b0181ef4 100644 --- a/ports/boost-move/CONTROL +++ b/ports/boost-move/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-move -Version: 1.68.0 -Build-Depends: boost-assert, boost-config, boost-detail, boost-integer, boost-static-assert, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers Description: Boost move module diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index c7b0a9387..d13e4df9d 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.68.0 - SHA512 7d7032d182a37ba8feb4d60520aac6c31e00c81f2dd7523846f9dddf5def6b78fc74d0f7dc769609d252fdac81a1cbf2e4897b862f35313084b69f6539abb7fa + REF boost-1.69.0 + SHA512 c7cdc3d2452c4399f1e2f128e0d2e85c79ab5e4f45abee79b8fdd2e8df66e92974f6fa29e71e16e609fd69b5b9611a7d51ebbdd12af8af71d3cff6405c301f99 HEAD_REF master ) diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL index a251cdc33..248956845 100644 --- a/ports/boost-mp11/CONTROL +++ b/ports/boost-mp11/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-mp11 -Version: 1.68.0 -Build-Depends: boost-config, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-vcpkg-helpers Description: Boost mp11 module diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index b64e20813..e9494bd22 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.68.0 - SHA512 828efcb915b5702c0ff673cbd1543110c60dbd06718fe225e6156d173926b9663bd56c3c7e11c2444245447d776e4135f280f0dfc0424ee1f224a49f95360be0 + REF boost-1.69.0 + SHA512 61ea485a6d325cbb7e728a4a3725d88db4d0672c092bc3aef442be6ef1f7535db6c107fe2a582a2c69bb81b927a32fab61e6d400a7b748e5d202cb3c544e99d4 HEAD_REF master ) diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL index 9ec537adc..9f0d77592 100644 --- a/ports/boost-mpi/CONTROL +++ b/ports/boost-mpi/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-mpi -Version: 1.68.0-1 +Version: 1.69.0-1 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-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi Description: Boost mpi module diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index 583ee1c56..ce760fab9 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.68.0 - SHA512 63d6d7d37a96aa5456c90d7c219603d9a36e94de5009af0cfbab7839f1756188ebda8c55f7333124e6d61a7d73e68a9c2dab6eb12f6b4c7ecd06ff5cad0bb231 + REF boost-1.69.0 + SHA512 4adda4da59b49f73a4da70fe091027046964191eeb24d29a16f027b3273ba5ac9e0552061cba15ded70db4839f7c8581c26f2b9dde16c2abfabb434fdbbcc106 HEAD_REF master ) diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL index c267b3738..a802cb87d 100644 --- a/ports/boost-mpl/CONTROL +++ b/ports/boost-mpl/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-mpl -Version: 1.68.0 -Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Description: Boost mpl module diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index dca0d86d8..095ff4f46 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.68.0 - SHA512 a35139c56fd06c560783844cb5b3ddc4643aa6aa7e3bce76e0b4f24d5b7ace962a0ade60973ab21083a06e824a4701c7b6c534376b2323934a21cda438f1de61 + REF boost-1.69.0 + SHA512 eaaaa930246f277bc4194319094356927e0d100048158f3335087dff681e4535bbdddf891df8db8c51ed209137d93c6f0f951a3dbe0e7c846c483c643dd3096a HEAD_REF master ) diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL index 7fbe896b4..b3a91b3bf 100644 --- a/ports/boost-msm/CONTROL +++ b/ports/boost-msm/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-msm -Version: 1.68.0 +Version: 1.69.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 Description: Boost msm module diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index e376c8e70..1c3fcf1bc 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.68.0 - SHA512 166b5c7b3ced589c196c951b24461ee3cdb46c0d19823a32b5cb0f1577eaaf6738b9cce2a721a2ca5a4c7be009a7a4b890d5353132ba443a97bcff6108a70728 + REF boost-1.69.0 + SHA512 0dcdd9dbc76844d2eb5f98081f2612ab4bb0f2480f6912be5daff9fa601fbc065b4e187ae3baa9ee81f1aab31ddc561d645a70a44edfed314775b8e051ba0614 HEAD_REF master ) diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL index 62dfc32dc..90aa03fbb 100644 --- a/ports/boost-multi-array/CONTROL +++ b/ports/boost-multi-array/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-multi-array -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers Description: Boost multi_array module diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index c89522d52..7492500b0 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.68.0 - SHA512 ed2bc9d838644e814b83ea771d1952d88a8f997649bfcdeec1b8463946aa842139e8a8a269aada447428346e7d31b6aeb17ffa372fb2ade2e17dbffbaeac67f8 + REF boost-1.69.0 + SHA512 f8fc2648333eecbe97c16560182b26e6e8f44299ab75d09fbe34ed45640dbffba7cd0a7b1fce33bdc8a0f49b611d2269bff74936082ef412628e7341c16ee423 HEAD_REF master ) diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL index 96f917b71..64c284ed0 100644 --- a/ports/boost-multi-index/CONTROL +++ b/ports/boost-multi-index/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-multi-index -Version: 1.68.0 +Version: 1.69.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 Description: Boost multi_index module diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index a23f85ad4..75129391c 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.68.0 - SHA512 6e39d37e79c01ae952e3ba7ab12a2a69f6916d4a846bff3af98c1d5fc2b8ba83b59a782b610817a82c076496e087040a7f44fbb97ce4b6d1b4e87ef2595c4f5b + REF boost-1.69.0 + SHA512 c8cc6a523941c810397165b59f3ec4855319495aecdba05671de3df3b709749a551bafe5277bbf7162f4fabf3a1ce35a3ecef4783e58733ec482435c6cf05433 HEAD_REF master ) diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL index 532079c9a..86644fd6f 100644 --- a/ports/boost-multiprecision/CONTROL +++ b/ports/boost-multiprecision/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-multiprecision -Version: 1.68.0 -Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-detail, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-predef, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost multiprecision module diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index d51ab1ce1..4d3a34e6a 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.68.0 - SHA512 5a90b41141829f38720b556252f32fae5e31d56deda779af371149c64f74f196cf9c2a5c466b945f1006ec1c44f497767e29f482cba248223bb762da32fd3f3c + REF boost-1.69.0 + SHA512 845a8e5aea10627fb9412ccd4aea4aa8315db00dd07d3b432a6574e6bf0d68574a69e98ae26591ebb47f45d98df9bea3b2392552ec23de8d18f068288a6b24c3 HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL index 5e0c9ab27..824d164a6 100644 --- a/ports/boost-numeric-conversion/CONTROL +++ b/ports/boost-numeric-conversion/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-numeric-conversion -Version: 1.68.0 -Build-Depends: boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers Description: Boost numeric_conversion module diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 722fca482..db73afa20 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.68.0 - SHA512 08fadfb49b2996b118684a90e450d8426ea20270ca2c0a677c61f88b033f3e77139559fa9507a1fa0dbd84621f44502f7bf2949166c8915411da2da543178c01 + REF boost-1.69.0 + SHA512 5b39ffc0eb4589483540ea49ea72ab86ae4f12b9c7a1e0902c1bf0a86e2f79d14b4cba107ae18c8390e69e0e4a83b96d4fddfba17ed6372821abd85052003b03 HEAD_REF master ) diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL index 41d1cee43..8a96b34d8 100644 --- a/ports/boost-odeint/CONTROL +++ b/ports/boost-odeint/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-odeint -Version: 1.68.0 +Version: 1.69.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 Description: Boost odeint module diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index c95fbf0c7..a8bad4df7 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.68.0 - SHA512 2e7832eb60623f9dabe8a3c2adea0c89fe0c43f9723cdc4a4f30af573186818f462fb66f33b585e0c6e50bbcb1b2e18d598e1d1905e68e54bda7febf09c71350 + REF boost-1.69.0 + SHA512 058f4554fe2a573ef489ea4a7262078ff2c9d1682e389089f04d601c67feba6d258028f1be1715711d0302d33614aa8e04ad781ffcfa0c427f418b9096c53b90 HEAD_REF master ) diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL index b7057d42e..1f2ea069d 100644 --- a/ports/boost-optional/CONTROL +++ b/ports/boost-optional/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-optional -Version: 1.68.0 -Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost optional module diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 00ba27665..11c3b5b68 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.68.0 - SHA512 995436e8805a441e13a3fb8040b78dde9363759bd49db789744ba5afe1a90af05b05de882267aef1c76fe68c410172233e2c8b0559e74f6764b3b1a1207a6b9b + REF boost-1.69.0 + SHA512 0bf1520af676a3f1fc34a074f8029018a9353fcf21dc3a3c895d2d3dcf68a2ecb0eae22e2edb9f687cc70e228c24f31a531b91b3d8160fa0559b9411401da64b HEAD_REF master ) diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL new file mode 100644 index 000000000..c4da4f4cc --- /dev/null +++ b/ports/boost-parameter-python/CONTROL @@ -0,0 +1,5 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +Source: boost-parameter-python +Version: 1.69.0 +Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (windows), boost-vcpkg-helpers +Description: Boost parameter_python module diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake new file mode 100644 index 000000000..284476775 --- /dev/null +++ b/ports/boost-parameter-python/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/parameter_python + REF boost-1.69.0 + SHA512 1a50243b3f527a6bfd95964053e0c0624c5bd859d037770e0c41c4158b4ae4d0da6bcf493759b6cdd66cc08ee9c6c5d82fa4173f67b2a20f9715e2f30f90e6cb + 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-parameter/CONTROL b/ports/boost-parameter/CONTROL index b86aa90d2..01ec570d1 100644 --- a/ports/boost-parameter/CONTROL +++ b/ports/boost-parameter/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-parameter -Version: 1.68.0 -Build-Depends: boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-detail, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost parameter module diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index 7a95348a3..1e569ea28 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.68.0 - SHA512 28d4538ccc544884fa9641ffca89c8a7a4f4098330540d1929b798ea69bf571e6073c65b9d4162b9b357b127da798c0fa613410b6b8e24e3af6681d465532d2f + REF boost-1.69.0 + SHA512 08d4397c3edd73a0d1e0485540846cd4d7b537d9046cf08ab841ae323de85d6df9a8a132d5204f514ff0d1d1b41047d63261875fbfd30ca1b1f9b3b0f93c6c81 HEAD_REF master ) diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL index dd0fb4d48..33cd2bb96 100644 --- a/ports/boost-phoenix/CONTROL +++ b/ports/boost-phoenix/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-phoenix -Version: 1.68.0 +Version: 1.69.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 Description: Boost phoenix module diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index cb12b27d9..3493ab0cb 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.68.0 - SHA512 5ce43db16a9f9e14d151475eb52120c497fbf7082a912af6fa64b4a4e59af9b33938968fb524a4f8f73be039fcfeb4ced19dfc7a3012fe2dc1eb85b621c5eb08 + REF boost-1.69.0 + SHA512 e07e678fe7373ec33f331fecefb3951b5b6adbed0e2d9f22148a9d75327c1194c45ba2f0b403ba2978040400cd6fb0f604686ca77c48a2c3878c9e7d15ea33dd HEAD_REF master ) diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL index aafb24154..a45de2679 100644 --- a/ports/boost-poly-collection/CONTROL +++ b/ports/boost-poly-collection/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-poly-collection -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure (!arm), boost-type-traits, boost-vcpkg-helpers Description: Boost poly_collection module diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 72eb529e1..b2849bf72 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.68.0 - SHA512 c4b93a5dceaa1e41b3f585f79a34bf05d8bed30f78af86cdf829d910a6ea791420880f087063180a5332eb065b4427cf6c98d9d71a9375d10c0f33defbdb1bd6 + REF boost-1.69.0 + SHA512 636f406d1ee0e7f6612ea285d745fc64137fc7b499efb8e852933747a69cc0efbb41b2643514f5d264ea7df087fb950e8f77b433645847b785e376c729c1d098 HEAD_REF master ) diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL index 36fb22386..1a588f66d 100644 --- a/ports/boost-polygon/CONTROL +++ b/ports/boost-polygon/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-polygon -Version: 1.68.0 -Build-Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers Description: Boost polygon module diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 5fe881759..46d0062dd 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.68.0 - SHA512 ebb34e0d693215db2919096600ed9bea6b239a2486135f48a1a3bd683410b0c86c3b455bc2d58f7b6efad50020895d3fd8f4b4b0ee897eacdb7a980d0979e9ad + REF boost-1.69.0 + SHA512 4cd1a3a9856322f475cdf3d4643043143531cf78b9f951d7b533bbfcab38df1dfa55d2326a983dcb7c88635efe72f878215280532dcf47c6cee755bcdfe50f2f HEAD_REF master ) diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL index b1de76796..888b0cce7 100644 --- a/ports/boost-pool/CONTROL +++ b/ports/boost-pool/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-pool -Version: 1.68.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread (!arm), boost-throw-exception, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi Description: Boost pool module diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 5c52588d1..23d73e65b 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.68.0 - SHA512 b1b3d91ac85469c0b06d48bcc159b22974dc446f44d84aee459ba26f1bd114600819efec3b1679be87b91525a0d55ba9a9fbde4828b6436bad4013d9de4652e6 + REF boost-1.69.0 + SHA512 b3fad5e548912a485599ee3e1db1989848dee84d5376fd9eda00d63044a6c10deb675a20518ac7626932770350015cdbe4e82cc74ee570edb8abeba85628b832 HEAD_REF master ) diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL index 540b2026d..256939088 100644 --- a/ports/boost-predef/CONTROL +++ b/ports/boost-predef/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-predef -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-vcpkg-helpers Description: Boost predef module diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index b4f21e883..9e5a39d8c 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.68.0 - SHA512 fb353184d4a1cbe7a621d3076bff10061c38912ecfc94d4dab54e43eb40fda62455866b3076c4193d94338cc2fb3fe8bd31f5e20ac56931cd16c2413d6c426f7 + REF boost-1.69.0 + SHA512 0fadcf5e36fe83d777843d3a02c730a7f4af06cff52700ef032b196805307d92e4e8665e6387a4d4b1d046d76fffefd980c1208c8f3bc556e6d4d7bdeef2b7ee HEAD_REF master ) diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL index ac86f7128..276c211ae 100644 --- a/ports/boost-preprocessor/CONTROL +++ b/ports/boost-preprocessor/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-preprocessor -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-vcpkg-helpers Description: Boost preprocessor module diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index d829c5c13..202454897 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.68.0 - SHA512 7c16f996dc9ba6afbc748acc854e3dadc852d76a1a02fc9a61d46fe92edb412c889cfba72c5de5a8f85913711a7f0ad2df3e9d7c4fb20e6422c321847e17399a + REF boost-1.69.0 + SHA512 33366ae1f998644ef9d151037598facbb832cfbacad07c15a5076b61d9d1f7f2d4e0f45af0e87a437af0b43b134f88392aaf697f0144c838b7c6ad274d0f8fd5 HEAD_REF master ) diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL index 4105702ed..e07261e05 100644 --- a/ports/boost-process/CONTROL +++ b/ports/boost-process/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-process -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-algorithm, boost-asio, 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 Description: Boost process module diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index c93860190..8c8c53218 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.68.0 - SHA512 6e75874c9eb95e30c8ef098a724e61ce986d14846325b778433467c8940b3cdd5177b5467c36103a8712e8c2234e2a6a00755e440e457d1e03dc16b59a22aad0 + REF boost-1.69.0 + SHA512 f01bfad34458fd245785efa12c070f8a21565698a181b55418f19e0ca948f219be6339ad9e43a0bd87a782ecca92e212671081dc18f7c9699e9b984e0e85d4e3 HEAD_REF master ) diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL index ced795473..cd62877f0 100644 --- a/ports/boost-program-options/CONTROL +++ b/ports/boost-program-options/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-program-options -Version: 1.68.0 +Version: 1.69.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 Description: Boost program_options module diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index e33d189a3..2d5308f8c 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.68.0 - SHA512 debbeb71fd8b4b0a4cef0297b3de6f94758948a117eeff4ccb713ea733c2304ce5f0c17673a066c5faa8b87c3aa2e4602908c4d52d76e53d7c4c2120f76ab4f2 + REF boost-1.69.0 + SHA512 02a469c0746cef85b2493b46cfa62da87dd2134af33a874d103e6f225577c74264781c567010f2aeaa4a3c8632d1856e107575230c9c370c22e75e2d78c751ef HEAD_REF master ) diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL index 7ac2bc12a..e9bcd373c 100644 --- a/ports/boost-property-map/CONTROL +++ b/ports/boost-property-map/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-property-map -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, 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 Description: Boost property_map module diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 33c5c3228..ba2881c75 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.68.0 - SHA512 57d8ad9bd9854702c18c3d0875d6d26386a1dff58cd4b21f9446f33752455715b78027f212a0954e40ea62fc98f5823cfef2e5ea6f6ce7c7e516bb3fa3d26a37 + REF boost-1.69.0 + SHA512 6712f57133e12db2e094dae1895fedc995168c54b74052c02355f13164ea71ab393dbac1fe5f8236188a3282a30a91c39ee5dde4328b4e986f06da4bb3d0f033 HEAD_REF master ) diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL index c4ff3e961..c7398baa5 100644 --- a/ports/boost-property-tree/CONTROL +++ b/ports/boost-property-tree/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-property-tree -Version: 1.68.0 +Version: 1.69.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 Description: Boost property_tree module diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index 245919b9c..856597cef 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.68.0 - SHA512 07410c78fdb9ae1d8a16c6c2ed65caea3136365c04828b78c02074ee523cccbf8f9a7117fcb5524711a0204c8ed77f56adcb47313fa16f63e15801043c3e1763 + REF boost-1.69.0 + SHA512 4f0ccacbddc0bc6685a7234dcc80c10134e6e6beb872128d90246d5e9402f5e48ec26da8895bbe2d760e110256db9d16bde3dcccb59d1014afc9bf6970d48bab HEAD_REF master ) diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL index 42b2d3d4d..7aaaaf15e 100644 --- a/ports/boost-proto/CONTROL +++ b/ports/boost-proto/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-proto -Version: 1.68.0 +Version: 1.69.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 Description: Boost proto module diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index b5e42f617..5dc43fc70 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.68.0 - SHA512 af03f0ad4d67d7d029fc9afec830e78295d34f0dd7af8dea57c3d931d042645f8a8458f1234112826072fb2eb9507ef39375ec412072b2be618621cec2934635 + REF boost-1.69.0 + SHA512 54cdc0f1350ac38388ba45bcb33bca3736ebe32214e6cd8c06a3a7471b0ede697ffc4124419ff13d93af667f728bb1713e5dc92c8a8dd1e28e9c526e3ea36ab4 HEAD_REF master ) diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL index e23e8bb67..e86decd35 100644 --- a/ports/boost-ptr-container/CONTROL +++ b/ports/boost-ptr-container/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-ptr-container -Version: 1.68.0 +Version: 1.69.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 Description: Boost ptr_container module diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 9f36d7041..3cf955911 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.68.0 - SHA512 bf800d67f0692485a04ab46dc9bbb04d542bfe941710796d82bd8d3e6b085d4c75b02d45507f145407317591734ffd83e4b0f9e823a4bee7071485fe94a88302 + REF boost-1.69.0 + SHA512 6df58700545067232139b2088e6abe28268a0a158f6827327ad243d616191b11097b9c6bed8705206ae5daa672555f3ed5c11c20352dc95f2c54aacec54d820a HEAD_REF master ) diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 31bd01788..236c94c6a 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-python -Version: 1.68.0-2 -Build-Depends: boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3 +Version: 1.69.0-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 Description: Boost python module diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index bdbe49f25..bee55c943 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -5,10 +5,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.68.0 - SHA512 17aacec09a653b718e1925f13fbce1a22a09d44011534e451a953600f4fef47b0e8a759d4e1588b74dbfc71ef38f1f13200d77668eca2ad1bc5b1e470e231a2f + REF boost-1.69.0 + SHA512 7ca3210a35ac43eae31c58d7ccd58e6410ec0d62a25ae7a03fb2db9baa4cf863fbaad1686c6ceaf804663c5707f6e60b4806f792f0aceb5c12a85b705d4242d0 HEAD_REF master - PATCHES unwind-type.patch ) # Find Python. Can't use find_package here, but we already know where everything is diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL index 5e6306563..e076506b1 100644 --- a/ports/boost-qvm/CONTROL +++ b/ports/boost-qvm/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-qvm -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers Description: Boost qvm module diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index c9cb0a104..2a9a48d31 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.68.0 - SHA512 1e9babfa993b59cba1cd4c7fa2184576a50ca0f6acd6db91b2e7e1fa3931f1c32de7bae76a8990bdd6cf69551482e74900b66a5bfb1c91c46e2a72d90491a4a3 + REF boost-1.69.0 + SHA512 b801ce8f2e96364fbafa31d1a501706a81d57b7d6f2c0ce63c4ca103957f8a4504eb1797fa96e812dac032e4972b18bc973e8a4bc24cfb38ac3a367dad75b4f7 HEAD_REF master ) diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL index df1f75532..c89a37d88 100644 --- a/ports/boost-random/CONTROL +++ b/ports/boost-random/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-random -Version: 1.68.0 +Version: 1.69.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-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost random module diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 1f5c32b86..3024a3317 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.68.0 - SHA512 dc9a4f65610324a021daf834443a49364a71b45d68ab3ec193221c464ffd1e824a48930da10633718ac4652c720db3cbb62d47114b3da98b31f4383c83bfc6b4 + REF boost-1.69.0 + SHA512 13875116f5d4fd18eb3ec8b9e09bd1381bc0d5ce533552c555a233380ea91139b7b9e24ff7788c495c2838a3ab9efd400f627d86b09a7b176e2e63ec61d5e6d1 HEAD_REF master ) diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL index ed079d74c..98735fddd 100644 --- a/ports/boost-range/CONTROL +++ b/ports/boost-range/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-range -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost range module diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index b3a68e39a..394292b95 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.68.0 - SHA512 a95bb972fa862e210aa77a214d803b5206dba238f1bdedd238bfd0ca3203b0b7c57b6c1738032d696e303049693028237f7eaa12766fa2c667ce6d8d27b6032f + REF boost-1.69.0 + SHA512 948a2ed81fa0d3b92a40f5aa51b564e221c06e0d5111cd346ebb2d11de96045a880f373befccf0ae49317f7c03f1a93813f530d4e1a5b9b016fcb1fa14664085 HEAD_REF master ) diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL index 7e5543bd8..7eed485c7 100644 --- a/ports/boost-ratio/CONTROL +++ b/ports/boost-ratio/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-ratio -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers Description: Boost ratio module diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 1b637a1e8..fc6174fec 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.68.0 - SHA512 0e4e7097ae51c30ae6ccbf112943a54d00421fa1c95f516554543b8f9c4fdde4602ff69e4b5c780a166058dbbe2d073162c0f857be3c07f7b20cc4842f9913f1 + REF boost-1.69.0 + SHA512 c52acdde2a8b523f98294a77ad61411fb017dc30cf5232f872581c665fca632dae6955c5869240865f2f0868a96d3d25445506bcd7832a3a5def96ded771b3f8 HEAD_REF master ) diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL index 2078f7f0a..2ecdf706a 100644 --- a/ports/boost-rational/CONTROL +++ b/ports/boost-rational/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-rational -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost rational module diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 5db179cc1..299a9cdb2 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.68.0 - SHA512 a259b492d3ed3cc3d4bfae1bc6dfe3abe2678ea6379a1d4a48bd0b176952f5d0d0bd3c1cfbaa5a8e566fc0e59f3d4f267cf039f5f5a9d38e635fd4b999784fa0 + REF boost-1.69.0 + SHA512 8115d3f45248918267e1f8630e62d2667302ca11957248a4b6377da58bb6c61b7a0f5e9c11b46133c860e19f90b862c2a466fb38e757f7f7fe88afae3e1ee3c4 HEAD_REF master ) diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL index 14ae738a3..18b331a48 100644 --- a/ports/boost-regex/CONTROL +++ b/ports/boost-regex/CONTROL @@ -1,7 +1,7 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-regex -Version: 1.68.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-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost regex module Feature: icu diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 0ab65b58d..1f6fa035b 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.68.0 - SHA512 57ea3b825011172e332f52aead9aae4b7d17dfceef68c5cc017607570c6818adfc73780f4d405a57aa93c3a7a3ca09bb74de2a9cb97e72c78700098ed6d2e63e + REF boost-1.69.0 + SHA512 7ca27b7585ea3627117275711a29c3ed2a5882e0cad7028ccdf63fbd09380807ffa9e344705ea86846b75f45b85f04ad7cc28149c6ba61579684fd6f9febbd48 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL new file mode 100644 index 000000000..5eb2449ab --- /dev/null +++ b/ports/boost-safe-numerics/CONTROL @@ -0,0 +1,5 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +Source: boost-safe-numerics +Version: 1.69.0 +Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-mpl, boost-vcpkg-helpers +Description: Boost safe_numerics module diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake new file mode 100644 index 000000000..f3c41c5e8 --- /dev/null +++ b/ports/boost-safe-numerics/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/safe_numerics + REF boost-1.69.0 + SHA512 708f23d304402671466c24a3c8acb1fd497799eb1c97d314c5ed78712d3906142f3ad5442e159cc304ace46b1e761b920bbe454ebf80df46127be78e98f25f8b + 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-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL index 229ea3c8b..22ce65238 100644 --- a/ports/boost-scope-exit/CONTROL +++ b/ports/boost-scope-exit/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-scope-exit -Version: 1.68.0 -Build-Depends: boost-config, boost-detail, boost-function, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-typeof, boost-type-traits, boost-vcpkg-helpers Description: Boost scope_exit module diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 32d208047..e60cd1769 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.68.0 - SHA512 fb1bf400f025836c64604994bd7de0d66227f2bb1bf5f3caf7b7e4db599702dd0ea229ff4c7b3a4efcab9545db8f20ac20d4b4354609047dd1e8b278d2220f43 + REF boost-1.69.0 + SHA512 d89d5793f1916218892e3a9c2b4b59d637a613a053be09a9f4b74d73413f98e100868ddccbfbcc7d42af154757836532a16d5301fdd9ac6878d94f8bb9ac7a0d HEAD_REF master ) diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL index c513a6384..e82a3cbda 100644 --- a/ports/boost-serialization/CONTROL +++ b/ports/boost-serialization/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-serialization -Version: 1.68.0 +Version: 1.69.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-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers Description: Boost serialization module diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index f574fdf28..240762224 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.68.0 - SHA512 13c35139ef8c67e297ca99fa2695b203f45a44788dc0c343075295baba07d0de113132314ddc4438d0d6cd87ad542510160e8cbe773a0f1d7fb24f377809d0b9 + REF boost-1.69.0 + SHA512 1db8a9db4a972625b76cbe41b35c4c68940b0b0c3caf8fc3108142df922e359af00533d4a2125a6899a68a9c18b3719c0855da63821b4158c253499d677bd753 HEAD_REF master ) diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL index ce1b2ea24..f20771f5a 100644 --- a/ports/boost-signals2/CONTROL +++ b/ports/boost-signals2/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-signals2 -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-multi-index, 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 Description: Boost signals2 module diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index f33e55483..74fc65c98 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.68.0 - SHA512 288e818d126fd2f4a6cededf802b74a5e3230483437e2338f179de6d9f22dbdad32c8040c56af2713811e7558326bd7c18a98e327eedcc5990dc9e25d0b35f26 + REF boost-1.69.0 + SHA512 96be2cce707e433dadfd23766870d0b01b67e0d156e4178022eedb29928844964c632eefe1da359266180ec7b7bf5f6083f30baa06eb4eb0092078366e9ac4cd HEAD_REF master ) diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL index bdf02ec3a..491dcaa37 100644 --- a/ports/boost-smart-ptr/CONTROL +++ b/ports/boost-smart-ptr/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-smart-ptr -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Description: Boost smart_ptr module diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index 942a98163..cf3d86cd7 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.68.0 - SHA512 5c791dd11d0b7d7662bfa936955dfbf9ff7e2e1993051a03997dbfee6b9b28e606ac94bad06a6eb112e8e089cf28721a4140761620a0c268ab8871d913e913d1 + REF boost-1.69.0 + SHA512 b11e39bde74287c2c9b24ea2c9509fb2f44714ee75e876e8c2c5754cf8c1c7a8f42570f7084393d031b4347abb1ac9715c779c19ecaf5917abb53e368c1e5868 HEAD_REF master ) diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL index 80cb3c99b..903d8b8db 100644 --- a/ports/boost-sort/CONTROL +++ b/ports/boost-sort/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-sort -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-integer, boost-range, boost-serialization, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost sort module diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 67040df74..79a6b239f 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.68.0 - SHA512 011642be7224c2892b63c01a589210dc0562d768a750a13622c181d0e8884cb0c8e2ab68f178bfaee2c895fdf8dd78815f6c8c1d58126e4db5d043068340d676 + REF boost-1.69.0 + SHA512 70756aeed4d2b179835ae86a91993d18ee388035b107536e8ab78b32309984ee72151c4359d834722b7e0cfb02262a6f4a708d724e8d154518976589b6f3897b HEAD_REF master ) diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL index a9d82f0cc..d6fa7c194 100644 --- a/ports/boost-spirit/CONTROL +++ b/ports/boost-spirit/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-spirit -Version: 1.68.0 -Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lexical-cast, boost-locale (!uwp), 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 (!arm), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers Description: Boost spirit module diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index fd31b103c..49e6b4b66 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.68.0 - SHA512 39e1824fcf0fb1358ab5c0df7c524ef0d27c40762e230f68f959e5e7f708c1bd2dffeaeff9ab2b420710bd3a089d48915a05ccfb1117056c96d3ddd66939696b + REF boost-1.69.0 + SHA512 2a27761676401c697de19f847fc000c0dd0fbcfac98f48c18d82bf4a8ff33cc53f05dd7843f596ddbaf3a60497bfb8b08f66a7dd4ec034fa3ea8730e45aef7ec HEAD_REF master ) diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL index b8c901dff..26932388d 100644 --- a/ports/boost-stacktrace/CONTROL +++ b/ports/boost-stacktrace/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-stacktrace -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi Description: Boost stacktrace module diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 84818f4ab..66df0a916 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.68.0 - SHA512 2700d80620a5b66e965c00a5e407aec2e075b0e567fe2031bd3671303fb4c4b3a4dc3d3ddb1cfb6058325470a0b51589aedf2a2ea0b46d53cbb754a2d3fb6027 + REF boost-1.69.0 + SHA512 ba8de7c238b60104d3d5b7c720121c52f08b430293736a2ad7636fe361827c7bda61d111357436807a77cd5c1a2973abcc2fd5924bf0f74d85a2a258afad366c HEAD_REF master ) diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL index 6425190a9..fa93f1c6c 100644 --- a/ports/boost-statechart/CONTROL +++ b/ports/boost-statechart/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-statechart -Version: 1.68.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-type-traits, boost-vcpkg-helpers +Version: 1.69.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 (!arm), boost-type-traits, boost-vcpkg-helpers Description: Boost statechart module diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 73971e1c2..aac983e0a 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.68.0 - SHA512 f3d2a8d12bd85327928cba9f572e22f438721597675dd9ea22936a06d38a241aa6ef9ca6b5fc183dce20d76c2f306901d2337c12463e917d1ecf1c6d586735bf + REF boost-1.69.0 + SHA512 7f3f17be8efde4017666f7009c55b53036d94aa7db61f0be8634f891486f4ccb1157b2a4f0b7e8a45e8a1bbf6bc5f0f154c9e769344a810e374fc7ea96ae7566 HEAD_REF master ) diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL index 7a39b5c23..5abb78a89 100644 --- a/ports/boost-static-assert/CONTROL +++ b/ports/boost-static-assert/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-static-assert -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers Description: Boost static_assert module diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 9d5eb8adf..7e45459d0 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.68.0 - SHA512 af109c668d083a9d7dc63b123b6621b919eab132589bad55a05c0fcdbb0939516a5a787512a87964a04362a4dd73af572293c3a3c2035d41401e78be34ca877e + REF boost-1.69.0 + SHA512 66e7931bab7cf87ad70e463f7154714d88cccf45b32c40adb68ac3af386158220d148df26beb2fc2f111e5cbc443744e32572e8ef26f279c3e81634f0d18ecf6 HEAD_REF master ) diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL index 8b06ccc8e..344927735 100644 --- a/ports/boost-system/CONTROL +++ b/ports/boost-system/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-system -Version: 1.68.0 -Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi +Version: 1.69.0 +Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi Description: Boost system module diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index fa81b9e0e..fe1699d66 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.68.0 - SHA512 408c0219c9a7d284f7f6053c45c102843b18a52aca9120c9cf88ad752d6480dde21d883e2e4d9a6ecefada0d3bf02364e90d91f5f9cc61a53fd75ebc6e16a0ea + REF boost-1.69.0 + SHA512 64f49a8f2484e3a539a922d66ce05ece9d0ea214c3b1ddf66487ae4201d2a6050ef39da8b1f7dbdb48fbdbc04a1446df0f03cbe8fb85729fcf8b70f066c92053 HEAD_REF master ) diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index a47306494..fc4602edb 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-test -Version: 1.68.0-2 +Version: 1.69.0-2 Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost test module diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 7db1284c0..2b165347e 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.68.0 - SHA512 e576311fea904ca64fcbb7d3f9cd435e5b5f68810ee73eaa8d73fe6dfe15663fd4c943308aaa632a7db4e51e3a48ed8e7fcb98b54a70752305cd9a3edbde97e0 + REF boost-1.69.0 + SHA512 3a265dc888d749ec1aa5cd13889963b19705d7dbe4092941d8943d3f84a82fc67cee9c3e49cecd9769229b9adea1f09b45a7f4a494cca73cf894a402487ea621 HEAD_REF master ) diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index 2929ec0b8..0bd043a56 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-thread -Version: 1.68.0 +Version: 1.69.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-mpl, 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 Description: Boost thread module diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index d260bcae9..712f1e310 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.68.0 - SHA512 ccb1283550347d367390d26c7b64d630cefbdd69ed18d0bdd42a82c726942a76a10a06729630b6e8788d553cf6fee8123feebc3f5b751254cef7a022475b02e8 + REF boost-1.69.0 + SHA512 4315662f1592e1f71a1b1a4a502c61df759a4993a376eeb61b5f01a18f4099379ad12989242ccb7d20029b7538b2629e11e707afe10d7fd721e6005c5eb25c56 HEAD_REF master PATCHES avoid-winapi.patch ) diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL index 3f5d2c688..df3e41f63 100644 --- a/ports/boost-throw-exception/CONTROL +++ b/ports/boost-throw-exception/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-throw-exception -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers Description: Boost throw_exception module diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index a376fe37d..36c4fdff7 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.68.0 - SHA512 7ec624763becab452f437eaa6e03c0882f672735a2bc4c1edfa92ccf2acd1c667905ccf15ae0f40091f64b425d83025c7ade4b55bd7418e542b12d575a1c8f60 + REF boost-1.69.0 + SHA512 fc9fa9eef9fba2e290598ff0469279f0eaba90918f62d1006837c415a5c49f45ff1b57852b9f03571047f075582498f9c114e7552b7f0d0b8f6edbabb890cc11 HEAD_REF master ) diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL index 69056033b..6979036fb 100644 --- a/ports/boost-timer/CONTROL +++ b/ports/boost-timer/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-timer -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers Description: Boost timer module diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 029bdc2d3..db0933381 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.68.0 - SHA512 5c84057890b0fc57f45f902c59d3f15ba9472d4538d13896b95232591cb2cde123df610b34eb2e3eec13e1cd9b13f652c558170466e0b7e7fe462bd167f84432 + REF boost-1.69.0 + SHA512 cfa6a8976b2b91ade5f22c8e8e37cbf687bbfc5bf2904f652287188a903bb1c25f537280a61293141436b71bb1bf0df1e14615948e76571ebf4d3b98fcb9470a HEAD_REF master ) diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL index 0aab59b91..0ce98025a 100644 --- a/ports/boost-tokenizer/CONTROL +++ b/ports/boost-tokenizer/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-tokenizer -Version: 1.68.0 -Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Description: Boost tokenizer module diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index e572b1d40..225fcbe21 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.68.0 - SHA512 f885c49fcafb3cfa4d1028722123d35fc42721cdda1894ccaf918aa25d88429bc8c2a9d73e15154a3982a2122e17bdfb08649578c2bd48f68e82a302e2bbce3b + REF boost-1.69.0 + SHA512 a01120203c4caa6bcfcda803f7811f575b247410e7aa74815646f383a374946263e42987d1cff8a33a65c925cf9d3798854d14995446f637ff8e4e77a3b3b4bc HEAD_REF master ) diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL index e2b7b093f..6c4c059c7 100644 --- a/ports/boost-tti/CONTROL +++ b/ports/boost-tti/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-tti -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers Description: Boost tti module diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 99e582031..0e3237b42 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.68.0 - SHA512 b14f7abbf2fe5f56b744803a4c803131ebe1b3762d2c85f624ead670619909db30fbd3ee3e5f1787b1f7377c25e5044553cf4df609c31209bbd9c2572b874247 + REF boost-1.69.0 + SHA512 1c8c0ea6e47ea4565d280e9ad465851d1f8abf14639676112a45e275889e1cfb9b517c5f12a9e26c32c465c24e93a843f46ea5854060ed7a96ba29bc1f5e687e HEAD_REF master ) diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL index 8cd3cf3f8..bd0d1a7ee 100644 --- a/ports/boost-tuple/CONTROL +++ b/ports/boost-tuple/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-tuple -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers Description: Boost tuple module diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 96e2ae757..9a6582a65 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.68.0 - SHA512 b3c31e1b0ccff578f2311cd315118f5d5f37c110ef6537266078cdd23af184806bbaf58fd39e32ebcd4e231117241b16f6c7734717bd3b9344935ce3e2ad2faf + REF boost-1.69.0 + SHA512 b298a179fd103f8da526315cab50bcbc1d2b6f63ad753add05353a943ab6ae1044412eddaafec760809a6ccb881dee6302c5014283eda20bc7563f3eea47c4a8 HEAD_REF master ) diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL index 6c92109bb..d937f7c6c 100644 --- a/ports/boost-type-erasure/CONTROL +++ b/ports/boost-type-erasure/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-type-erasure -Version: 1.68.0 +Version: 1.69.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 (!arm), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd Description: Boost type_erasure module diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 20016b7b1..6fce4db2b 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.68.0 - SHA512 d4f1f2063408e2de67ce660f13017be092b414e7a6fed90f6b460715bdb38ead27763244aa48888646501a6f031c981416d2e5076ab42d619b8a494e99f89ce3 + REF boost-1.69.0 + SHA512 40445b1b5f3e3ce61c7d5d2bc0d5018b4ebe2ebbba4d05e941bfbc792a52b04f6dd0025b6502f105686dc55d74ccbc5f7ca61a96a36532ddb6879a9d8d2f6afd HEAD_REF master ) diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL index fbcda2c78..e147947ff 100644 --- a/ports/boost-type-index/CONTROL +++ b/ports/boost-type-index/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-type-index -Version: 1.68.0 +Version: 1.69.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 Description: Boost type_index module diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index e955e244d..a97f2000b 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.68.0 - SHA512 5d31df2b8f92599d655ff46bdad6342dbce5f4e042054705d61d13b576e4c8d933a4fdb7ec9e5fca14f43dfc1c307911a269041f1742c2894690a94eb5d23b52 + REF boost-1.69.0 + SHA512 c323a0f779084272127e1da31efbd166bc1c8ba83083cafba19984c86a91aa87ce84bbfe95a5f439feffb53f286006c215b0b828d8626cc4bbde509ffb05d994 HEAD_REF master ) diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL index 368cafe9e..24997fa5f 100644 --- a/ports/boost-type-traits/CONTROL +++ b/ports/boost-type-traits/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-type-traits -Version: 1.68.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers +Version: 1.69.0-1 +Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers Description: Boost type_traits module diff --git a/ports/boost-type-traits/msvc-arm-2.patch b/ports/boost-type-traits/msvc-arm-2.patch new file mode 100644 index 000000000..f6f192ecb --- /dev/null +++ b/ports/boost-type-traits/msvc-arm-2.patch @@ -0,0 +1,44 @@ +diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp +index 82303fb..de0ce7e 100644 +--- a/include/boost/type_traits/detail/is_function_cxx_11.hpp ++++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp +@@ -96,7 +96,7 @@ namespace boost { + template + struct is_function : public true_type {}; + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86)) + #ifdef __CLR_VER + template + struct is_function : public true_type {}; +@@ -328,7 +328,7 @@ namespace boost { + template + struct is_function : public true_type {}; + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86)) + #ifdef __CLR_VER + template + struct is_function : public true_type {}; +diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +index d5f1c21..0465ae0 100644 +--- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp ++++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +@@ -108,7 +108,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86)) + #ifdef __CLR_VER + template + struct is_member_function_pointer : public true_type {}; +@@ -362,7 +362,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86)) + #ifdef __CLR_VER + template + struct is_member_function_pointer : public true_type {}; diff --git a/ports/boost-type-traits/msvc-arm.patch b/ports/boost-type-traits/msvc-arm.patch new file mode 100644 index 000000000..cf3d9005a --- /dev/null +++ b/ports/boost-type-traits/msvc-arm.patch @@ -0,0 +1,440 @@ +diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp +index 3031130..82303fb 100644 +--- a/include/boost/type_traits/detail/is_function_cxx_11.hpp ++++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp +@@ -101,7 +101,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -114,7 +114,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -127,7 +127,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -140,7 +140,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -154,7 +154,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -167,7 +167,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -180,7 +180,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -193,7 +193,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -207,7 +207,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -220,7 +220,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -233,7 +233,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -246,7 +246,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -333,7 +333,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -346,7 +346,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -359,7 +359,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -372,7 +372,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -386,7 +386,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -399,7 +399,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -412,7 +412,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -425,7 +425,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -439,7 +439,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -452,7 +452,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -465,7 +465,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +@@ -478,7 +478,7 @@ namespace boost { + template + struct is_function : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_function : public true_type {}; + template +diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +index b77a4a5..d5f1c21 100644 +--- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp ++++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +@@ -113,7 +113,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -128,7 +128,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -143,7 +143,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -158,7 +158,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -174,7 +174,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -189,7 +189,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -204,7 +204,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -219,7 +219,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -235,7 +235,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -250,7 +250,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -265,7 +265,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -280,7 +280,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -367,7 +367,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -382,7 +382,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -397,7 +397,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -412,7 +412,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -428,7 +428,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -443,7 +443,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -458,7 +458,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -473,7 +473,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -489,7 +489,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -504,7 +504,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -519,7 +519,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template +@@ -534,7 +534,7 @@ namespace boost { + template + struct is_member_function_pointer : public true_type {}; + #endif +-#ifndef _M_AMD64 ++#ifdef _M_IX86 + template + struct is_member_function_pointer : public true_type {}; + template diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 427b9c699..f2661a4ba 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -5,9 +5,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.68.0 - SHA512 d9bdb5eb2e602085bf1f6d4339a7895c2f1a7227889e7c20088cc9fe35da5f1c44ff297c043f1713a8831b0785ef871b5ac02c8ad2b7ee305c1a6310678b5985 + REF boost-1.69.0 + SHA512 83d585933374420808aaf3743cda48d914bb7d536bf3f19e59bba1b24403a1482ff509e1f804a0b55d3bc434aceedcb0b75f873b9feaa9ba1c1a762a11d4fc94 HEAD_REF master + PATCHES + msvc-arm.patch + msvc-arm-2.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL index a7ea199cf..8ee36b04c 100644 --- a/ports/boost-typeof/CONTROL +++ b/ports/boost-typeof/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-typeof -Version: 1.68.0 -Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers Description: Boost typeof module diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 54693f1cb..66486e83c 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.68.0 - SHA512 c01723f5e50b7bd7d190df73e4b5b7ffe6512c89d76080061dcd1d4a7dac45b450dda4e3edc7452613a7aad230414ad8ad728d56ed392f9d5571a99281315ada + REF boost-1.69.0 + SHA512 66932eaef89b406c1570bd469370cc62ad298ee7c1864d01a0380a32c90511711cb8b00776c203c8ed6eb2ecec8fb5c005bb932c2277e4fe29b182e485927b18 HEAD_REF master ) diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL index 68e20cac5..eca065013 100644 --- a/ports/boost-ublas/CONTROL +++ b/ports/boost-ublas/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-ublas -Version: 1.68.0 +Version: 1.69.0 Build-Depends: 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 Description: Boost ublas module diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 2829e600b..b46d7a830 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.68.0 - SHA512 26bf61e43551a199e9a62d2d7f21fcb9407e9dc97b20317b17561d5c95256eced961eb30b1d8937533c1d9b77d56a148dfb82471b2228a92a3c53b63982cb02f + REF boost-1.69.0 + SHA512 ef39748840ebdb19dfab07f51120c771e08d82edcd526952d15db105b3779c17a8c6742c73a55b0427ad84b7dfa30d08337f331d915fed09b0de30b3606c2385 HEAD_REF master ) diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL index e6645b1a3..1d1fa035c 100644 --- a/ports/boost-units/CONTROL +++ b/ports/boost-units/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-units -Version: 1.68.0 +Version: 1.69.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 Description: Boost units module diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 50041db80..f823754e6 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.68.0 - SHA512 8ec422fb52cf1761bd0e4f822807e8c9ed7a3c1642dc96e7447ffd903c9c38c045699b897a69714516e5654252b670fc5b7c795f6e6e54aeb7aed3adebdbccb8 + REF boost-1.69.0 + SHA512 6a4a18e6dc8b2d8ddcd027bab0b30a6892639de6e85f25dd456b23fb36f162fd6ec142f49e7ab416bbd1e9d6f5eac541faaa46450896dbfa9691c31c855e217f HEAD_REF master ) diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL index 62bcadd48..796d8bf7d 100644 --- a/ports/boost-unordered/CONTROL +++ b/ports/boost-unordered/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-unordered -Version: 1.68.0 +Version: 1.69.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 Description: Boost unordered module diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index 3c89877e9..aaf69b4fe 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.68.0 - SHA512 71b34649d70a610efa6d2e98019ee5db57aa5f09a4a388c8bf54e4a1ff02de8b581a249f7b917be58663e260599732eaaedeb297e7c20046013a811997991c16 + REF boost-1.69.0 + SHA512 51bbbdcc0661b502445e53091bb5ab859ece03ce549365ac58964459e0b7c162e10b166324b8b9c28a9a8aef5532fa31fed68bbb878e3d36f115a6279109e4b7 HEAD_REF master ) diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL index 271c5a718..7850447a2 100644 --- a/ports/boost-utility/CONTROL +++ b/ports/boost-utility/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-utility -Version: 1.68.0 -Build-Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers +Version: 1.69.0 +Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers Description: Boost utility module diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 6d1af49f7..521de5622 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.68.0 - SHA512 ee6ef15cd7291b5001f4a3a96e95790cfab2017b76f6eac3b9672983e56440d6184cb896257a9c4e365fe1e71b3c721b3b98a4d36d793a8bdf8d1c78585408e3 + REF boost-1.69.0 + SHA512 92c97875eff9aee2724b4ae1ed04a6885b06c77fa14ce646423c6b7024bb1d86ef358ecc5d3fa3835b3d70adb968a49f647828fe181ae469aa6fd1fe0a1bc8cf HEAD_REF master ) diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL index dce434277..b17b48ef8 100644 --- a/ports/boost-uuid/CONTROL +++ b/ports/boost-uuid/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-uuid -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, 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 Description: Boost uuid module diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 41f903735..b8c43c34a 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.68.0 - SHA512 cb03182301283785e123a77060426dfcc054c21663ce76d05c1d8dc57c529a8bceadb0c26deadff1ee5070d3bc687050819f272b8afe51ecfafe679631162fc1 + REF boost-1.69.0 + SHA512 b6f1dbceb1ca2665df63b7d4745c185aca0812ede640e569d086d5f428b9babdfb15096ba5b2475bd59b87bc27b3f961388fe251a25fe0422f036058ab9c5856 HEAD_REF master ) diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL index b2f106c54..45e40a9b8 100644 --- a/ports/boost-variant/CONTROL +++ b/ports/boost-variant/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-variant -Version: 1.68.0 +Version: 1.69.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 Description: Boost variant module diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 9a0f5a8da..95352b3f0 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.68.0 - SHA512 532999093f3dbc2f6a96ce7230cf0f1248f079e185f07f99a7162e0a8e75b75fbfda89d21f13fd01d4f5740853e932d46b0e7f9301a9cef0ff15017f1c8cae98 + REF boost-1.69.0 + SHA512 281f2a89317603e4875d35388d941c3a174024618f2f9c255344e69d43d43509de2947e35374d8498e337326c7637805160a84f3b2b4da8811660c8429e11be0 HEAD_REF master ) diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1 index 07b2e7a25..e49ee32e8 100644 --- a/ports/boost-vcpkg-helpers/generate-ports.ps1 +++ b/ports/boost-vcpkg-helpers/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.68.0" + $version = "1.69.0" ) $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition @@ -95,6 +95,12 @@ function Generate() " REF boost-$version" " SHA512 $Hash" " HEAD_REF master" + ) + if ($Name -eq "thread") + { + $portfileLines += @(" PATCHES avoid-winapi.patch") + } + $portfileLines += @( ")" "" ) @@ -144,7 +150,12 @@ function Generate() { $portfileLines += @( "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" - "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"/boost/date_time//boost_date_time`" OPTIONS /boost/thread//boost_thread)" + "boost_modular_build(" + " SOURCE_PATH `${SOURCE_PATH}" + " REQUIREMENTS `"/boost/date_time//boost_date_time`"" + " OPTIONS /boost/thread//boost_thread" + " BOOST_CMAKE_FRAGMENT `${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" + ")" ) } else @@ -160,51 +171,9 @@ function Generate() "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})" ) - if ($Name -eq "exception") + if (Test-Path "$scriptsDir/post-build-stubs/$Name.cmake") { - $portfileLines += @( - "" - "set(VCPKG_LIBRARY_LINKAGE static)" - "file(REMOVE_RECURSE `${CURRENT_PACKAGES_DIR}/bin `${CURRENT_PACKAGES_DIR}/debug/bin)" - ) - } - if ($Name -eq "config") - { - $portfileLines += @( - "file(APPEND `${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp `"\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n`")" - "file(APPEND `${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp `"\n#undef BOOST_ALL_DYN_LINK\n`")" - "" - "if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)" - " file(APPEND `${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp `"\n#define BOOST_ALL_DYN_LINK\n`")" - "endif()" - "file(COPY `${SOURCE_PATH}/checks DESTINATION `${CURRENT_PACKAGES_DIR}/share/boost-config)" - ) - } - if ($Name -eq "predef") - { - $portfileLines += @( - "" - "file(COPY `${SOURCE_PATH}/tools/check DESTINATION `${CURRENT_PACKAGES_DIR}/share/boost-predef)" - ) - } - if ($Name -eq "test") - { - $portfileLines += @( - "if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL `"release`")" - " file(MAKE_DIRECTORY `${CURRENT_PACKAGES_DIR}/lib/manual-link)" - " file(GLOB MONITOR_LIBS `${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)" - " file(COPY `${MONITOR_LIBS} DESTINATION `${CURRENT_PACKAGES_DIR}/lib/manual-link)" - " file(REMOVE `${MONITOR_LIBS})" - "endif()" - "" - "if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL `"debug`")" - " file(MAKE_DIRECTORY `${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)" - " file(GLOB DEBUG_MONITOR_LIBS `${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)" - " file(COPY `${DEBUG_MONITOR_LIBS} DESTINATION `${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)" - " file(REMOVE `${DEBUG_MONITOR_LIBS})" - "endif()" - "" - ) + $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$Name.cmake") } $portfileLines | out-file -enc ascii "$scriptsDir/../boost-$sanitizedName/portfile.cmake" @@ -244,6 +213,7 @@ $libraries_found = ls $scriptsDir/boost/libs -directory | % name | % { "interval" "odeint" "ublas" + "safe_numerics" } else { @@ -297,7 +267,7 @@ foreach ($library in $libraries) -replace "boost/numeric/conversion/","boost/numeric_conversion/" ` -replace "boost/functional/hash.hpp","boost/container_hash/hash.hpp" ` -replace "boost/detail/([^/]+)/","boost/`$1/" ` - -replace "#include ?).*", "`$1" ` + -replace " *# *include *).*", "`$1" ` -replace "/|\.hp?p?| ","" } | group | % name | % { # mappings Write-Verbose "${library}: $_" @@ -306,9 +276,9 @@ foreach ($library in $libraries) elseif ($_ -eq "type") { "core" } elseif ($_ -match "unordered_") { "unordered" } elseif ($_ -match "cstdint") { "integer" } - elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior") { "utility" } - elseif ($_ -eq "version") { "config" } - elseif ($_ -match "shared_ptr|make_shared|intrusive_ptr|scoped_ptr|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } + elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" } + elseif ($_ -match "^version|^workaround") { "config" } + elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } elseif ($_ -match "iterator_adaptors|generator_iterator|pointee") { "iterator" } elseif ($_ -eq "regex_fwd") { "regex" } elseif ($_ -eq "make_default") { "convert" } @@ -327,6 +297,7 @@ foreach ($library in $libraries) elseif ($_ -eq "exception_ptr") { "exception" } elseif ($_ -eq "multi_index_container") { "multi_index" } elseif ($_ -eq "lexical_cast") { "lexical_cast"; "math" } + elseif ($_ -match "token_iterator|token_functions") { "tokenizer" } elseif ($_ -eq "numeric" -and $library -notmatch "numeric_conversion|interval|odeint|ublas") { "numeric_conversion"; "interval"; "odeint"; "ublas" } else { $_ } } | group | % name | ? { $_ -ne $library } @@ -339,7 +310,7 @@ foreach ($library in $libraries) $deps = @($deps | ? { # Boost contains cycles, so remove a few dependencies to break the loop. - (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits") -or ($_ -notmatch "utility")) ` + (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits|^exception") -or ($_ -notmatch "utility")) ` -and ` (($library -notmatch "range") -or ($_ -notmatch "algorithm"))` -and ` @@ -357,6 +328,10 @@ foreach ($library in $libraries) -and ` (($library -notmatch "spirit") -or ($_ -notmatch "serialization"))` -and ` + (($library -notmatch "throw_exception") -or ($_ -notmatch "^exception"))` + -and ` + (($library -notmatch "iostreams") -or ($_ -notmatch "random"))` + -and ` (($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator")) } | % { "boost-$_" -replace "_","-" } | % { TransformReference $_ @@ -407,22 +382,24 @@ foreach ($library in $libraries) } } -# Generate master boost control file which depends on each individual library -# mpi is excluded due to it having a dependency on msmpi -$boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" } | ? { $_ -notmatch "boost-mpi" }) -join ", " - -@( - "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" - "Source: boost" - "Version: $version" - "Description: Peer-reviewed portable C++ source libraries" - "Build-Depends: $boostDependsList" - "" - "Feature: mpi" - "Description: Build with MPI support" - "Build-Depends: boost-mpi" -) | out-file -enc ascii $scriptsDir/../boost/CONTROL - -"set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $scriptsDir/../boost/portfile.cmake +if ($libraries_in_boost_port.length -gt 1) { + # Generate master boost control file which depends on each individual library + # mpi is excluded due to it having a dependency on msmpi + $boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" } | ? { $_ -notmatch "boost-mpi" }) -join ", " + + @( + "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" + "Source: boost" + "Version: $version" + "Description: Peer-reviewed portable C++ source libraries" + "Build-Depends: $boostDependsList" + "" + "Feature: mpi" + "Description: Build with MPI support" + "Build-Depends: boost-mpi" + ) | out-file -enc ascii $scriptsDir/../boost/CONTROL + + "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $scriptsDir/../boost/portfile.cmake +} return diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/config.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/config.cmake new file mode 100644 index 000000000..b09ea209b --- /dev/null +++ b/ports/boost-vcpkg-helpers/post-build-stubs/config.cmake @@ -0,0 +1,7 @@ +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n") +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_DYN_LINK\n") +endif() +file(COPY ${SOURCE_PATH}/checks DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-config) diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/context.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/context.cmake new file mode 100644 index 000000000..a88f8441d --- /dev/null +++ b/ports/boost-vcpkg-helpers/post-build-stubs/context.cmake @@ -0,0 +1,6 @@ + +# boost-context removed all.hpp, which is used by FindBoost to determine that context is installed +if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp) + file(WRITE ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp + "#error \"#include is no longer supported by boost_context.\"") +endif() diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake new file mode 100644 index 000000000..43594a044 --- /dev/null +++ b/ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake @@ -0,0 +1,3 @@ + +set(VCPKG_LIBRARY_LINKAGE static) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake new file mode 100644 index 000000000..b960fcd6e --- /dev/null +++ b/ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake @@ -0,0 +1,2 @@ + +file(COPY ${SOURCE_PATH}/tools/check DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-predef) diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/test.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/test.cmake new file mode 100644 index 000000000..c6d07dbc4 --- /dev/null +++ b/ports/boost-vcpkg-helpers/post-build-stubs/test.cmake @@ -0,0 +1,14 @@ +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*) + file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(REMOVE ${MONITOR_LIBS}) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*) + file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(REMOVE ${DEBUG_MONITOR_LIBS}) +endif() + diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL index a126cf997..928a66dc2 100644 --- a/ports/boost-vmd/CONTROL +++ b/ports/boost-vmd/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-vmd -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-preprocessor, boost-vcpkg-helpers Description: Boost vmd module diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 460e5ff1d..176d487f0 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.68.0 - SHA512 5d12edebb0beabb8b82d2aab15b50b35555e171eb5e289d67872c67d30fadcbd890f7c61db9a1b599572b5eebbb6978accf8673e86c6373181ff66c5c56b3cc8 + REF boost-1.69.0 + SHA512 d6b6a88a92849eb6c21aad27ee59e5a6d488524ea813cfa0fd9dc015b5c25e98da6ad97bd62d80d24d973b07b01ccf437f8b1d1f10b4e6aa7402ee8e594953c3 HEAD_REF master ) diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL index 7df45759c..d9cc98840 100644 --- a/ports/boost-wave/CONTROL +++ b/ports/boost-wave/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-wave -Version: 1.68.0 +Version: 1.69.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 Description: Boost wave module diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index b58a6f643..294109a06 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.68.0 - SHA512 988caa39d1958defdca1a89790bb1028d51060b1c8bf33047d175fe990c9565c4f60ba4d32215f9af6a433f286fe0201e1a9d45b365b3eac6148d0902d997080 + REF boost-1.69.0 + SHA512 aeb8ba65a0fcc85aae27aa5bba45b2a7421c2e04b64bb03ece77b6c7fa0f2d9282a5e19c64506bcd906357375deb7a1e5711334c74859995b1d0e70014248609 HEAD_REF master ) diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL index aae04fe68..927d9e06f 100644 --- a/ports/boost-winapi/CONTROL +++ b/ports/boost-winapi/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-winapi -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers Description: Boost winapi module diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 0080662c9..78144f25d 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.68.0 - SHA512 640b144502bfc3ed06267d90a01d7eb7812898596c61e16048baaf98f49a27bffe5ccfddd6070d835c12d154c4669d1e2b862521f095a23868b192e62e439af1 + REF boost-1.69.0 + SHA512 e1ed458c0ce6d5daa6e9fe577a0010e05e5bc290e485b4f2183e5f61b5ebb07983eab9f5477b3195049f232a699074a1a58f719b5d5b8c0f550ab9e3abae6764 HEAD_REF master ) diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL index f7202426d..1be7e5128 100644 --- a/ports/boost-xpressive/CONTROL +++ b/ports/boost-xpressive/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-xpressive -Version: 1.68.0 -Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, 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-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers +Version: 1.69.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 Description: Boost xpressive module diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 5eae33972..dad20d014 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.68.0 - SHA512 3038a336a13232e567e1017b005bb6b95ffbc7ad0bcb55385afb33ba545d0d860edd79e1902263cd4e99703c75ca6d57d06be95ddec430f3b54b1f31fb05b84d + REF boost-1.69.0 + SHA512 ac6ab9955ab4cb6e8a1905304595a9b33c71b4041673b6e942adc023bd67c7b64bf786976f40cb2daea6ce164f72fff50fc6fa583dd12d5978a4e3ba6524b523 HEAD_REF master ) diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL index 70b4727e6..97a727fd5 100644 --- a/ports/boost-yap/CONTROL +++ b/ports/boost-yap/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-yap -Version: 1.68.0 +Version: 1.69.0 Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers Description: Boost yap module diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 3d99e46fa..edbed9475 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.68.0 - SHA512 a8d920b8a0f60b26db2a0eff7718184dcd6f0405f9ebb5ca7a7c0bcb7b824e52a17a63f786c09a4de566a24c3a5178e9916e5d1b05dd13fd82083c2d4749d523 + REF boost-1.69.0 + SHA512 12a6d5ed8491a9ebd258fa83ef752af88db38a9517a4da43fd20dd63a244271c7b889f92a32fc67f098230c7cbf530578c8ef163d6427144173183dc2fdc1156 HEAD_REF master ) diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 13c43fb8b..fc51d7cec 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,8 +1,8 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost -Version: 1.68.0 +Version: 1.69.0 Description: Peer-reviewed portable C++ source libraries -Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, 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), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), 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-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), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-optional, boost-parameter, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-scope-exit, boost-serialization, boost-signals, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!arm), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, 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, boost-assert, boost-assign, boost-atomic, boost-beast, 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), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), 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-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), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-parameter, boost-parameter-python (windows), boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), 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-system, boost-test (!uwp), boost-thread (!arm), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap Feature: mpi Description: Build with MPI support diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index 253b3aaae..5eb1595d2 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,5 @@ Source: hpx -Version: 1.2.0 +Version: 1.2.0-1 Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi Description: The C++ Standards Library for Concurrency and Parallelism HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case. diff --git a/ports/hpx/boost-1.69.patch b/ports/hpx/boost-1.69.patch new file mode 100644 index 000000000..f589ca795 --- /dev/null +++ b/ports/hpx/boost-1.69.patch @@ -0,0 +1,36 @@ +diff --git a/hpx/exception.hpp b/hpx/exception.hpp +index 0c818088c7b..3eeaa579131 100644 +--- a/hpx/exception.hpp ++++ b/hpx/exception.hpp +@@ -50,6 +50,12 @@ namespace hpx + /// Construct a hpx::exception from a boost#system_error. + explicit exception(boost::system::system_error const& e); + ++ /// Construct a hpx::exception from a boost#system#error_code (this is ++ /// new for Boost V1.69). This constructor is required to compensate ++ /// for the changes introduced as a resolution to LWG3162 ++ /// (https://cplusplus.github.io/LWG/issue3162). ++ explicit exception(boost::system::error_code const& e); ++ + /// Construct a hpx::exception from a \a hpx::error and an error message. + /// + /// \param e The parameter \p e holds the hpx::error code the new +diff --git a/src/exception.cpp b/src/exception.cpp +index 52c1cceba6b..cb6535fd008 100644 +--- a/src/exception.cpp ++++ b/src/exception.cpp +@@ -89,6 +89,14 @@ namespace hpx + LERR_(error) << "created exception: " << this->what(); + } + ++ /// Construct a hpx::exception from a boost#system#error_code (this is ++ /// new for Boost V1.69). ++ exception::exception(boost::system::error_code const& e) ++ : boost::system::system_error(e) ++ { ++ LERR_(error) << "created exception: " << this->what(); ++ } ++ + /// Construct a hpx::exception from a \a hpx::error and an error message. + /// + /// \param e The parameter \p e holds the hpx::error code the new diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 704d944fc..d50b18af9 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( REF 1.2.0 SHA512 caf2650381856db6a96fd4b120975d94d68d9bb19ada1d6cd076abe2d4aa1418e410167f774a881d95eacd0d46bbd5f90f16a4c77b4a2cf00e5b24ea17bfe670 HEAD_REF master + PATCHES boost-1.69.patch ) vcpkg_configure_cmake( diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 815a53497..519d08553 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,4 +1,4 @@ Source: libtorrent -Version: 1.1.6-1 +Version: 1.2.0-1 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 +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 diff --git a/ports/libtorrent/add-datetime-to-boost-libs.patch b/ports/libtorrent/add-datetime-to-boost-libs.patch index 35d8de1cf..1ec65a8f5 100644 --- a/ports/libtorrent/add-datetime-to-boost-libs.patch +++ b/ports/libtorrent/add-datetime-to-boost-libs.patch @@ -1,13 +1,16 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 340e38f..1963d90 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -258,7 +258,7 @@ endif() - - # Boost - if(NOT DEFINED Boost_INCLUDE_DIR OR NOT DEFINED Boost_LIBRARIES) -- FIND_PACKAGE(Boost REQUIRED COMPONENTS system chrono random) -+ FIND_PACKAGE(Boost REQUIRED COMPONENTS system date_time chrono random) - endif() - include_directories(${Boost_INCLUDE_DIRS}) - target_link_libraries(torrent-rasterbar ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 944602b..9d95446 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,9 +678,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/boost-167.patch b/ports/libtorrent/boost-167.patch deleted file mode 100644 index 279d517d5..000000000 --- a/ports/libtorrent/boost-167.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp -index dac1cab..0b29c64 100644 ---- a/include/libtorrent/ip_filter.hpp -+++ b/include/libtorrent/ip_filter.hpp -@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. - - #include - #include -+#include - #include - #include - -diff --git a/src/kademlia/routing_table.cpp b/src/kademlia/routing_table.cpp -index 1ac00de..1d11617 100644 ---- a/src/kademlia/routing_table.cpp -+++ b/src/kademlia/routing_table.cpp -@@ -53,6 +53,7 @@ POSSIBILITY OF SUCH DAMAGE. - - #include - #include -+#include - - #include "libtorrent/aux_/disable_warnings_pop.hpp" - -diff --git a/src/torrent.cpp b/src/torrent.cpp -index feacfa4..7b2b920 100644 ---- a/src/torrent.cpp -+++ b/src/torrent.cpp -@@ -46,6 +46,7 @@ POSSIBILITY OF SUCH DAMAGE. - - #include - #include -+#include - #if TORRENT_USE_I2P - # include - #endif -diff --git a/test/test_ip_filter.cpp b/test/test_ip_filter.cpp -index 21ac404..40e3cd5 100644 ---- a/test/test_ip_filter.cpp -+++ b/test/test_ip_filter.cpp -@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. - - #include "libtorrent/ip_filter.hpp" - #include -+#include - - #include "test.hpp" - #include "settings.hpp" diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 792fe1dee..fb84c9794 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -3,25 +3,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF libtorrent-1_1_6 - SHA512 528034e63330d3c6910ab9db34a2a543618961c0095ecb8f865065516c341d063cba92aed2904b80aa0d0ef65df1b91c400f69d16defad787ff1ffb5edd09e37 + REF libtorrent_1_2_0 + SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/add-datetime-to-boost-libs.patch - ${CMAKE_CURRENT_LIST_DIR}/boost-167.patch + PATCHES add-datetime-to-boost-libs.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED) -file(READ "${SOURCE_PATH}/include/libtorrent/export.hpp" _contents) -string(REPLACE "" "" _contents "${_contents}") -string(REPLACE "" "" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/include/libtorrent/export.hpp" "${_contents}") - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja @@ -33,22 +22,17 @@ vcpkg_configure_cmake( vcpkg_install_cmake() if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - # Put shared libraries into the proper directory - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/torrent-rasterbar.dll ${CURRENT_PACKAGES_DIR}/bin/torrent-rasterbar.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/torrent-rasterbar.dll ${CURRENT_PACKAGES_DIR}/debug/bin/torrent-rasterbar.dll) - # Defines for shared lib - file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/export.hpp EXPORT_H) + file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp EXPORT_H) string(REPLACE "defined TORRENT_BUILDING_SHARED" "1" EXPORT_H "${EXPORT_H}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/export.hpp "${EXPORT_H}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp "${EXPORT_H}") endif() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibtorrentRasterbar TARGET_PATH share/libtorrentrasterbar) + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtorrent) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtorrent/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtorrent/copyright) # Do not duplicate include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake) diff --git a/ports/wt/0001-boost-1.66.patch b/ports/wt/0001-boost-1.66.patch deleted file mode 100644 index b11ffdb05..000000000 --- a/ports/wt/0001-boost-1.66.patch +++ /dev/null @@ -1,370 +0,0 @@ -From a0fd67d85947c835cd55078edacf3c2ac84ca53f Mon Sep 17 00:00:00 2001 -From: Robert Schumacher -Date: Fri, 23 Feb 2018 03:12:00 -0800 -Subject: [PATCH 1/3] boost 1.66 - - -diff --git a/src/Wt/Http/Client.C b/src/Wt/Http/Client.C -index 85230d1..a2c893e 100644 ---- a/src/Wt/Http/Client.C -+++ b/src/Wt/Http/Client.C -@@ -642,7 +642,7 @@ private: - - protected: - asio::io_service& ioService_; -- asio::strand strand_; -+ asio::io_context::strand strand_; - tcp::resolver resolver_; - asio::streambuf requestBuf_; - asio::streambuf responseBuf_; -diff --git a/src/Wt/Http/Client.h b/src/Wt/Http/Client.h -index f3c7169..0f638e8 100644 ---- a/src/Wt/Http/Client.h -+++ b/src/Wt/Http/Client.h -@@ -21,11 +21,7 @@ - #include - - #ifdef WT_ASIO_IS_BOOST_ASIO --namespace boost { -- namespace asio { -- class io_service; -- } --} -+#include - #else // WT_ASIO_IS_STANDALONE_ASIO - namespace asio { - class io_service; -diff --git a/src/http/Connection.C b/src/http/Connection.C -index cab7708..cca4e0a 100644 ---- a/src/http/Connection.C -+++ b/src/http/Connection.C -@@ -78,7 +78,7 @@ void Connection::scheduleStop() - - void Connection::start() - { -- LOG_DEBUG(socket().native() << ": start()"); -+ LOG_DEBUG(socket().native_handle() << ": start()"); - - request_parser_.reset(); - request_.reset(); -@@ -106,7 +106,7 @@ void Connection::stop() - void Connection::setReadTimeout(int seconds) - { - if (seconds != 0) { -- LOG_DEBUG(socket().native() << " setting read timeout (ws: " -+ LOG_DEBUG(socket().native_handle() << " setting read timeout (ws: " - << request_.webSocketVersion << ")"); - state_ |= Reading; - -@@ -118,7 +118,7 @@ void Connection::setReadTimeout(int seconds) - - void Connection::setWriteTimeout(int seconds) - { -- LOG_DEBUG(socket().native() << " setting write timeout (ws: " -+ LOG_DEBUG(socket().native_handle() << " setting write timeout (ws: " - << request_.webSocketVersion << ")"); - state_ |= Writing; - -@@ -129,7 +129,7 @@ void Connection::setWriteTimeout(int seconds) - - void Connection::cancelReadTimer() - { -- LOG_DEBUG(socket().native() << " cancel read timeout"); -+ LOG_DEBUG(socket().native_handle() << " cancel read timeout"); - state_.clear(Reading); - - readTimer_.cancel(); -@@ -137,7 +137,7 @@ void Connection::cancelReadTimer() - - void Connection::cancelWriteTimer() - { -- LOG_DEBUG(socket().native() << " cancel write timeout"); -+ LOG_DEBUG(socket().native_handle() << " cancel write timeout"); - state_.clear(Writing); - - writeTimer_.cancel(); -@@ -163,7 +163,7 @@ void Connection::handleReadRequest0() - - #ifdef DEBUG - try { -- LOG_DEBUG(socket().native() << "incoming request: " -+ LOG_DEBUG(socket().native_handle() << "incoming request: " - << socket().remote_endpoint().port() << " (avail= " - << (rcv_buffer_size_ - (rcv_remaining_ - buffer.data())) << "): " - << std::string(rcv_remaining_, -@@ -189,7 +189,7 @@ void Connection::handleReadRequest0() - if (doWebSockets) - request_.enableWebSocket(); - -- LOG_DEBUG(socket().native() << "request: " << status); -+ LOG_DEBUG(socket().native_handle() << "request: " << status); - - if (status >= 300) - sendStockReply(status); -@@ -242,7 +242,7 @@ void Connection::sendStockReply(StockReply::status_type status) - void Connection::handleReadRequest(const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred) - { -- LOG_DEBUG(socket().native() << ": handleReadRequest(): " << e.message()); -+ LOG_DEBUG(socket().native_handle() << ": handleReadRequest(): " << e.message()); - - cancelReadTimer(); - -@@ -261,7 +261,7 @@ void Connection::close() - cancelReadTimer(); - cancelWriteTimer(); - -- LOG_DEBUG(socket().native() << ": close()"); -+ LOG_DEBUG(socket().native_handle() << ": close()"); - - ConnectionManager_.stop(shared_from_this()); - } -@@ -274,7 +274,7 @@ bool Connection::closed() const - - void Connection::handleError(const Wt::AsioWrapper::error_code& e) - { -- LOG_DEBUG(socket().native() << ": error: " << e.message()); -+ LOG_DEBUG(socket().native_handle() << ": error: " << e.message()); - - close(); - } -@@ -349,7 +349,7 @@ void Connection::handleReadBody0(ReplyPtr reply, - const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred) - { -- LOG_DEBUG(socket().native() << ": handleReadBody0(): " << e.message()); -+ LOG_DEBUG(socket().native_handle() << ": handleReadBody0(): " << e.message()); - - if (disconnectCallback_) { - if (e && e != asio::error::operation_aborted) { -@@ -357,7 +357,7 @@ void Connection::handleReadBody0(ReplyPtr reply, - disconnectCallback_ = boost::function(); - f(); - } else if (!e) { -- LOG_ERROR(socket().native() -+ LOG_ERROR(socket().native_handle() - << ": handleReadBody(): while waiting for disconnect, " - "received unexpected data, closing"); - close(); -@@ -403,14 +403,14 @@ void Connection::startWriteResponse(ReplyPtr reply) - int size = asio::buffer_size(buffers[i]); - s += size; - #ifdef DEBUG_DUMP -- char *data = (char *)asio::detail::buffer_cast_helper(buffers[i]); -+ char *data = asio::buffer_cast(buffers[i]); - for (int j = 0; j < size; ++j) - std::cerr << data[j]; - #endif - } - #endif - -- LOG_DEBUG(socket().native() << " sending: " << s << "(buffers: " -+ LOG_DEBUG(socket().native_handle() << " sending: " << s << "(buffers: " - << buffers.size() << ")"); - - if (!buffers.empty()) { -@@ -423,7 +423,7 @@ void Connection::startWriteResponse(ReplyPtr reply) - - void Connection::handleWriteResponse(ReplyPtr reply) - { -- LOG_DEBUG(socket().native() << ": handleWriteResponse() " << -+ LOG_DEBUG(socket().native_handle() << ": handleWriteResponse() " << - haveResponse_ << " " << responseDone_); - if (haveResponse_) - startWriteResponse(reply); -@@ -458,7 +458,7 @@ void Connection::handleWriteResponse0(ReplyPtr reply, - const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred) - { -- LOG_DEBUG(socket().native() << ": handleWriteResponse0(): " -+ LOG_DEBUG(socket().native_handle() << ": handleWriteResponse0(): " - << bytes_transferred << " ; " << e.message()); - - cancelWriteTimer(); -diff --git a/src/http/Connection.h b/src/http/Connection.h -index b0b71a3..bc0b6ed 100644 ---- a/src/http/Connection.h -+++ b/src/http/Connection.h -@@ -61,7 +61,7 @@ public: - virtual ~Connection(); - - Server *server() const { return server_; } -- asio::strand& strand() { return strand_; } -+ asio::io_context::strand& strand() { return strand_; } - - /// Stop all asynchronous operations associated with the connection. - void scheduleStop(); -@@ -104,7 +104,7 @@ protected: - /// The manager for this connection. - ConnectionManager& ConnectionManager_; - -- asio::strand strand_; -+ asio::io_context::strand strand_; - - void finishReply(); - -diff --git a/src/http/Reply.C b/src/http/Reply.C -index 0d79e39..5e6c615 100644 ---- a/src/http/Reply.C -+++ b/src/http/Reply.C -@@ -596,7 +596,7 @@ bool Reply::encodeNextContentBuffer( - originalSize += bs; - - gzipStrm_.avail_in = bs; -- gzipStrm_.next_in = (unsigned char *)asio::detail::buffer_cast_helper(b); -+ gzipStrm_.next_in = (unsigned char *)b.data(); - - unsigned char out[16*1024]; - do { -diff --git a/src/http/Server.h b/src/http/Server.h -index 3d3229a..373073f 100644 ---- a/src/http/Server.h -+++ b/src/http/Server.h -@@ -129,7 +129,7 @@ private: - Wt::WLogger accessLogger_; - - /// The strand for handleTcpAccept(), handleSslAccept() and handleStop() -- asio::strand accept_strand_; -+ asio::io_context::strand accept_strand_; - - /// Acceptors used to listen for incoming http connections. - std::vector tcp_listeners_; -diff --git a/src/http/SessionProcess.C b/src/http/SessionProcess.C -index 72d9a88..92320b0 100644 ---- a/src/http/SessionProcess.C -+++ b/src/http/SessionProcess.C -@@ -80,7 +80,7 @@ void SessionProcess::asyncExec(const Configuration &config, - if (!ec) - acceptor_->listen(0, ec); - #ifndef WT_WIN32 -- fcntl(acceptor_->native(), F_SETFD, FD_CLOEXEC); -+ fcntl(acceptor_->native_handle(), F_SETFD, FD_CLOEXEC); - #endif // !WT_WIN32 - if (ec) { - LOG_ERROR("Couldn't create listening socket: " << ec.message()); -diff --git a/src/http/SslConnection.C b/src/http/SslConnection.C -index 74c8642..2c34b53 100644 ---- a/src/http/SslConnection.C -+++ b/src/http/SslConnection.C -@@ -81,9 +81,9 @@ void SslConnection::handleHandshake(const Wt::AsioWrapper::error_code& error) - - void SslConnection::stop() - { -- LOG_DEBUG(socket().native() << ": stop()"); -+ LOG_DEBUG(socket().native_handle() << ": stop()"); - finishReply(); -- LOG_DEBUG(socket().native() << ": SSL shutdown"); -+ LOG_DEBUG(socket().native_handle() << ": SSL shutdown"); - - Connection::stop(); - -@@ -108,20 +108,20 @@ void SslConnection::stopNextLayer(const Wt::AsioWrapper::error_code& ec) - // In case of timeout, we will get here twice. - sslShutdownTimer_.cancel(); - if (ec) { -- LOG_DEBUG(socket().native() << ": ssl_shutdown failed:" -+ LOG_DEBUG(socket().native_handle() << ": ssl_shutdown failed:" - << ec.message()); - } - try { - if (socket().is_open()) { - Wt::AsioWrapper::error_code ignored_ec; -- LOG_DEBUG(socket().native() << ": socket shutdown"); -+ LOG_DEBUG(socket().native_handle() << ": socket shutdown"); - socket().shutdown(asio::ip::tcp::socket::shutdown_both, - ignored_ec); -- LOG_DEBUG(socket().native() << "closing socket"); -+ LOG_DEBUG(socket().native_handle() << "closing socket"); - socket().close(); - } - } catch (Wt::AsioWrapper::system_error& e) { -- LOG_DEBUG(socket().native() << ": error " << e.what()); -+ LOG_DEBUG(socket().native_handle() << ": error " << e.what()); - } - } - -@@ -161,7 +161,7 @@ void SslConnection::startAsyncReadBody(ReplyPtr reply, - Buffer& buffer, int timeout) - { - if (state_ & Reading) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(socket().native_handle() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -@@ -198,7 +198,7 @@ void SslConnection - int timeout) - { - if (state_ & Writing) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(socket().native_handle() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -diff --git a/src/http/TcpConnection.C b/src/http/TcpConnection.C -index ad73164..4eaf83b 100644 ---- a/src/http/TcpConnection.C -+++ b/src/http/TcpConnection.C -@@ -38,17 +38,17 @@ asio::ip::tcp::socket& TcpConnection::socket() - - void TcpConnection::stop() - { -- LOG_DEBUG(socket().native() << ": stop()"); -+ LOG_DEBUG(socket().native_handle() << ": stop()"); - - finishReply(); - - try { - Wt::AsioWrapper::error_code ignored_ec; - socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec); -- LOG_DEBUG(socket().native() << ": closing socket"); -+ LOG_DEBUG(socket().native_handle() << ": closing socket"); - socket_.close(); - } catch (Wt::AsioWrapper::system_error& e) { -- LOG_DEBUG(socket().native() << ": error " << e.what()); -+ LOG_DEBUG(socket().native_handle() << ": error " << e.what()); - } - - Connection::stop(); -@@ -56,10 +56,10 @@ void TcpConnection::stop() - - void TcpConnection::startAsyncReadRequest(Buffer& buffer, int timeout) - { -- LOG_DEBUG(socket().native() << ": startAsyncReadRequest"); -+ LOG_DEBUG(socket().native_handle() << ": startAsyncReadRequest"); - - if (state_ & Reading) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(socket().native_handle() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -@@ -81,10 +81,10 @@ void TcpConnection::startAsyncReadRequest(Buffer& buffer, int timeout) - void TcpConnection::startAsyncReadBody(ReplyPtr reply, - Buffer& buffer, int timeout) - { -- LOG_DEBUG(socket().native() << ": startAsyncReadBody"); -+ LOG_DEBUG(socket().native_handle() << ": startAsyncReadBody"); - - if (state_ & Reading) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(socket().native_handle() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -@@ -109,10 +109,10 @@ void TcpConnection::startAsyncWriteResponse - const std::vector& buffers, - int timeout) - { -- LOG_DEBUG(socket().native() << ": startAsyncWriteResponse"); -+ LOG_DEBUG(socket().native_handle() << ": startAsyncWriteResponse"); - - if (state_ & Writing) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(socket().native_handle() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); --- -2.16.2.windows.1 - diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 3c2e70962..c9fb520f6 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( SHA512 5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924 HEAD_REF master PATCHES - 0001-boost-1.66.patch 0002-link-glew.patch 0003-disable-boost-autolink.patch 0004-link-ssl.patch -- cgit v1.2.3 From 36cb7592b18d261f87ef366f9271ca45eadffb88 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 30 Jan 2019 17:47:36 -0800 Subject: [vcpkg-docs] Improve documentation for Visual Studio 2019 --- docs/users/triplets.md | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 4f23c8e27..87fa72fd3 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -53,25 +53,33 @@ This option also has forms for configuration-specific and C flags: ## Windows Variables -### VCPKG_PLATFORM_TOOLSET -Specifies the VS-based C/C++ compiler toolchain to use. - -This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine. - -Visual Studio 2015 platform toolset is `v140` -Visual Studio 2017 platform toolset is `v141` - ### VCPKG_VISUAL_STUDIO_PATH Specifies the Visual Studio installation to use. -When unspecified, a Visual Studio instance is selected automatically, preferring Stable 2017, then Preview 2017, then 2015. +To select the precise combination of Visual Studio instance and toolset version, we walk through the following algorithm: +1. Determine the setting for `VCPKG_VISUAL_STUDIO_PATH` from the triplet, or the environment variable `VCPKG_VISUAL_STUDIO_PATH`, or consider it unset +2. Determine the setting for `VCPKG_PLATFORM_TOOLSET` from the triplet or consider it unset +3. Gather a list of all pairs of Visual Studio Instances with all toolsets available in those instances + 1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v142, v141, v140) +4. Filter the list based on the settings for `VCPKG_VISUAL_STUDIO_PATH` and `VCPKG_PLATFORM_TOOLSET`. +5. Select the best remaining option The path should be absolute, formatted with backslashes, and have no trailing slash: ```cmake set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community") ``` +### VCPKG_PLATFORM_TOOLSET +Specifies the VS-based C/C++ compiler toolchain to use. + +See [`VCPKG_VISUAL_STUDIO_PATH`](#VCPKG_VISUAL_STUDIO_PATH) for the full selection algorithm. + +Valid settings: +* The Visual Studio 2019 platform toolset is `v142`. +* The Visual Studio 2017 platform toolset is `v141`. +* The Visual Studio 2015 platform toolset is `v140`. + ## MacOS Variables ### VCPKG_INSTALL_NAME_DIR -- cgit v1.2.3 From 92bd67970d33ecdc1767c1dd042d73b7d1d998b0 Mon Sep 17 00:00:00 2001 From: Yang Shen Date: Fri, 1 Feb 2019 04:06:58 +0800 Subject: Adding #elif macros for ARM and ARM64 (#5232) --- toolsrc/src/vcpkg/base/system.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index 8aa1db53c..b25412f7a 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -74,6 +74,10 @@ namespace vcpkg::System return CPUArchitecture::X64; #elif defined(__x86__) || defined(_M_X86) return CPUArchitecture::X86; +#elif defined(__arm__) || defined(_M_ARM) + return CPUArchitecture::ARM; +#elif defined(__aarch64__) || defined(_M_ARM64) + return CPUArchitecture::ARM64; #else #error "Unknown host architecture" #endif -- cgit v1.2.3 From 9fb3b9c8fa3f4a571e00331ab7efe4f2098d472c Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 2 Feb 2019 02:04:22 +0800 Subject: [argh] Add new port (#5266) --- ports/argh/CONTROL | 3 +++ ports/argh/portfile.cmake | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/argh/CONTROL create mode 100644 ports/argh/portfile.cmake diff --git a/ports/argh/CONTROL b/ports/argh/CONTROL new file mode 100644 index 000000000..36c062da4 --- /dev/null +++ b/ports/argh/CONTROL @@ -0,0 +1,3 @@ +Source: argh +Version: 2018-12-18 +Description: Argh! A minimalist argument handler. diff --git a/ports/argh/portfile.cmake b/ports/argh/portfile.cmake new file mode 100644 index 000000000..5e8b8bccd --- /dev/null +++ b/ports/argh/portfile.cmake @@ -0,0 +1,36 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO adishavit/argh + REF a1edee559757e076e570b8f6c2f555d8d00b373c + SHA512 a100c7ff20ef9ed39d53efeac5507a6ed59fb99ccba36ac4b5f8f5aaac6782f8e951b2f26b9b50f6c6fdbc53b5bceaabbb9dd9b9539f968fc1037733342e17a6 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 1e1f2949ac9c98dd38cea3a51b74d8ab8d936d1d Mon Sep 17 00:00:00 2001 From: JackBoos <398808571@qq.com> Date: Sat, 2 Feb 2019 02:08:22 +0800 Subject: [rang]add port rang (#5273) * [rang]add port rang * change version info and description * [fann]Add port fann * Remove Fann temporary. Wait for merge port rang. --- ports/rang/CMakeLists.txt | 5 +++++ ports/rang/CONTROL | 3 +++ ports/rang/portfile.cmake | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 ports/rang/CMakeLists.txt create mode 100644 ports/rang/CONTROL create mode 100644 ports/rang/portfile.cmake diff --git a/ports/rang/CMakeLists.txt b/ports/rang/CMakeLists.txt new file mode 100644 index 000000000..6cf64a05f --- /dev/null +++ b/ports/rang/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required (VERSION 2.8) +project (rang) + +include_directories(include) +install(FILES ${PROJECT_SOURCE_DIR}/include/rang.hpp DESTINATION include) \ No newline at end of file diff --git a/ports/rang/CONTROL b/ports/rang/CONTROL new file mode 100644 index 000000000..629bee475 --- /dev/null +++ b/ports/rang/CONTROL @@ -0,0 +1,3 @@ +Source: rang +Version: 3.1.0 +Description: Colors for your Terminal. \ No newline at end of file diff --git a/ports/rang/portfile.cmake b/ports/rang/portfile.cmake new file mode 100644 index 000000000..4c332a82e --- /dev/null +++ b/ports/rang/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO agauniyal/rang + REF v3.1.0 + SHA512 3419c9d8b8177320d4254a3e317790b0ca17bb08940025a16cb6a468a5f4c6e6a8bae391441fbb61b46e94cbe760aef1cb7f31fb8a1e958312e9dcb568b04470 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file -- cgit v1.2.3 From 2c5efa81ca081f6b65b4b64c77c2da9d834752ad Mon Sep 17 00:00:00 2001 From: Joaquim Date: Fri, 1 Feb 2019 19:01:19 +0000 Subject: [gdal] Remove `libmysql` dependency (#5271) * Remove the libmysql dependency The fact that it's not possible to build libmysql for x86 is a source of troubles for projects that have GDAL as a dependency. Though it's possible to build GDAL separately for x64 & x86 this is very confusing and breaks other builds. For example I'm often crossing this issue when trying to build a local GMT package. So the best is to just remove it as a dependency. ``` C:\programs\compa_libs\vcpkg>vcpkg install gmt:x86-windows --recurse The following packages will be built and installed: * gdal[core,mysql-libmysql]:x86-windows gmt[core]:x86-windows * libmysql[core]:x86-windows Additional packages (*) will be modified to complete this operation. Starting package 1/3: libmysql:x86-windows Building package libmysql[core]:x86-windows... CMake Error at C:/programs/compa_libs/vcpkg/ports/libmysql/portfile.cmake:10 (message): Oracle has dropped support in libmysql for 32-bit Windows. ``` * Revert "Remove the libmysql dependency" * Remove the libmysql dependency The fact that it's not possible to build libmysql for x86 is a source of troubles for projects that have GDAL as a dependency. Though it's possible to build GDAL separately for x64 & x86 this is very confusing and breaks other builds. For example I'm often crossing this issue when trying to build a local GMT package. So the best is to just remove it as a dependency. ``` C:\programs\compa_libs\vcpkg>vcpkg install gmt:x86-windows --recurse The following packages will be built and installed: * gdal[core,mysql-libmysql]:x86-windows gmt[core]:x86-windows * libmysql[core]:x86-windows Additional packages (*) will be modified to complete this operation. Starting package 1/3: libmysql:x86-windows Building package libmysql[core]:x86-windows... CMake Error at C:/programs/compa_libs/vcpkg/ports/libmysql/portfile.cmake:10 (message): Oracle has dropped support in libmysql for 32-bit Windows. ``` --- ports/gdal/CONTROL | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 810c12e41..d2ad4ae77 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -2,11 +2,6 @@ Source: gdal Version: 2.4.0 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma -Default-Features: mysql-libmysql - -Feature: mysql-libmysql -Build-Depends: libmysql -Description: Add mysql support using libmysql Feature: mysql-libmariadb Build-Depends: libmariadb -- cgit v1.2.3 From 3980ac5abdffa5a6f715b39f202a1feed3e26592 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 1 Feb 2019 20:05:11 +0100 Subject: [jxrlib] include a find package script for cmake for downstream projects (#5226) * [jxrlib] include a find package script for cmake for downstream projects * [jxrlib] bump control --- ports/jxrlib/CONTROL | 2 +- ports/jxrlib/FindJXR.cmake | 28 ++++++++++++++++++++++++++++ ports/jxrlib/portfile.cmake | 3 +++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 ports/jxrlib/FindJXR.cmake diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL index 9fcc36254..2d3fa4ac4 100644 --- a/ports/jxrlib/CONTROL +++ b/ports/jxrlib/CONTROL @@ -1,3 +1,3 @@ Source: jxrlib -Version: 1.1-4 +Version: 1.1-5 Description: Open source implementation of the jpegxr image format standard. diff --git a/ports/jxrlib/FindJXR.cmake b/ports/jxrlib/FindJXR.cmake new file mode 100644 index 000000000..7e4a5d45e --- /dev/null +++ b/ports/jxrlib/FindJXR.cmake @@ -0,0 +1,28 @@ +# - Find JXR +# Find the JXR library +# This module defines +# JXR_INCLUDE_DIRS, where to find jxrlib/JXRGlue.h +# JXR_LIBRARIES, the libraries needed to use JXR +# + +find_path(JXR_INCLUDE_DIRS + NAMES JXRGlue.h + PATH_SUFFIXES jxrlib +) +mark_as_advanced(JXR_INCLUDE_DIRS) + +include(SelectLibraryConfigurations) + +find_library(JPEGXR_LIBRARY_RELEASE NAMES jpegxr PATH_SUFFIXES lib) +find_library(JPEGXR_LIBRARY_DEBUG NAMES jpegxrd PATH_SUFFIXES lib) +select_library_configurations(JPEGXR) + +find_library(JXRGLUE_LIBRARY_RELEASE NAMES jxrglue PATH_SUFFIXES lib) +find_library(JXRGLUE_LIBRARY_DEBUG NAMES jxrglued PATH_SUFFIXES lib) +select_library_configurations(JXRGLUE) + +set(JXR_LIBRARIES ${JPEGXR_LIBRARY} ${JXRGLUE_LIBRARY}) +mark_as_advanced(JXR_LIBRARIES) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(JXR DEFAULT_MSG JXR_INCLUDE_DIRS JXR_LIBRARIES) diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index ca29a6aca..9b7cca5fb 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -28,4 +28,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxrlib) file(RENAME ${CURRENT_PACKAGES_DIR}/share/jxrlib/LICENSE ${CURRENT_PACKAGES_DIR}/share/jxrlib/copyright) +#install FindJXR.cmake file +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/JXR) + vcpkg_copy_pdbs() -- cgit v1.2.3 From 83a33201d1edd6a06e8133b37f1d8a4b40ed591a Mon Sep 17 00:00:00 2001 From: Thibaut Date: Fri, 1 Feb 2019 20:07:50 +0100 Subject: [tsl-ordered-map] Add new port. (#5280) --- ports/tsl-ordered-map/CONTROL | 3 +++ ports/tsl-ordered-map/portfile.cmake | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ports/tsl-ordered-map/CONTROL create mode 100644 ports/tsl-ordered-map/portfile.cmake diff --git a/ports/tsl-ordered-map/CONTROL b/ports/tsl-ordered-map/CONTROL new file mode 100644 index 000000000..7595c53fc --- /dev/null +++ b/ports/tsl-ordered-map/CONTROL @@ -0,0 +1,3 @@ +Source: tsl-ordered-map +Version: 0.8.0 +Description: C++ hash map and hash set which preserve the order of insertion diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake new file mode 100644 index 000000000..bfa4f0625 --- /dev/null +++ b/ports/tsl-ordered-map/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/ordered-map + REF v0.8.0 + SHA512 9e0cc8ea4d5731e89cb6d58a54394b4ab0378cb2488d9e462ad80facd8aa06e21aaa0f9b969fbd7ac22c99bae09ab7c6e7980857784aa0b1a3a2b0c216ffa79a +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) -- cgit v1.2.3 From 8282fe065c6a3f494b43b3860602a98696a87487 Mon Sep 17 00:00:00 2001 From: Thibaut Date: Fri, 1 Feb 2019 20:08:28 +0100 Subject: [tsl-sparse-map] Add new port. (#5279) --- ports/tsl-sparse-map/CONTROL | 3 +++ ports/tsl-sparse-map/portfile.cmake | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ports/tsl-sparse-map/CONTROL create mode 100644 ports/tsl-sparse-map/portfile.cmake diff --git a/ports/tsl-sparse-map/CONTROL b/ports/tsl-sparse-map/CONTROL new file mode 100644 index 000000000..31e08231c --- /dev/null +++ b/ports/tsl-sparse-map/CONTROL @@ -0,0 +1,3 @@ +Source: tsl-sparse-map +Version: 0.6.0 +Description: C++ implementation of a memory efficient hash map and hash set diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake new file mode 100644 index 000000000..6895d7c67 --- /dev/null +++ b/ports/tsl-sparse-map/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/sparse-map + REF v0.6.0 + SHA512 6a21ebbd3505a0b4bf199f24ae9262395392964457eb26edb39fd7aa82aec7fc74468f7615977c74a2f36332850a68e1d6a6e86d487c3dff7efa2b081fa2c8c5 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) -- cgit v1.2.3 From 6cd6a3a20cd072adf69effa9e345e310c3f095f2 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Fri, 1 Feb 2019 14:11:01 -0500 Subject: [libass] Generate pkg-config file (#5272) --- ports/libass/CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 5570f3440..32d7ef097 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.9) project(libass C CXX) +set(LIBASS_VERSION 0.14.0) + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) @@ -47,3 +49,15 @@ install(TARGETS ass LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) +# pkgconfig file +set(prefix ${CMAKE_INSTALL_PREFIX}) +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_LIBS_PRIVATE -lm) +configure_file(libass.pc.in libass.pc @ONLY) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/libass.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -- cgit v1.2.3 From 25e8a482a8dcd93d4ec434d0895982a320689a0b Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Fri, 1 Feb 2019 11:12:29 -0800 Subject: [json-spirit] Fix link error C1128 (#5263) * [json-spirit] Fix link error C1128 * Update patch file --- ports/json-spirit/CONTROL | 2 +- ports/json-spirit/Fix-link-error-C1128.patch | 15 +++++++++++++++ ports/json-spirit/portfile.cmake | 8 +++----- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 ports/json-spirit/Fix-link-error-C1128.patch diff --git a/ports/json-spirit/CONTROL b/ports/json-spirit/CONTROL index dcfc407d7..e2b1d8079 100644 --- a/ports/json-spirit/CONTROL +++ b/ports/json-spirit/CONTROL @@ -1,4 +1,4 @@ Source: json-spirit -Version: 4.1.0 +Version: 4.1.0-1 Description: json parser using boost library Build-Depends: boost-config, boost-integer, boost-smart-ptr, boost-variant, boost-spirit diff --git a/ports/json-spirit/Fix-link-error-C1128.patch b/ports/json-spirit/Fix-link-error-C1128.patch new file mode 100644 index 000000000..e676931cc --- /dev/null +++ b/ports/json-spirit/Fix-link-error-C1128.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 24b1caf..2aac0b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,9 @@ endif() + + message(${CMAKE_INSTALL_INCLUDEDIR}) + +- ++if(MSVC) ++add_definitions(/bigobj) ++endif() + set(CPACK_PACKAGE_VERSION_MAJOR 4) + set(CPACK_PACKAGE_VERSION_MINOR 0) + set(CPACK_PACKAGE_VERSION_PATCH 8) diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake index 05be540b3..3b5e1d316 100644 --- a/ports/json-spirit/portfile.cmake +++ b/ports/json-spirit/portfile.cmake @@ -6,11 +6,9 @@ vcpkg_from_github( REF 5e16cca59b31d8beda0f07e3917ce11dcd43b3db SHA512 6ac0f15726391c9003e516213535c8d30e98b6c33bca0b03e9bf38e7085824bfc6cfaab267b1dfccbfcc567638d26f722d7e331f4e3b60d3acd5c717cb1fafcc HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/dll-wins.patch + PATCHES + dll-wins.patch + Fix-link-error-C1128.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 0bb2132c11e4272f4ea6e0c33d9b8368280180e7 Mon Sep 17 00:00:00 2001 From: evpobr Date: Sat, 2 Feb 2019 00:21:16 +0500 Subject: [port] Add wavpack port (#5049) --- ports/wavpack/CONTROL | 3 +++ ports/wavpack/portfile.cmake | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 ports/wavpack/CONTROL create mode 100644 ports/wavpack/portfile.cmake diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL new file mode 100644 index 000000000..80fb66b96 --- /dev/null +++ b/ports/wavpack/CONTROL @@ -0,0 +1,3 @@ +Source: wavpack +Version: 5.1.0-00d9a4a +Description: WavPack encode/decode library, command-line programs, and several plugins diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake new file mode 100644 index 000000000..1594f7249 --- /dev/null +++ b/ports/wavpack/portfile.cmake @@ -0,0 +1,48 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/00d9a4ac58a52b52495736be614cb06ba102663c) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dbry/WavPack + REF 00d9a4ac58a52b52495736be614cb06ba102663c + SHA512 a0d08ac2ff46bd4cc606626c8e0da18a83392722a2e40df18f9e40710e5e147c0a24800174bfdf42ed7a12be4d9679f6302c51d8409724d31ca2a29ab4972481 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DWAVPACK_INSTALL_DOCS=OFF + -DWAVPACK_BUILD_PROGRAMS=OFF + -DWAVPACK_BUILD_COOLEDIT_PLUGIN=OFF + -DWAVPACK_BUILD_WINAMP_PLUGIN=OFF + -DBUILD_TESTING=OFF + -DWAVPACK_BUILD_DOCS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wavpack RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME wavpack) -- cgit v1.2.3 From 78dd5184dc1f14499f05d48058863ff51374c404 Mon Sep 17 00:00:00 2001 From: Rajeev Massand Date: Fri, 1 Feb 2019 13:06:23 -0700 Subject: [azure-iot-sdk-c] public-preview 2019_01_31 changes (#5283) --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 10 +++++----- ports/azure-iot-sdk-c/CONTROL | 2 +- ports/azure-iot-sdk-c/portfile.cmake | 8 ++++---- ports/azure-uamqp-c/CONTROL | 2 +- ports/azure-uamqp-c/portfile.cmake | 10 +++++----- ports/azure-uhttp-c/CONTROL | 2 +- ports/azure-uhttp-c/portfile.cmake | 10 +++++----- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 10 +++++----- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 2ca540258..644b33cb6 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: 1.1.11-3 +Version: 1.1.11-4 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 408c996db..20e4b4cf9 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -6,17 +6,17 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF e885482ce32f1f77d29e85f7b8d35d74ffc69c74 - SHA512 329101cb2ff499aa16e1df736285e2fdd8c34549d4790eaafa1df763950c2b4a5927f52e93dbf22192b240fe0445050ad99133df0405227ffe9857ff2b25014d - HEAD_REF public-preview + REF 773980d7882e4d5f1e7c9be2a0797d61fbc19da1 + SHA512 fa374db336f5d186bcfd6ba70660167fdc87a1847376579cee894af3d2810aba097b3468e75c0b4213b68423cc07215032eeae6ee07590378237606112286ac4 + HEAD_REF master PATCHES no-double-expand-cmake.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 1d622902d7842f94193fc394987f2b4e978bb700 - SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 + REF 773980d7882e4d5f1e7c9be2a0797d61fbc19da1 + SHA512 fa374db336f5d186bcfd6ba70660167fdc87a1847376579cee894af3d2810aba097b3468e75c0b4213b68423cc07215032eeae6ee07590378237606112286ac4 HEAD_REF master PATCHES no-double-expand-cmake.patch ) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 139e72eb1..891295f92 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-iot-sdk-c -Version: 1.2.12-1 +Version: 1.2.13-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 6008b0e71..6489d9197 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 74b03316ec90f1602c20ebeab67a3b4a61065d8e - SHA512 78ab8d7cd6e25886e41f98500cb8cd9609ca677426a882ed0364a908e5267ec6191bb15fd65fb2c420a108df41f52a8ba6d5e6d626874bbfae4f56e8af5ca428 + REF 6633c5b18710febf1af7713cf1a336fd38f623ed + SHA512 17787aa4ef52d4cf39f939fee05555fcef85cde63620036f6715b699902fd3fd766250c26ea6065f5f36572ac2b9d5293e79ba17ea9d8f4cbce267322269e7e4 HEAD_REF public-preview PATCHES improve-external-deps.patch ) @@ -15,8 +15,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 - SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb + REF 738f160116a689566f6f20e0200a0c3c86e85dee + SHA512 e697fcefaae938c66e6cca5b35b6924bff76f6b147afeffe45acff63aa6e6ed99da53450fc2a1e80700f44928ce3cd3a3e6d3ce72f96a1b22a74557828be1cbc HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index a903752ac..5b5d08897 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-uamqp-c -Version: 1.2.11-2 +Version: 1.2.11-3 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 4f4d33ee9..7ccf30f34 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF bd7b85d0830634e3157da2411a6d060bf28f266e - SHA512 cbc2aa2765242ebe1a5e194e126f419cbd26edda5c1f72ffe9219a6c38b80aa91ef823a4fd8f78ac5d7ae0d9d471b50e5b8c4684e77c71b31e7cf35802e0cc17 - HEAD_REF public-preview + REF 195f2480f31e0a9492e3ff3a7a1eed4a69205ddd + SHA512 fa2cab67d119018b7e28dd002641bc3e87ac2d45ecddeddb867135bac6e5eda02588f84c26283947bdc47789c90a3f9e04dab16e5eb9be8a384ef5c9bcf39572 + HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 - SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 + REF 195f2480f31e0a9492e3ff3a7a1eed4a69205ddd + SHA512 fa2cab67d119018b7e28dd002641bc3e87ac2d45ecddeddb867135bac6e5eda02588f84c26283947bdc47789c90a3f9e04dab16e5eb9be8a384ef5c9bcf39572 HEAD_REF master ) endif() diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index 8a6857c3e..07d6c83e2 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-uhttp-c -Version: 1.1.11-2 +Version: 1.1.11-3 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 0ef272a12..901489a1d 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF e459385a811ce075f42aa7202db96ba1d1f55ac1 - SHA512 b96382184893b49f30ad75d4c19eeb48f7a7823e9d48f2896ee4760be20f2f5b5ee3e78e39f10ae26363165360e5871c3ba82aa9edf3943b9f0ef9c0e3036ea6 - HEAD_REF public-preview + REF 3a81e598caf2bd37077b7cd20bb45aaa9e694df7 + SHA512 6f12efdd2f02adb2414e10daa0604f5351f7731b997d69a9ca2923b6246c7a628bd859c6dca2503e51eeece851421b7739ffbf31a3f3d34dca4dcbadb54411d2 + HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed - SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 + REF 3a81e598caf2bd37077b7cd20bb45aaa9e694df7 + SHA512 6f12efdd2f02adb2414e10daa0604f5351f7731b997d69a9ca2923b6246c7a628bd859c6dca2503e51eeece851421b7739ffbf31a3f3d34dca4dcbadb54411d2 HEAD_REF master ) endif() diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 84359ff0c..6f44bd7b6 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-umqtt-c -Version: 1.1.11-2 +Version: 1.1.11-3 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index d03c24527..23ced94b8 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 1b3a25f4f7f0edbe068e261e8a808d7bc394a358 - SHA512 00ff90eccfbb4febded7e819baa6303e97d3e7d6f6f8f1a28ebf353d7ad7ac5ec7f479e66456f395c7ece7fd6d612f3948ac656420bc0bc75566bdbb65fb88c3 - HEAD_REF public-preview + REF f68e8d535d18028e3e6ed4d806ce8994037a49fa + SHA512 9bea4c3dbd26f5221c4da782954a4e8b4d372aca75b71a9eb63b818f31f153e4be534a20960c007c3aa184766f2a826c5ba11e780e23098707419ab39f055cc1 + HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 3205eb26401e9c6639100934e8fb75b75275760d - SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c + REF f68e8d535d18028e3e6ed4d806ce8994037a49fa + SHA512 9bea4c3dbd26f5221c4da782954a4e8b4d372aca75b71a9eb63b818f31f153e4be534a20960c007c3aa184766f2a826c5ba11e780e23098707419ab39f055cc1 HEAD_REF master ) endif() -- cgit v1.2.3 From 9be25c17aaf1fc9a1cf2c86a9225879f5ee45f57 Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Fri, 1 Feb 2019 14:20:58 -0600 Subject: [openblas] Update to 0.3.5 (#5245) fixes: #5161, #4145 --- ports/openblas/CONTROL | 2 +- ports/openblas/install-openblas.patch | 24 ------------- ports/openblas/portfile.cmake | 23 +++++-------- ports/openblas/uwp.patch | 34 +++++++++++++++++++ ports/openblas/whitespace.patch | 64 ----------------------------------- 5 files changed, 44 insertions(+), 103 deletions(-) delete mode 100644 ports/openblas/install-openblas.patch create mode 100644 ports/openblas/uwp.patch delete mode 100644 ports/openblas/whitespace.patch diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL index 78617d700..ed1206a0a 100644 --- a/ports/openblas/CONTROL +++ b/ports/openblas/CONTROL @@ -1,3 +1,3 @@ Source: openblas -Version: 0.2.20-2 +Version: 0.3.5 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. diff --git a/ports/openblas/install-openblas.patch b/ports/openblas/install-openblas.patch deleted file mode 100644 index ef9574cdd..000000000 --- a/ports/openblas/install-openblas.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a379f549..f95a872b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,7 +16,7 @@ enable_language(C) - include(GNUInstallDirs) - - if(MSVC) --set(OpenBLAS_LIBNAME libopenblas) -+set(OpenBLAS_LIBNAME openblas) - else() - set(OpenBLAS_LIBNAME openblas) - endif() -@@ -197,6 +197,10 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES - SOVERSION ${OpenBLAS_MAJOR_VERSION} - ) - -+install(TARGETS ${OpenBLAS_LIBNAME} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - - # TODO: Why is the config saved here? Is this necessary with CMake? - #Save the config files for installation diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 463db0f25..ef4e5e177 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -24,14 +24,14 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF v0.2.20 - SHA512 8dfc8e8c8d456b834d2e9544c8eadd9f4770e30db8b8dd76af601ec0735fd86c9cf63dd6a03ccd23fc02ec2e05069a09875b9073dfe29f99aadab3a958ae2634 + REF v0.3.5 + SHA512 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0 HEAD_REF develop ) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-openblas.patch" "${CMAKE_CURRENT_LIST_DIR}/whitespace.patch" + PATCHES "${CMAKE_CURRENT_LIST_DIR}/uwp.patch" ) find_program(GIT NAMES git git.cmd) @@ -77,16 +77,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel") +elseif(NOT VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -DBUILD_WITHOUT_LAPACK=ON) else() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON - # PREFER_NINJA # Disable this option if project cannot be built with Ninja - # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 -) - + OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON) endif() @@ -97,9 +95,6 @@ vcpkg_install_cmake() # this is only to quite vcpkg file(COPY ${CMAKE_CURRENT_LIST_DIR}/openblas_common.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/config.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/include/openblas_config.h) - file(READ ${SOURCE_PATH}/cblas.h CBLAS_H) string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H "${CBLAS_H}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}") @@ -110,4 +105,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/openblas/LICENSE ${CURRENT_PACKAGES_DI vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/openblas/uwp.patch b/ports/openblas/uwp.patch new file mode 100644 index 000000000..93d0795a6 --- /dev/null +++ b/ports/openblas/uwp.patch @@ -0,0 +1,34 @@ +--- a/cmake/prebuild.cmake 2019-01-28 03:05:58.422245700 -0600 ++++ b/cmake/prebuild.cmake 2019-01-28 03:07:02.885495800 -0600 +@@ -37,6 +37,9 @@ + + # CPUIDEMU = ../../cpuid/table.o + ++if (NOT DEFINED BLASHELPER_BINARY_DIR) ++ set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}") ++endif () + + if (DEFINED CPUIDEMU) + set(EXFLAGS "-DCPUIDEMU -DVENDOR=99") +@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING) + message(STATUS "Running getarch") + + # use the cmake binary w/ the -E param to run a shell command in a cross-platform way +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) + + message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") + +@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR + endif () + + # use the cmake binary w/ the -E param to run a shell command in a cross-platform way +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) + + # append config data from getarch_2nd to the TARGET file and read in CMake vars + file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT}) diff --git a/ports/openblas/whitespace.patch b/ports/openblas/whitespace.patch deleted file mode 100644 index 410e81655..000000000 --- a/ports/openblas/whitespace.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake -index 02ab708..b51bd0b 100644 ---- a/cmake/prebuild.cmake -+++ b/cmake/prebuild.cmake -@@ -37,6 +37,10 @@ - - # CPUIDEMU = ../../cpuid/table.o - -+if (NOT DEFINED BLASHELPER_BINARY_DIR) -+ set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}") -+endif () -+ - if (DEFINED CPUIDEMU) - set(EXFLAGS "-DCPUIDEMU -DVENDOR=99") - endif () -@@ -87,7 +87,7 @@ file(MAKE_DIRECTORY ${GETARCH_DIR}) - if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") - try_compile(GETARCH_RESULT ${GETARCH_DIR} - SOURCES ${GETARCH_SRC} -- COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I${PROJECT_SOURCE_DIR} -+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${PROJECT_SOURCE_DIR}" - OUTPUT_VARIABLE GETARCH_LOG - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} - ) -@@ -95,8 +99,8 @@ endif () - message(STATUS "Running getarch") - - # use the cmake binary w/ the -E param to run a shell command in a cross-platform way --execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) --execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) -+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) -+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) - - message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") - -@@ -114,7 +114,7 @@ file(MAKE_DIRECTORY ${GETARCH2_DIR}) - if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") - try_compile(GETARCH2_RESULT ${GETARCH2_DIR} - SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c -- COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I${PROJECT_SOURCE_DIR} -+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${PROJECT_SOURCE_DIR}" - OUTPUT_VARIABLE GETARCH2_LOG - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} - ) -@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") - endif () - - # use the cmake binary w/ the -E param to run a shell command in a cross-platform way --execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) --execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) -+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) -+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) - - # append config data from getarch_2nd to the TARGET file and read in CMake vars - file(APPEND ${TARGET_CONF} ${GETARCH2_CONF_OUT}) -@@ -141,7 +141,7 @@ file(MAKE_DIRECTORY ${GEN_CONFIG_H_DIR}) - if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") - try_compile(GEN_CONFIG_H_RESULT ${GEN_CONFIG_H_DIR} - SOURCES ${PROJECT_SOURCE_DIR}/gen_config_h.c -- COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GEN_CONFIG_H_FLAGS} -I${PROJECT_SOURCE_DIR} -+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GEN_CONFIG_H_FLAGS} -I"${PROJECT_SOURCE_DIR}" - OUTPUT_VARIABLE GEN_CONFIG_H_LOG - COPY_FILE ${PROJECT_BINARY_DIR}/${GEN_CONFIG_H_BIN} - ) -- cgit v1.2.3 From 52390cf481f6fe3962bbbd2b84a62ab4d9702484 Mon Sep 17 00:00:00 2001 From: Marco Craveiro Date: Fri, 1 Feb 2019 20:25:28 +0000 Subject: [libodb] Assorted fixes to get ODB v2.4 libraries to compile on x64 Linux (#5260) * [libodb] Add configure headers to all libs for Linux * [libodb] Include options files in install --- ports/libodb-boost/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++++++ ports/libodb-boost/CONTROL | 4 +++ ports/libodb-boost/config.unix.h.in | 14 +++++++++++ ports/libodb-boost/portfile.cmake | 29 ++++++++++++++++++++++ ports/libodb-mysql/CMakeLists.txt | 3 +++ ports/libodb-mysql/config.unix.h.in | 19 +++++++++++++++ ports/libodb-mysql/portfile.cmake | 8 ++++-- ports/libodb-pgsql/CMakeLists.txt | 3 +++ ports/libodb-pgsql/config.unix.h.in | 14 +++++++++++ ports/libodb-pgsql/portfile.cmake | 6 ++++- ports/libodb-sqlite/CMakeLists.txt | 3 +++ ports/libodb-sqlite/config.unix.h.in | 15 ++++++++++++ ports/libodb-sqlite/portfile.cmake | 8 ++++-- ports/libodb/CMakeLists.txt | 12 +++++++-- ports/libodb/config.unix.h.in | 20 +++++++++++++++ ports/libodb/portfile.cmake | 6 ++++- 16 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 ports/libodb-boost/CMakeLists.txt create mode 100644 ports/libodb-boost/CONTROL create mode 100644 ports/libodb-boost/config.unix.h.in create mode 100644 ports/libodb-boost/portfile.cmake create mode 100644 ports/libodb-mysql/config.unix.h.in create mode 100644 ports/libodb-pgsql/config.unix.h.in create mode 100644 ports/libodb-sqlite/config.unix.h.in create mode 100644 ports/libodb/config.unix.h.in diff --git a/ports/libodb-boost/CMakeLists.txt b/ports/libodb-boost/CMakeLists.txt new file mode 100644 index 000000000..5dd0eb9b8 --- /dev/null +++ b/ports/libodb-boost/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb-boost VERSION 2.4.0 LANGUAGES CXX) +find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/boost/details/config.h COPYONLY) + +# FIXME: should we require boost? which packages? +# find_package(PostgreSQL REQUIRED) +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +add_library(libodb-boost ${libodb_src}) +target_include_directories(libodb-boost + PUBLIC + $ + $ + +) + +target_link_libraries(libodb-boost PRIVATE odb::libodb) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb-boost PRIVATE + -DLIBODB_BOOST_DYNAMIC_LIB) +else() + target_compile_definitions(libodb-boost PRIVATE + -DLIBODB_BOOST_STATIC_LIB) +endif() +install(TARGETS libodb-boost EXPORT odb_boostConfig + COMPONENT boost + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + COMPONENT sqlite + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" + PATTERN "*.options" +) +endif() +install(EXPORT odb_boostConfig NAMESPACE odb:: COMPONENT boost DESTINATION share/odb) +export(TARGETS libodb-boost NAMESPACE odb:: FILE odb_boostConfig.cmake) diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL new file mode 100644 index 000000000..5913d752b --- /dev/null +++ b/ports/libodb-boost/CONTROL @@ -0,0 +1,4 @@ +Source: libodb-boost +Version: 2.4.0-1 +Description: Description: Boost support for the ODB ORM library +Build-Depends: libodb diff --git a/ports/libodb-boost/config.unix.h.in b/ports/libodb-boost/config.unix.h.in new file mode 100644 index 000000000..b049efd09 --- /dev/null +++ b/ports/libodb-boost/config.unix.h.in @@ -0,0 +1,14 @@ +/* odb/boost/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/boost/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_BOOST_DETAILS_CONFIG_H +#define ODB_BOOST_DETAILS_CONFIG_H + +/* #undef LIBODB_BOOST_STATIC_LIB */ + +#endif /* ODB_BOOST_DETAILS_CONFIG_H */ diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake new file mode 100644 index 000000000..3f8dfc061 --- /dev/null +++ b/ports/libodb-boost/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-boost-2.4.0) +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-boost-2.4.0.tar.gz" + FILENAME "libodb-boost-2.4.0.tar.gz" + SHA512 af716b0385cf4ea18b20dcd5880c69c43cfc195eec4ff196a8e438833306489c39ab06a494e5d60cd08ba0d94caa05bd07e5f3fa836d835bad15c8a2ad7de306 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) +vcpkg_build_cmake() +vcpkg_install_cmake() + +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-boost) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-boost/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-boost/copyright) +vcpkg_copy_pdbs() diff --git a/ports/libodb-mysql/CMakeLists.txt b/ports/libodb-mysql/CMakeLists.txt index b578964b6..fe02585b1 100644 --- a/ports/libodb-mysql/CMakeLists.txt +++ b/ports/libodb-mysql/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.0) project(libodb-mysql VERSION 2.4.0 LANGUAGES CXX) find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/mysql/details/config.h COPYONLY) + INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src diff --git a/ports/libodb-mysql/config.unix.h.in b/ports/libodb-mysql/config.unix.h.in new file mode 100644 index 000000000..b1270e20e --- /dev/null +++ b/ports/libodb-mysql/config.unix.h.in @@ -0,0 +1,19 @@ +/* odb/mysql/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/mysql/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_MYSQL_DETAILS_CONFIG_H +#define ODB_MYSQL_DETAILS_CONFIG_H + +/* #undef LIBODB_MYSQL_STATIC_LIB */ + +/* #undef LIBODB_MYSQL_INCLUDE_SHORT */ +#define LIBODB_MYSQL_INCLUDE_LONG 1 + +/* #undef LIBODB_MYSQL_THR_KEY_VISIBLE */ + +#endif /* ODB_MYSQL_DETAILS_CONFIG_H */ diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index e6f1e2441..88684bd35 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -25,7 +25,11 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib") set(MYSQL_LIB_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib") @@ -48,4 +52,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_mysqlConfig-debug.cmake "${LIBO file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-mysql) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-mysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-mysql/copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/libodb-pgsql/CMakeLists.txt b/ports/libodb-pgsql/CMakeLists.txt index cb510e805..46137ab57 100644 --- a/ports/libodb-pgsql/CMakeLists.txt +++ b/ports/libodb-pgsql/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.0) project(libodb-pgsql VERSION 2.4.0 LANGUAGES CXX) find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) find_package(PostgreSQL REQUIRED) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/pgsql/details/config.h COPYONLY) + set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/ports/libodb-pgsql/config.unix.h.in b/ports/libodb-pgsql/config.unix.h.in new file mode 100644 index 000000000..cdced9eb0 --- /dev/null +++ b/ports/libodb-pgsql/config.unix.h.in @@ -0,0 +1,14 @@ +/* odb/pgsql/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/pgsql/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_PGSQL_DETAILS_CONFIG_H +#define ODB_PGSQL_DETAILS_CONFIG_H + +/* #undef LIBODB_PGSQL_STATIC_LIB */ + +#endif /* ODB_PGSQL_DETAILS_CONFIG_H */ diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake index 752f98b70..cef945c73 100644 --- a/ports/libodb-pgsql/portfile.cmake +++ b/ports/libodb-pgsql/portfile.cmake @@ -7,7 +7,11 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS_DEBUG diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt index bd1717899..99fb0c236 100644 --- a/ports/libodb-sqlite/CMakeLists.txt +++ b/ports/libodb-sqlite/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.0) project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX) find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) find_package(sqlite3 REQUIRED) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/sqlite/details/config.h COPYONLY) + set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/ports/libodb-sqlite/config.unix.h.in b/ports/libodb-sqlite/config.unix.h.in new file mode 100644 index 000000000..f5af346a1 --- /dev/null +++ b/ports/libodb-sqlite/config.unix.h.in @@ -0,0 +1,15 @@ +/* odb/sqlite/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/sqlite/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_SQLITE_DETAILS_CONFIG_H +#define ODB_SQLITE_DETAILS_CONFIG_H + +/* #undef LIBODB_SQLITE_STATIC_LIB */ +#define LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY 1 + +#endif /* ODB_SQLITE_DETAILS_CONFIG_H */ diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index a1228f4ed..143d32efb 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -15,7 +15,11 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS_DEBUG @@ -30,4 +34,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake "${LIB file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite/copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/libodb/CMakeLists.txt b/ports/libodb/CMakeLists.txt index b4aef5817..a49175a8a 100644 --- a/ports/libodb/CMakeLists.txt +++ b/ports/libodb/CMakeLists.txt @@ -1,13 +1,21 @@ cmake_minimum_required(VERSION 3.0) project(libodb VERSION 2.4.0 LANGUAGES CXX) set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/details/config.h COPYONLY) + file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cxx) -list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +if (WIN32) + list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +elseif (UNIX) + list(FILTER libodb_src EXCLUDE REGEX /win32/.*) +endif() + add_library(libodb ${libodb_src}) target_include_directories(libodb - PUBLIC + PUBLIC $ $ diff --git a/ports/libodb/config.unix.h.in b/ports/libodb/config.unix.h.in new file mode 100644 index 000000000..4df77c5c7 --- /dev/null +++ b/ports/libodb/config.unix.h.in @@ -0,0 +1,20 @@ +/* odb/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_DETAILS_CONFIG_H +#define ODB_DETAILS_CONFIG_H + +/* #undef ODB_THREADS_NONE */ +#define ODB_THREADS_POSIX 1 +/* #undef ODB_THREADS_WIN32 */ +#define ODB_THREADS_TLS_KEYWORD 1 +/* #undef ODB_THREADS_TLS_DECLSPEC */ + +/* #undef LIBODB_STATIC_LIB */ + +#endif /* ODB_DETAILS_CONFIG_H */ diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 01f326548..017979dc4 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -15,7 +15,11 @@ vcpkg_download_distfile(ARCHIVE SHA512 f1311458634695eb6ba307ebfd492e3b260e7beb06db1c5c46df58c339756be4006322cdc4e42d055bf5b2ad14ce4656ddcafcc4e16c282034db8a77d255c3eb ) vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS_DEBUG -- cgit v1.2.3 From c31e85586c8611bfc6d7d62ac3ce3aad60b8a656 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 1 Feb 2019 15:35:58 -0800 Subject: [azure-storage-cpp] Upgrade to 6.0.0 (#5287) --- ports/azure-storage-cpp/CONTROL | 2 +- ports/azure-storage-cpp/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL index d6e0080db..320ff71a6 100644 --- a/ports/azure-storage-cpp/CONTROL +++ b/ports/azure-storage-cpp/CONTROL @@ -1,5 +1,5 @@ Source: azure-storage-cpp -Version: 5.2.0 +Version: 6.0.0 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp) Description: Microsoft Azure Storage Client SDK for C++ A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/ diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index 97f27ccee..24d59281b 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-storage-cpp - REF v5.2.0 - SHA512 345ddfcececc7b38e65dff96c971eadc41ce7255131f1bc9995dd8fed0c69cc3b48c6838152e30c57014bf2017bde0c819a09b7d6b4abaa089a7ae023633262e + REF v6.0.0 + SHA512 e568c3c3fd10a688b4d2491987998b1e133e54853fbf94a238a0cc3955dfd4d68bedf79a0e30bb5f30e8dd3c2bf41999d7c8658571b7dca9a4058140258ca314 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch -- cgit v1.2.3 From 6cb714f850b93e3bc3cd30a40d832a5161dbd37a Mon Sep 17 00:00:00 2001 From: ncihnegn Date: Fri, 1 Feb 2019 18:32:57 -0800 Subject: [systemc] Add new port (Microsoft#5250) (#5252) * [systemc] Add new port (Microsoft#5250) * [systemc] Fix debug targets * [systemc] Use vcpkg_extract_source_archive_ex() * [systemc] Disable vcpkg_test_cmake() for now due to issues * [systemc] Fixup cmake targets --- ports/systemc/CONTROL | 3 +++ ports/systemc/install.patch | 23 +++++++++++++++++ ports/systemc/portfile.cmake | 41 ++++++++++++++++++++++++++++++ ports/systemc/tlm_correct_dependency.patch | 8 ++++++ 4 files changed, 75 insertions(+) create mode 100644 ports/systemc/CONTROL create mode 100644 ports/systemc/install.patch create mode 100644 ports/systemc/portfile.cmake create mode 100644 ports/systemc/tlm_correct_dependency.patch diff --git a/ports/systemc/CONTROL b/ports/systemc/CONTROL new file mode 100644 index 000000000..488a06338 --- /dev/null +++ b/ports/systemc/CONTROL @@ -0,0 +1,3 @@ +Source: systemc +Version: 2.3.3-2 +Description: A set of C++ classes and macros which provide an event-driven simulation kernel in C++ diff --git a/ports/systemc/install.patch b/ports/systemc/install.patch new file mode 100644 index 000000000..d335a8b18 --- /dev/null +++ b/ports/systemc/install.patch @@ -0,0 +1,23 @@ +--- CMakeLists.txt Sat Oct 13 00:19:07 2018 ++++ CMakeLists.txt.fixed Mon Jan 28 15:51:38 2019 +@@ -555,7 +555,7 @@ + endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + + # Set the installation paths for headers, libraries, and documentation. +-set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH ++set (CMAKE_INSTALL_DOCDIR "share/systemc" CACHE PATH + "Documentation installation directory") # otherwise mixed-case + if (INSTALL_TO_LIB_BUILD_TYPE_DIR) + # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants +@@ -589,9 +589,9 @@ + set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH + "CMake package configuration installation directory" FORCE) + else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) +- set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH ++ set (SystemCLanguage_INSTALL_CMAKEDIR share/SystemCLanguage CACHE PATH + "CMake package configuration installation directory for the SystemCLanguage package.") +- set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH ++ set (SystemCTLM_INSTALL_CMAKEDIR share/SystemCTLM CACHE PATH + "CMake package configuration installation directory for the SystemCTLM package.") + endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) + mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR) diff --git a/ports/systemc/portfile.cmake b/ports/systemc/portfile.cmake new file mode 100644 index 000000000..0165b8270 --- /dev/null +++ b/ports/systemc/portfile.cmake @@ -0,0 +1,41 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(SYSTEMC_VERSION 2.3.3) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.accellera.org/images/downloads/standards/systemc/systemc-${SYSTEMC_VERSION}.zip" + FILENAME "systemc-${SYSTEMC_VERSION}.zip" + SHA512 f4df172addf816a1928d411dcab42c1679dc4c9d772f406c10d798a2c174d89cdac7a83947fa8beea1e3aff93da522d2d2daf61a4841ec456af7b7446c5c4a14 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SYSTEMC_VERSION} + PATCHES + install.patch + tlm_correct_dependency.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_CXX_STANDARD=17 + -DDISABLE_COPYRIGHT_MESSAGE=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCLanguage TARGET_PATH share/SystemCLanguage) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCTLM TARGET_PATH share/SystemCTLM) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time) + +# Post-build test for cmake libraries (disabled for now due to issues with vcpkg_test_cmake) +#vcpkg_test_cmake(PACKAGE_NAME SystemCLanguage) +#vcpkg_test_cmake(PACKAGE_NAME SystemCTLM) diff --git a/ports/systemc/tlm_correct_dependency.patch b/ports/systemc/tlm_correct_dependency.patch new file mode 100644 index 000000000..56a4a466f --- /dev/null +++ b/ports/systemc/tlm_correct_dependency.patch @@ -0,0 +1,8 @@ +--- cmake\SystemCTLMConfig.cmake.in Sat Oct 13 00:19:07 2018 ++++ cmake\SystemCTLMConfig.cmake.in.fixed Mon Jan 28 15:23:44 2019 +@@ -2,4 +2,4 @@ + + # TLM is part of the SystemC language library. + include(CMakeFindDependencyMacro) +-find_dependency (SystemC @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT) ++find_dependency (SystemCLanguage @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT) -- cgit v1.2.3 From 86f15d6daf10a4f8ba9f30083955c0ee425c4384 Mon Sep 17 00:00:00 2001 From: pradeep Date: Sat, 2 Feb 2019 10:50:06 +0530 Subject: Port for arrayfire/forge rendering library (#5242) * Port for arrayfire/forge rendering library * [forge] Simplify portfile --- ports/forge/CONTROL | 4 ++ ports/forge/forge_targets_fix.patch | 115 ++++++++++++++++++++++++++++++++++++ ports/forge/portfile.cmake | 44 ++++++++++++++ ports/forge/static_build.patch | 39 ++++++++++++ 4 files changed, 202 insertions(+) create mode 100644 ports/forge/CONTROL create mode 100644 ports/forge/forge_targets_fix.patch create mode 100644 ports/forge/portfile.cmake create mode 100644 ports/forge/static_build.patch diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL new file mode 100644 index 000000000..391d6c8fe --- /dev/null +++ b/ports/forge/CONTROL @@ -0,0 +1,4 @@ +Source: forge +Version: 1.0.3-1 +Description: Helps with high performance visulizations involving OpenGL-CUDA/OpenCL interop. +Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows) diff --git a/ports/forge/forge_targets_fix.patch b/ports/forge/forge_targets_fix.patch new file mode 100644 index 000000000..f2d8371d2 --- /dev/null +++ b/ports/forge/forge_targets_fix.patch @@ -0,0 +1,115 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7236a6..b4b910a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,64 +110,63 @@ install(DIRECTORY include/ + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN ".gitignore" EXCLUDE) +-# The Forge version header is generated and thus need to be +-# included explicitly ++ + install(FILES ${Forge_BINARY_DIR}/include/fg/version.h + DESTINATION "${FG_INSTALL_INC_DIR}/fg/" + COMPONENT headers) + +-install(EXPORT ForgeTargets +- NAMESPACE Forge:: +- DESTINATION ${FG_INSTALL_CMAKE_DIR} +- COMPONENT forge) +- +-export(EXPORT ForgeTargets +- NAMESPACE Forge:: +- FILE cmake/ForgeTargets.cmake) ++# install the examples irrespective of the FG_BUILD_EXAMPLES value ++# only the examples source files are installed, so the installation of these ++# source files does not depend on FG_BUILD_EXAMPLES ++# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without ++# building the example executables ++install(DIRECTORY examples/ #NOTE The slash at the end is important ++ DESTINATION ${FG_INSTALL_EXAMPLE_DIR} ++ COMPONENT examples) + + include(CMakePackageConfigHelpers) + write_basic_package_version_file( +- "${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake" ++ "${Forge_BINARY_DIR}/ForgeConfigVersion.cmake" + COMPATIBILITY SameMajorVersion) + +-# This config file will be installed so we need to set the install_destination +-# path relative to the install path ++ ++# export install config file + set(INCLUDE_DIRS include) + set(CMAKE_DIR ${FG_INSTALL_CMAKE_DIR}) + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" +- "cmake/install/ForgeConfig.cmake" +- INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}" +- PATH_VARS INCLUDE_DIRS CMAKE_DIR) +- +-install(FILES ${Forge_BINARY_DIR}/cmake/install/ForgeConfig.cmake +- ${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake ++ "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" ++ "cmake_install/ForgeConfig.cmake" ++ INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}" ++ PATH_VARS INCLUDE_DIRS CMAKE_DIR ++) ++install(FILES ${Forge_BINARY_DIR}/cmake_install/ForgeConfig.cmake ++ ${Forge_BINARY_DIR}/ForgeConfigVersion.cmake + DESTINATION ${FG_INSTALL_CMAKE_DIR} +- COMPONENT cmake) ++ COMPONENT cmake ++) ++install(EXPORT ForgeTargets ++ NAMESPACE Forge:: ++ DESTINATION ${FG_INSTALL_CMAKE_DIR} ++ COMPONENT forge ++) + +-# Following file will be used to create the config file for the build directory. +-# These config files will be used by the examples to find the Forge +-# libraries ++ ++# export build tree targets config file + set(INCLUDE_DIRS "${Forge_SOURCE_DIR}/include" "${Forge_BINARY_DIR}/include") +-set(CMAKE_DIR "${Forge_BINARY_DIR}/cmake") ++set(CMAKE_DIR "${Forge_BINARY_DIR}") + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" +- "cmake/ForgeConfig.cmake" +- INSTALL_DESTINATION "${Forge_BINARY_DIR}/cmake" +- PATH_VARS INCLUDE_DIRS CMAKE_DIR +- INSTALL_PREFIX "${Forge_BINARY_DIR}") ++ "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" ++ "ForgeConfig.cmake" ++ INSTALL_DESTINATION "${Forge_BINARY_DIR}" ++ PATH_VARS INCLUDE_DIRS CMAKE_DIR ++ INSTALL_PREFIX "${Forge_BINARY_DIR}" ++) ++export(EXPORT ForgeTargets ++ NAMESPACE Forge:: ++ FILE ForgeTargets.cmake ++) ++#export(PACKAGE Forge) + +-#-------------------------------------------------------------------- +-# Install examples +-#-------------------------------------------------------------------- +-# install the examples irrespective of the FG_BUILD_EXAMPLES value +-# only the examples source files are installed, so the installation of these +-# source files does not depend on FG_BUILD_EXAMPLES +-# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without +-# building the example executables +-install(DIRECTORY examples/ #NOTE The slash at the end is important +- DESTINATION ${FG_INSTALL_EXAMPLE_DIR} +- COMPONENT examples) + + include(CPackConfig) + +@@ -177,4 +176,4 @@ conditional_directory(FG_BUILD_EXAMPLES examples) + mark_as_advanced( + pkgcfg_lib_FontConfigPkg_freetype + pkgcfg_lib_FontConfigPkg_fontconfig +- ) ++) diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake new file mode 100644 index 000000000..cd7c2ca54 --- /dev/null +++ b/ports/forge/portfile.cmake @@ -0,0 +1,44 @@ +include(vcpkg_common_functions) + +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + message(FATAL_ERROR "This port currently only supports x64 architecture") +endif() + +set(PATCHES forge_targets_fix.patch) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND PATCHES static_build.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arrayfire/forge + REF v1.0.3 + SHA512 e1a7688c1c3ab4659401463c5d025917b6e5766129446aefbebe0d580756cd2cc07256ddda9b20899690765220e5467b9209e00476c80ea6a51a1a0c0e9da616 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFG_BUILD_DOCS=OFF + -DFG_BUILD_EXAMPLES=OFF + -DFG_INSTALL_BIN_DIR=bin + -DFG_WITH_FREEIMAGE=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/bin/* ${CURRENT_PACKAGES_DIR}/debug/bin/*) +list(FILTER DLLS EXCLUDE REGEX "forge\\.dll\$") +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/examples + ${CURRENT_PACKAGES_DIR}/examples + ${DLLS} +) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright) diff --git a/ports/forge/static_build.patch b/ports/forge/static_build.patch new file mode 100644 index 000000000..387811ce1 --- /dev/null +++ b/ports/forge/static_build.patch @@ -0,0 +1,39 @@ +diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt +index 1aeec1e..52eff05 100755 +--- a/src/backend/opengl/CMakeLists.txt ++++ b/src/backend/opengl/CMakeLists.txt +@@ -142,7 +142,7 @@ install(TARGETS forge + INCLUDES DESTINATION ${FG_INSTALL_INC_DIR}) + + # install dependencies +-if (WIN32) ++if (WIN32 AND BUILD_SHARED_LIBS) + if (FG_WITH_FREEIMAGE AND NOT FG_USE_STATIC_FREEIMAGE) + install(FILES $ + DESTINATION ${FG_INSTALL_BIN_DIR} +diff --git a/src/backend/opengl/glfw/CMakeLists.txt b/src/backend/opengl/glfw/CMakeLists.txt +index caf4913..3c8d71c 100644 +--- a/src/backend/opengl/glfw/CMakeLists.txt ++++ b/src/backend/opengl/glfw/CMakeLists.txt +@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS) + install(TARGETS forge_wtk_interface EXPORT ForgeTargets) + endif () + +-if (WIN32) ++if (WIN32 AND BUILD_SHARED_LIBS) + install(FILES $ + DESTINATION ${FG_INSTALL_BIN_DIR} + COMPONENT dependencies) +diff --git a/src/backend/opengl/sdl/CMakeLists.txt b/src/backend/opengl/sdl/CMakeLists.txt +index d8cd312..d55f27d 100644 +--- a/src/backend/opengl/sdl/CMakeLists.txt ++++ b/src/backend/opengl/sdl/CMakeLists.txt +@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS) + install(TARGETS forge_wtk_interface EXPORT ForgeTargets) + endif () + +-if (WIN32) ++if (WIN32 AND BUILD_SHARED_LIBS) + install(FILES $ + DESTINATION ${FG_INSTALL_BIN_DIR} + COMPONENT dependencies) -- cgit v1.2.3 From 61e2cac730cc8b16c9373c6c463a335a21a1496a Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 1 Feb 2019 23:38:44 -0800 Subject: [vcpkg] improve port depend hash used in CI build also fixed a few unstable ports that somtimes fail in CI tests --- ports/jsoncpp/portfile.cmake | 1 + ports/ponder/portfile.cmake | 1 + ports/qt5-script/CONTROL | 1 + ports/tinyspline/cmake.patch | 45 +- ports/xtensor-blas/portfile.cmake | 1 + toolsrc/src/vcpkg/build.cpp | 1916 +++++++++++++++++++------------------ 6 files changed, 995 insertions(+), 970 deletions(-) diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index c29c869ed..f1badbd1e 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -18,6 +18,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=${JSONCPP_STATIC} -DBUILD_SHARED_LIBS:BOOL=${JSONCPP_DYNAMIC} diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake index b85378ce3..8543643b5 100644 --- a/ports/ponder/portfile.cmake +++ b/ports/ponder/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DUSES_RAPIDJSON=OFF -DUSES_RAPIDXML=OFF diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 02a9b88fb..5dd48bac3 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,3 +1,4 @@ Source: qt5-script Version: 5.12.0 +Build-Depends: qt5-base, qt5-modularscripts Description:Qt5 Script Module. diff --git a/ports/tinyspline/cmake.patch b/ports/tinyspline/cmake.patch index 2cb6a2602..593ed9012 100644 --- a/ports/tinyspline/cmake.patch +++ b/ports/tinyspline/cmake.patch @@ -1,29 +1,16 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 02dfb83..35e01f8 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -387,6 +387,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - # TINYSPLINE_LIBRARY_C_FLAGS - set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall") - set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX") -+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd4820") -+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd5045") -+ set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd4711") - - # TINYSPLINE_LIBRARY_CXX_FLAGS - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall") -@@ -395,6 +398,14 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4820") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5045") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4571") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4625") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4626") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5026") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5027") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4774") -+ set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4711") - - # TINYSPLINE_BINDING_CXX_FLAGS - set(TINYSPLINE_BINDING_CXX_FLAGS "${TINYSPLINE_BINDING_CXX_FLAGS} /w") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 02dfb83..030a0b5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -386,11 +386,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + + # TINYSPLINE_LIBRARY_C_FLAGS + set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall") +- set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX") + + # TINYSPLINE_LIBRARY_CXX_FLAGS + set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall") +- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX") + set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4514") + set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710") + set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350") diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake index ad5991af7..e9023ea15 100644 --- a/ports/xtensor-blas/portfile.cmake +++ b/ports/xtensor-blas/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS_RELEASE -DCXXBLAS_DEBUG=OFF OPTIONS_DEBUG -DCXXBLAS_DEBUG=ON OPTIONS diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 67d9b63ed..f39707065 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -1,941 +1,975 @@ -#include "pch.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using vcpkg::Build::BuildResult; -using vcpkg::Parse::ParseControlErrorInfo; -using vcpkg::Parse::ParseExpected; - -namespace vcpkg::Build::Command -{ - using Dependencies::InstallPlanAction; - using Dependencies::InstallPlanType; - - static constexpr StringLiteral OPTION_CHECKS_ONLY = "--checks-only"; - - void perform_and_exit_ex(const FullPackageSpec& full_spec, - const fs::path& port_dir, - const ParsedArguments& options, - const VcpkgPaths& paths) - { - const PackageSpec& spec = full_spec.package_spec; - if (Util::Sets::contains(options.switches, OPTION_CHECKS_ONLY)) - { - const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet()); - const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec)); - const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info); - Checks::check_exit(VCPKG_LINE_INFO, error_count == 0); - Checks::exit_success(VCPKG_LINE_INFO); - } - - const ParseExpected source_control_file = - Paragraphs::try_load_port(paths.get_filesystem(), port_dir); - - if (!source_control_file.has_value()) - { - print_error_message(source_control_file.error()); - Checks::exit_fail(VCPKG_LINE_INFO); - } - - const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO); - 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()); - - const StatusParagraphs status_db = database_load_check(paths); - const Build::BuildPackageOptions build_package_options{ - Build::UseHeadVersion::NO, - Build::AllowDownloads::YES, - Build::CleanBuildtrees::NO, - Build::CleanPackages::NO, - Build::DownloadTool::BUILT_IN, - GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO, - Build::FailOnTombstone::NO, - }; - - std::set features_as_set(full_spec.features.begin(), full_spec.features.end()); - features_as_set.emplace("core"); - - const Build::BuildPackageConfig build_config{ - *scf, spec.triplet(), fs::path{port_dir}, build_package_options, features_as_set}; - - const auto build_timer = Chrono::ElapsedTimer::create_started(); - const auto result = Build::build_package(paths, build_config, status_db); - System::println("Elapsed time for package %s: %s", spec.to_string(), build_timer.to_string()); - - if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES) - { - System::println(System::Color::error, - "The build command requires all dependencies to be already installed."); - System::println("The following dependencies are missing:"); - System::println(); - for (const auto& p : result.unmet_dependencies) - { - System::println(" %s", p); - } - System::println(); - Checks::exit_fail(VCPKG_LINE_INFO); - } - - Checks::check_exit(VCPKG_LINE_INFO, result.code != BuildResult::EXCLUDED); - - if (result.code != BuildResult::SUCCEEDED) - { - System::println(System::Color::error, Build::create_error_message(result.code, spec)); - System::println(Build::create_user_troubleshooting_message(spec)); - Checks::exit_fail(VCPKG_LINE_INFO); - } - - Checks::exit_success(VCPKG_LINE_INFO); - } - - static constexpr std::array BUILD_SWITCHES = {{ - {OPTION_CHECKS_ONLY, "Only run checks, do not rebuild package"}, - }}; - - const CommandStructure COMMAND_STRUCTURE = { - Help::create_example_string("build zlib:x64-windows"), - 1, - 1, - {BUILD_SWITCHES, {}}, - nullptr, - }; - - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) - { - // Build only takes a single package and all dependencies must already be installed - const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); - const std::string command_argument = args.command_arguments.at(0); - const FullPackageSpec spec = - Input::check_and_get_full_package_spec(command_argument, default_triplet, COMMAND_STRUCTURE.example_text); - Input::check_triplet(spec.package_spec.triplet(), paths); - if (!spec.features.empty() && !GlobalState::feature_packages) - { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag."); - } - perform_and_exit_ex(spec, paths.port_dir(spec.package_spec), options, paths); - } -} - -namespace vcpkg::Build -{ - static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage"; - static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs"; - static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT"; - static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder"; - static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt"; - - const std::string& to_string(BuildPolicy policy) - { - switch (policy) - { - case BuildPolicy::EMPTY_PACKAGE: return NAME_EMPTY_PACKAGE; - case BuildPolicy::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS; - case BuildPolicy::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT; - case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER; - case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT; - default: Checks::unreachable(VCPKG_LINE_INFO); - } - } - - CStringView to_cmake_variable(BuildPolicy policy) - { - switch (policy) - { - case BuildPolicy::EMPTY_PACKAGE: return "VCPKG_POLICY_EMPTY_PACKAGE"; - case BuildPolicy::DLLS_WITHOUT_LIBS: return "VCPKG_POLICY_DLLS_WITHOUT_LIBS"; - case BuildPolicy::ONLY_RELEASE_CRT: return "VCPKG_POLICY_ONLY_RELEASE_CRT"; - case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER"; - case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT"; - default: Checks::unreachable(VCPKG_LINE_INFO); - } - } - - static const std::string NAME_BUILD_IN_DOWNLOAD = "BUILT_IN"; - static const std::string NAME_ARIA2_DOWNLOAD = "ARIA2"; - - const std::string& to_string(DownloadTool tool) - { - switch (tool) - { - case DownloadTool::BUILT_IN: return NAME_BUILD_IN_DOWNLOAD; - case DownloadTool::ARIA2: return NAME_ARIA2_DOWNLOAD; - default: Checks::unreachable(VCPKG_LINE_INFO); - } - } - - Optional to_linkage_type(const std::string& str) - { - if (str == "dynamic") return LinkageType::DYNAMIC; - if (str == "static") return LinkageType::STATIC; - return nullopt; - } - - namespace BuildInfoRequiredField - { - static const std::string CRT_LINKAGE = "CRTLinkage"; - static const std::string LIBRARY_LINKAGE = "LibraryLinkage"; - } - - CStringView to_vcvarsall_target(const std::string& cmake_system_name) - { - if (cmake_system_name.empty()) return ""; - 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); - } - - 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( - 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(); - - for (auto&& host : host_architectures) - { - const auto it = Util::find_if(toolset.supported_architectures, [&](const ToolsetArchOption& opt) { - return host == opt.host_arch && target_arch == opt.target_arch; - }); - 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(); - })); - } - - std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) - { - if (pre_build_info.external_toolchain_file.has_value()) return ""; - if (!pre_build_info.cmake_system_name.empty() && pre_build_info.cmake_system_name != "WindowsStore") return ""; - - const char* tonull = " >nul"; - if (GlobalState::debugging) - { - tonull = ""; - } - - 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"("%s" %s %s %s %s 2>&1 create_binary_control_file(const SourceParagraph& source_paragraph, - const Triplet& triplet, - const BuildInfo& build_info, - const std::string& abi_tag) - { - auto bcf = std::make_unique(); - BinaryParagraph bpgh(source_paragraph, triplet, abi_tag); - if (const auto p_ver = build_info.version.get()) - { - bpgh.version = *p_ver; - } - bcf->core_paragraph = std::move(bpgh); - return bcf; - } - - static void write_binary_control_file(const VcpkgPaths& paths, BinaryControlFile bcf) - { - std::string start = Strings::serialize(bcf.core_paragraph); - for (auto&& feature : bcf.features) - { - start += "\n" + Strings::serialize(feature); - } - const fs::path binary_control_file = paths.packages / bcf.core_paragraph.dir() / "CONTROL"; - paths.get_filesystem().write_contents(binary_control_file, start); - } - - static std::vector compute_required_feature_specs(const BuildPackageConfig& config, - const StatusParagraphs& status_db) - { - const Triplet& triplet = config.triplet; - - const std::vector dep_strings = - Util::fmap_flatten(config.feature_list, [&](std::string const& feature) -> std::vector { - if (feature == "core") - { - return filter_dependencies(config.scf.core_paragraph->depends, triplet); - } - - auto maybe_feature = config.scf.find_feature(feature); - Checks::check_exit(VCPKG_LINE_INFO, maybe_feature.has_value()); - - return filter_dependencies(maybe_feature.get()->depends, triplet); - }); - - auto dep_fspecs = FeatureSpec::from_strings_and_triplet(dep_strings, triplet); - Util::sort_unique_erase(dep_fspecs); - - // expand defaults - std::vector ret; - for (auto&& fspec : dep_fspecs) - { - if (fspec.feature().empty()) - { - // reference to default features - const auto it = status_db.find_installed(fspec.spec()); - if (it == status_db.end()) - { - // not currently installed, so just leave the default reference so it will fail later - ret.push_back(fspec); - } - else - { - ret.emplace_back(fspec.spec(), "core"); - for (auto&& default_feature : it->get()->package.default_features) - ret.emplace_back(fspec.spec(), default_feature); - } - } - else - { - ret.push_back(fspec); - } - } - Util::sort_unique_erase(ret); - - return ret; - } - - static ExtendedBuildResult do_build_package(const VcpkgPaths& paths, - const PreBuildInfo& pre_build_info, - const PackageSpec& spec, - const std::string& abi_tag, - const BuildPackageConfig& config) - { - auto& fs = paths.get_filesystem(); - const Triplet& triplet = spec.triplet(); - -#if !defined(_WIN32) - // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107. - // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted. - vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA)); -#endif - - const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); - const fs::path& git_exe_path = paths.get_tool_exe(Tools::GIT); - - std::string all_features; - for (auto& feature : config.scf.feature_paragraphs) - { - all_features.append(feature->name + ";"); - } - - const Toolset& toolset = paths.get_toolset(pre_build_info); - const std::string cmd_launch_cmake = System::make_cmake_cmd( - cmake_exe_path, - paths.ports_cmake, - { - {"CMD", "BUILD"}, - {"PORT", config.scf.core_paragraph->name}, - {"CURRENT_PORT_DIR", config.port_dir}, - {"TARGET_TRIPLET", spec.triplet().canonical_name()}, - {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, - {"VCPKG_USE_HEAD_VERSION", - Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"}, - {"DOWNLOADS", paths.downloads}, - {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"}, - {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)}, - {"GIT", git_exe_path}, - {"FEATURES", Strings::join(";", config.feature_list)}, - {"ALL_FEATURES", all_features}, - }); - - auto command = make_build_env_cmd(pre_build_info, toolset); - if (!command.empty()) - { -#ifdef _WIN32 - command.append(" & "); -#else - command.append(" && "); -#endif - } - command.append(cmd_launch_cmake); - const auto timer = Chrono::ElapsedTimer::create_started(); - - const int return_code = System::cmd_execute_clean(command); - const auto buildtimeus = timer.microseconds(); - const auto spec_string = spec.to_string(); - - { - auto locked_metrics = Metrics::g_metrics.lock(); - locked_metrics->track_buildtime(spec.to_string() + ":[" + Strings::join(",", config.feature_list) + "]", - buildtimeus); - if (return_code != 0) - { - locked_metrics->track_property("error", "build failed"); - locked_metrics->track_property("build_error", spec_string); - return BuildResult::BUILD_FAILED; - } - } - - const BuildInfo build_info = read_build_info(fs, paths.build_info_file_path(spec)); - const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info); - - auto bcf = create_binary_control_file(*config.scf.core_paragraph, triplet, build_info, abi_tag); - - if (error_count != 0) - { - return BuildResult::POST_BUILD_CHECKS_FAILED; - } - for (auto&& feature : config.feature_list) - { - for (auto&& f_pgh : config.scf.feature_paragraphs) - { - if (f_pgh->name == feature) - bcf->features.push_back( - create_binary_feature_control_file(*config.scf.core_paragraph, *f_pgh, triplet)); - } - } - - write_binary_control_file(paths, *bcf); - return {BuildResult::SUCCEEDED, std::move(bcf)}; - } - - static ExtendedBuildResult do_build_package_and_clean_buildtrees(const VcpkgPaths& paths, - const PreBuildInfo& pre_build_info, - const PackageSpec& spec, - const std::string& abi_tag, - const BuildPackageConfig& config) - { - auto result = do_build_package(paths, pre_build_info, spec, abi_tag, config); - - if (config.build_package_options.clean_buildtrees == CleanBuildtrees::YES) - { - auto& fs = paths.get_filesystem(); - const fs::path buildtrees_dir = paths.buildtrees / config.scf.core_paragraph->name; - auto buildtree_files = fs.get_files_non_recursive(buildtrees_dir); - for (auto&& file : buildtree_files) - { - if (fs.is_directory(file)) // Will only keep the logs - { - std::error_code ec; - fs.remove_all(file, ec); - } - } - } - - return result; - } - - Optional compute_abi_tag(const VcpkgPaths& paths, - const BuildPackageConfig& config, - const PreBuildInfo& pre_build_info, - Span dependency_abis) - { - if (config.build_package_options.binary_caching == BinaryCaching::NO) return nullopt; - - auto& fs = paths.get_filesystem(); - const Triplet& triplet = config.triplet; - const std::string& name = config.scf.core_paragraph->name; - - std::vector abi_tag_entries(dependency_abis.begin(), dependency_abis.end()); - - abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)}); - - abi_tag_entries.emplace_back( - AbiEntry{"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")}); - abi_tag_entries.emplace_back( - AbiEntry{"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")}); - - abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"}); - - abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag}); - - const std::string features = Strings::join(";", config.feature_list); - abi_tag_entries.emplace_back(AbiEntry{"features", features}); - - if (config.build_package_options.use_head_version == UseHeadVersion::YES) - abi_tag_entries.emplace_back(AbiEntry{"head", ""}); - - Util::sort(abi_tag_entries); - - const std::string full_abi_info = - Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; }); - - if (GlobalState::debugging) - { - System::println("[DEBUG] "); - for (auto&& entry : abi_tag_entries) - { - System::println("[DEBUG] %s|%s", entry.key, entry.value); - } - System::println("[DEBUG] "); - } - - auto abi_tag_entries_missing = abi_tag_entries; - Util::erase_remove_if(abi_tag_entries_missing, [](const AbiEntry& p) { return !p.value.empty(); }); - - if (abi_tag_entries_missing.empty()) - { - std::error_code ec; - fs.create_directories(paths.buildtrees / name, ec); - const auto abi_file_path = paths.buildtrees / name / (triplet.canonical_name() + ".vcpkg_abi_info.txt"); - fs.write_contents(abi_file_path, full_abi_info); - - return AbiTagAndFile{Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path}; - } - - System::println( - "Warning: binary caching disabled because abi keys are missing values:\n%s", - Strings::join("", abi_tag_entries_missing, [](const AbiEntry& e) { return " " + e.key + "\n"; })); - - return nullopt; - } - - static void decompress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& archive_path) - { - auto& fs = paths.get_filesystem(); - - auto pkg_path = paths.package_dir(spec); - std::error_code ec; - fs.remove_all(pkg_path, 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", pkg_path.u8string()); - -#if defined(_WIN32) - auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - - System::cmd_execute_clean(Strings::format( - R"("%s" x "%s" -o"%s" -y >nul)", seven_zip_exe.u8string(), archive_path.u8string(), pkg_path.u8string())); -#else - System::cmd_execute_clean( - Strings::format(R"(unzip -qq "%s" "-d%s")", archive_path.u8string(), pkg_path.u8string())); -#endif - } - - static void compress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& tmp_archive_path) - { - auto& fs = paths.get_filesystem(); - - std::error_code ec; - - fs.remove(tmp_archive_path, ec); - Checks::check_exit( - VCPKG_LINE_INFO, !fs.exists(tmp_archive_path), "Could not remove file: %s", tmp_archive_path.u8string()); -#if defined(_WIN32) - auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); - - System::cmd_execute_clean(Strings::format(R"("%s" a "%s" "%s\*" >nul)", - seven_zip_exe.u8string(), - tmp_archive_path.u8string(), - paths.package_dir(spec).u8string())); -#else - System::cmd_execute_clean(Strings::format( - R"(cd '%s' && zip --quiet -r '%s' *)", paths.package_dir(spec).u8string(), tmp_archive_path.u8string())); -#endif - } - - ExtendedBuildResult build_package(const VcpkgPaths& paths, - const BuildPackageConfig& config, - const StatusParagraphs& status_db) - { - auto& fs = paths.get_filesystem(); - const Triplet& triplet = config.triplet; - const std::string& name = config.scf.core_paragraph->name; - - std::vector required_fspecs = compute_required_feature_specs(config, status_db); - - // extract out the actual package ids - auto dep_pspecs = Util::fmap(required_fspecs, [](FeatureSpec const& fspec) { return fspec.spec(); }); - Util::sort_unique_erase(dep_pspecs); - - // Find all features that aren't installed. This mutates required_fspecs. - Util::erase_remove_if(required_fspecs, [&](FeatureSpec const& fspec) { - return status_db.is_installed(fspec) || fspec.name() == name; - }); - - if (!required_fspecs.empty()) - { - return {BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES, std::move(required_fspecs)}; - } - - const PackageSpec spec = - PackageSpec::from_name_and_triplet(config.scf.core_paragraph->name, triplet).value_or_exit(VCPKG_LINE_INFO); - - std::vector dependency_abis; - - // dep_pspecs was not destroyed - for (auto&& pspec : dep_pspecs) - { - if (pspec == spec) continue; - const auto status_it = status_db.find_installed(pspec); - Checks::check_exit(VCPKG_LINE_INFO, status_it != status_db.end()); - dependency_abis.emplace_back( - AbiEntry{status_it->get()->package.spec.name(), status_it->get()->package.abi}); - } - - const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet); - - auto maybe_abi_tag_and_file = compute_abi_tag(paths, config, pre_build_info, dependency_abis); - - const auto abi_tag_and_file = maybe_abi_tag_and_file.get(); - - if (config.build_package_options.binary_caching == BinaryCaching::YES && abi_tag_and_file) - { - const fs::path archives_root_dir = paths.root / "archives"; - const std::string archive_name = abi_tag_and_file->tag + ".zip"; - const fs::path archive_subpath = fs::u8path(abi_tag_and_file->tag.substr(0, 2)) / archive_name; - const fs::path archive_path = archives_root_dir / archive_subpath; - const fs::path archive_tombstone_path = archives_root_dir / "fail" / archive_subpath; - - if (fs.exists(archive_path)) - { - System::println("Using cached binary package: %s", archive_path.u8string()); - - decompress_archive(paths, spec, archive_path); - - auto maybe_bcf = Paragraphs::try_load_cached_package(paths, spec); - std::unique_ptr bcf = - std::make_unique(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO)); - return {BuildResult::SUCCEEDED, std::move(bcf)}; - } - - if (fs.exists(archive_tombstone_path)) - { - if (config.build_package_options.fail_on_tombstone == FailOnTombstone::YES) - { - System::println("Found failure tombstone: %s", archive_tombstone_path.u8string()); - return BuildResult::BUILD_FAILED; - } - else - { - System::println( - System::Color::warning, "Found failure tombstone: %s", archive_tombstone_path.u8string()); - } - } - - System::println("Could not locate cached archive: %s", archive_path.u8string()); - - ExtendedBuildResult result = do_build_package_and_clean_buildtrees( - paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config); - - std::error_code ec; - fs.create_directories(paths.package_dir(spec) / "share" / spec.name(), ec); - auto abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt"; - fs.copy_file(abi_tag_and_file->tag_file, abi_file_in_package, fs::stdfs::copy_options::none, ec); - Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", abi_file_in_package.u8string()); - - if (result.code == BuildResult::SUCCEEDED) - { - const auto tmp_archive_path = paths.buildtrees / spec.name() / (spec.triplet().to_string() + ".zip"); - - compress_archive(paths, spec, tmp_archive_path); - - fs.create_directories(archive_path.parent_path(), ec); - fs.rename_or_copy(tmp_archive_path, archive_path, ".tmp", ec); - if (ec) - { - System::println(System::Color::warning, - "Failed to store binary cache %s: %s", - archive_path.u8string(), - ec.message()); - } - else - System::println("Stored binary cache: %s", archive_path.u8string()); - } - else if (result.code == BuildResult::BUILD_FAILED || result.code == BuildResult::POST_BUILD_CHECKS_FAILED) - { - // Build failed, so store tombstone archive - fs.create_directories(archive_tombstone_path.parent_path(), ec); - fs.write_contents(archive_tombstone_path, "", ec); - } - - return result; - } - - return do_build_package_and_clean_buildtrees( - paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config); - } - - const std::string& to_string(const BuildResult build_result) - { - static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string("vcpkg::Commands::Build::BuildResult"); - static const std::string SUCCEEDED_STRING = "SUCCEEDED"; - static const std::string BUILD_FAILED_STRING = "BUILD_FAILED"; - static const std::string FILE_CONFLICTS_STRING = "FILE_CONFLICTS"; - 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"; - - switch (build_result) - { - case BuildResult::NULLVALUE: return NULLVALUE_STRING; - case BuildResult::SUCCEEDED: return SUCCEEDED_STRING; - case BuildResult::BUILD_FAILED: return BUILD_FAILED_STRING; - case BuildResult::POST_BUILD_CHECKS_FAILED: return POST_BUILD_CHECKS_FAILED_STRING; - 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; - default: Checks::unreachable(VCPKG_LINE_INFO); - } - } - - std::string create_error_message(const BuildResult build_result, const PackageSpec& spec) - { - return Strings::format("Error: Building package %s failed with: %s", spec, Build::to_string(build_result)); - } - - std::string create_user_troubleshooting_message(const PackageSpec& spec) - { - return Strings::format("Please ensure you're using the latest portfiles with `.\\vcpkg update`, then\n" - "submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n" - " Package: %s\n" - " Vcpkg version: %s\n" - "\n" - "Additionally, attach any relevant sections from the log files above.", - spec, - Commands::Version::version()); - } - - static BuildInfo inner_create_buildinfo(std::unordered_map pgh) - { - Parse::ParagraphParser parser(std::move(pgh)); - - BuildInfo build_info; - - { - std::string crt_linkage_as_string; - parser.required_field(BuildInfoRequiredField::CRT_LINKAGE, crt_linkage_as_string); - - 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); - } - - { - std::string library_linkage_as_string; - 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); - - std::map policies; - for (auto policy : G_ALL_POLICIES) - { - const auto setting = parser.optional_field(to_string(policy)); - if (setting.empty()) continue; - if (setting == "enabled") - policies.emplace(policy, true); - else if (setting == "disabled") - policies.emplace(policy, false); - else - Checks::exit_with_message( - VCPKG_LINE_INFO, "Unknown setting for policy '%s': %s", to_string(policy), setting); - } - - if (const auto err = parser.error_info("PostBuildInformation")) - { - print_error_message(err); - Checks::exit_fail(VCPKG_LINE_INFO); - } - - build_info.policies = BuildPolicies(std::move(policies)); - - return build_info; - } - - BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath) - { - const Expected> pghs = - Paragraphs::get_single_paragraph(fs, filepath); - Checks::check_exit(VCPKG_LINE_INFO, pghs.get() != nullptr, "Invalid BUILD_INFO file for package"); - return inner_create_buildinfo(*pghs.get()); - } - - PreBuildInfo PreBuildInfo::from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet) - { - static constexpr CStringView FLAG_GUID = "c35112b6-d1ba-415b-aa5d-81de856ef8eb"; - - const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); - const fs::path ports_cmake_script_path = paths.scripts / "get_triplet_environment.cmake"; - const fs::path triplet_file_path = paths.triplets / (triplet.canonical_name() + ".cmake"); - - const auto cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path, - ports_cmake_script_path, - { - {"CMAKE_TRIPLET_FILE", triplet_file_path}, - }); - const auto ec_data = System::cmd_execute_and_capture_output(cmd_launch_cmake); - Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, ec_data.output); - - const std::vector lines = Strings::split(ec_data.output, "\n"); - - PreBuildInfo pre_build_info; - - const auto e = lines.cend(); - auto cur = std::find(lines.cbegin(), e, FLAG_GUID); - if (cur != e) ++cur; - - for (; cur != e; ++cur) - { - auto&& line = *cur; - - const std::vector s = Strings::split(line, "="); - Checks::check_exit(VCPKG_LINE_INFO, - s.size() == 1 || s.size() == 2, - "Expected format is [VARIABLE_NAME=VARIABLE_VALUE], but was [%s]", - line); - - const bool variable_with_no_value = s.size() == 1; - const std::string variable_name = s.at(0); - const std::string variable_value = variable_with_no_value ? "" : s.at(1); - - if (variable_name == "VCPKG_TARGET_ARCHITECTURE") - { - pre_build_info.target_architecture = variable_value; - continue; - } - - if (variable_name == "VCPKG_CMAKE_SYSTEM_NAME") - { - pre_build_info.cmake_system_name = variable_value; - continue; - } - - if (variable_name == "VCPKG_CMAKE_SYSTEM_VERSION") - { - pre_build_info.cmake_system_version = variable_value; - continue; - } - - if (variable_name == "VCPKG_PLATFORM_TOOLSET") - { - pre_build_info.platform_toolset = - variable_value.empty() ? nullopt : Optional{variable_value}; - continue; - } - - if (variable_name == "VCPKG_VISUAL_STUDIO_PATH") - { - pre_build_info.visual_studio_path = - variable_value.empty() ? nullopt : Optional{variable_value}; - continue; - } - - if (variable_name == "VCPKG_CHAINLOAD_TOOLCHAIN_FILE") - { - pre_build_info.external_toolchain_file = - variable_value.empty() ? nullopt : Optional{variable_value}; - continue; - } - - if (variable_name == "VCPKG_BUILD_TYPE") - { - if (variable_value.empty()) - pre_build_info.build_type = nullopt; - else if (Strings::case_insensitive_ascii_equals(variable_value, "debug")) - pre_build_info.build_type = ConfigurationType::DEBUG; - else if (Strings::case_insensitive_ascii_equals(variable_value, "release")) - pre_build_info.build_type = ConfigurationType::RELEASE; - else - Checks::exit_with_message( - VCPKG_LINE_INFO, "Unknown setting for VCPKG_BUILD_TYPE: %s", variable_value); - continue; - } - - Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown variable name %s", line); - } - - pre_build_info.triplet_abi_tag = [&]() { - const auto& fs = paths.get_filesystem(); - static std::map s_hash_cache; - - auto it_hash = s_hash_cache.find(triplet_file_path); - if (it_hash != s_hash_cache.end()) - { - return it_hash->second; - } - auto hash = Hash::get_file_hash(fs, triplet_file_path, "SHA1"); - - if (auto p = pre_build_info.external_toolchain_file.get()) - { - hash += "-"; - hash += Hash::get_file_hash(fs, *p, "SHA1"); - } - else if (pre_build_info.cmake_system_name == "Linux") - { - hash += "-"; - hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "linux.cmake", "SHA1"); - } - else if (pre_build_info.cmake_system_name == "Darwin") - { - hash += "-"; - hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "osx.cmake", "SHA1"); - } - else if (pre_build_info.cmake_system_name == "FreeBSD") - { - hash += "-"; - hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "freebsd.cmake", "SHA1"); - } - else if (pre_build_info.cmake_system_name == "Android") - { - hash += "-"; - hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "android.cmake", "SHA1"); - } - - s_hash_cache.emplace(triplet_file_path, hash); - return hash; - }(); - - return pre_build_info; - } - ExtendedBuildResult::ExtendedBuildResult(BuildResult code) : code(code) {} - ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::unique_ptr&& bcf) - : code(code), binary_control_file(std::move(bcf)) - { - } - ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::vector&& unmet_deps) - : code(code), unmet_dependencies(std::move(unmet_deps)) - { - } -} +#include "pch.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using vcpkg::Build::BuildResult; +using vcpkg::Parse::ParseControlErrorInfo; +using vcpkg::Parse::ParseExpected; + +namespace vcpkg::Build::Command +{ + using Dependencies::InstallPlanAction; + using Dependencies::InstallPlanType; + + static constexpr StringLiteral OPTION_CHECKS_ONLY = "--checks-only"; + + void perform_and_exit_ex(const FullPackageSpec& full_spec, + const fs::path& port_dir, + const ParsedArguments& options, + const VcpkgPaths& paths) + { + const PackageSpec& spec = full_spec.package_spec; + if (Util::Sets::contains(options.switches, OPTION_CHECKS_ONLY)) + { + const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet()); + const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec)); + const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info); + Checks::check_exit(VCPKG_LINE_INFO, error_count == 0); + Checks::exit_success(VCPKG_LINE_INFO); + } + + const ParseExpected source_control_file = + Paragraphs::try_load_port(paths.get_filesystem(), port_dir); + + if (!source_control_file.has_value()) + { + print_error_message(source_control_file.error()); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO); + 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()); + + const StatusParagraphs status_db = database_load_check(paths); + const Build::BuildPackageOptions build_package_options{ + Build::UseHeadVersion::NO, + Build::AllowDownloads::YES, + Build::CleanBuildtrees::NO, + Build::CleanPackages::NO, + Build::DownloadTool::BUILT_IN, + GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO, + Build::FailOnTombstone::NO, + }; + + std::set features_as_set(full_spec.features.begin(), full_spec.features.end()); + features_as_set.emplace("core"); + + const Build::BuildPackageConfig build_config{ + *scf, spec.triplet(), fs::path{port_dir}, build_package_options, features_as_set}; + + const auto build_timer = Chrono::ElapsedTimer::create_started(); + const auto result = Build::build_package(paths, build_config, status_db); + System::println("Elapsed time for package %s: %s", spec.to_string(), build_timer.to_string()); + + if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES) + { + System::println(System::Color::error, + "The build command requires all dependencies to be already installed."); + System::println("The following dependencies are missing:"); + System::println(); + for (const auto& p : result.unmet_dependencies) + { + System::println(" %s", p); + } + System::println(); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + Checks::check_exit(VCPKG_LINE_INFO, result.code != BuildResult::EXCLUDED); + + if (result.code != BuildResult::SUCCEEDED) + { + System::println(System::Color::error, Build::create_error_message(result.code, spec)); + System::println(Build::create_user_troubleshooting_message(spec)); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + Checks::exit_success(VCPKG_LINE_INFO); + } + + static constexpr std::array BUILD_SWITCHES = {{ + {OPTION_CHECKS_ONLY, "Only run checks, do not rebuild package"}, + }}; + + const CommandStructure COMMAND_STRUCTURE = { + Help::create_example_string("build zlib:x64-windows"), + 1, + 1, + {BUILD_SWITCHES, {}}, + nullptr, + }; + + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) + { + // Build only takes a single package and all dependencies must already be installed + const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); + const std::string command_argument = args.command_arguments.at(0); + const FullPackageSpec spec = + Input::check_and_get_full_package_spec(command_argument, default_triplet, COMMAND_STRUCTURE.example_text); + Input::check_triplet(spec.package_spec.triplet(), paths); + if (!spec.features.empty() && !GlobalState::feature_packages) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag."); + } + perform_and_exit_ex(spec, paths.port_dir(spec.package_spec), options, paths); + } +} + +namespace vcpkg::Build +{ + static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage"; + static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs"; + static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT"; + static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder"; + static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt"; + + const std::string& to_string(BuildPolicy policy) + { + switch (policy) + { + case BuildPolicy::EMPTY_PACKAGE: return NAME_EMPTY_PACKAGE; + case BuildPolicy::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS; + case BuildPolicy::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT; + case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER; + case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + } + + CStringView to_cmake_variable(BuildPolicy policy) + { + switch (policy) + { + case BuildPolicy::EMPTY_PACKAGE: return "VCPKG_POLICY_EMPTY_PACKAGE"; + case BuildPolicy::DLLS_WITHOUT_LIBS: return "VCPKG_POLICY_DLLS_WITHOUT_LIBS"; + case BuildPolicy::ONLY_RELEASE_CRT: return "VCPKG_POLICY_ONLY_RELEASE_CRT"; + case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER"; + case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT"; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + } + + static const std::string NAME_BUILD_IN_DOWNLOAD = "BUILT_IN"; + static const std::string NAME_ARIA2_DOWNLOAD = "ARIA2"; + + const std::string& to_string(DownloadTool tool) + { + switch (tool) + { + case DownloadTool::BUILT_IN: return NAME_BUILD_IN_DOWNLOAD; + case DownloadTool::ARIA2: return NAME_ARIA2_DOWNLOAD; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + } + + Optional to_linkage_type(const std::string& str) + { + if (str == "dynamic") return LinkageType::DYNAMIC; + if (str == "static") return LinkageType::STATIC; + return nullopt; + } + + namespace BuildInfoRequiredField + { + static const std::string CRT_LINKAGE = "CRTLinkage"; + static const std::string LIBRARY_LINKAGE = "LibraryLinkage"; + } + + CStringView to_vcvarsall_target(const std::string& cmake_system_name) + { + if (cmake_system_name.empty()) return ""; + 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); + } + + 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( + 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(); + + for (auto&& host : host_architectures) + { + const auto it = Util::find_if(toolset.supported_architectures, [&](const ToolsetArchOption& opt) { + return host == opt.host_arch && target_arch == opt.target_arch; + }); + 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(); + })); + } + + std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) + { + if (pre_build_info.external_toolchain_file.has_value()) return ""; + if (!pre_build_info.cmake_system_name.empty() && pre_build_info.cmake_system_name != "WindowsStore") return ""; + + const char* tonull = " >nul"; + if (GlobalState::debugging) + { + tonull = ""; + } + + 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"("%s" %s %s %s %s 2>&1 create_binary_control_file(const SourceParagraph& source_paragraph, + const Triplet& triplet, + const BuildInfo& build_info, + const std::string& abi_tag) + { + auto bcf = std::make_unique(); + BinaryParagraph bpgh(source_paragraph, triplet, abi_tag); + if (const auto p_ver = build_info.version.get()) + { + bpgh.version = *p_ver; + } + bcf->core_paragraph = std::move(bpgh); + return bcf; + } + + static void write_binary_control_file(const VcpkgPaths& paths, BinaryControlFile bcf) + { + std::string start = Strings::serialize(bcf.core_paragraph); + for (auto&& feature : bcf.features) + { + start += "\n" + Strings::serialize(feature); + } + const fs::path binary_control_file = paths.packages / bcf.core_paragraph.dir() / "CONTROL"; + paths.get_filesystem().write_contents(binary_control_file, start); + } + + static std::vector compute_required_feature_specs(const BuildPackageConfig& config, + const StatusParagraphs& status_db) + { + const Triplet& triplet = config.triplet; + + const std::vector dep_strings = + Util::fmap_flatten(config.feature_list, [&](std::string const& feature) -> std::vector { + if (feature == "core") + { + return filter_dependencies(config.scf.core_paragraph->depends, triplet); + } + + auto maybe_feature = config.scf.find_feature(feature); + Checks::check_exit(VCPKG_LINE_INFO, maybe_feature.has_value()); + + return filter_dependencies(maybe_feature.get()->depends, triplet); + }); + + auto dep_fspecs = FeatureSpec::from_strings_and_triplet(dep_strings, triplet); + Util::sort_unique_erase(dep_fspecs); + + // expand defaults + std::vector ret; + for (auto&& fspec : dep_fspecs) + { + if (fspec.feature().empty()) + { + // reference to default features + const auto it = status_db.find_installed(fspec.spec()); + if (it == status_db.end()) + { + // not currently installed, so just leave the default reference so it will fail later + ret.push_back(fspec); + } + else + { + ret.emplace_back(fspec.spec(), "core"); + for (auto&& default_feature : it->get()->package.default_features) + ret.emplace_back(fspec.spec(), default_feature); + } + } + else + { + ret.push_back(fspec); + } + } + Util::sort_unique_erase(ret); + + return ret; + } + + static ExtendedBuildResult do_build_package(const VcpkgPaths& paths, + const PreBuildInfo& pre_build_info, + const PackageSpec& spec, + const std::string& abi_tag, + const BuildPackageConfig& config) + { + auto& fs = paths.get_filesystem(); + const Triplet& triplet = spec.triplet(); + +#if !defined(_WIN32) + // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107. + // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted. + vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA)); +#endif + + const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); + const fs::path& git_exe_path = paths.get_tool_exe(Tools::GIT); + + std::string all_features; + for (auto& feature : config.scf.feature_paragraphs) + { + all_features.append(feature->name + ";"); + } + + const Toolset& toolset = paths.get_toolset(pre_build_info); + const std::string cmd_launch_cmake = System::make_cmake_cmd( + cmake_exe_path, + paths.ports_cmake, + { + {"CMD", "BUILD"}, + {"PORT", config.scf.core_paragraph->name}, + {"CURRENT_PORT_DIR", config.port_dir}, + {"TARGET_TRIPLET", spec.triplet().canonical_name()}, + {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, + {"VCPKG_USE_HEAD_VERSION", + Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"}, + {"DOWNLOADS", paths.downloads}, + {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"}, + {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)}, + {"GIT", git_exe_path}, + {"FEATURES", Strings::join(";", config.feature_list)}, + {"ALL_FEATURES", all_features}, + }); + + auto command = make_build_env_cmd(pre_build_info, toolset); + if (!command.empty()) + { +#ifdef _WIN32 + command.append(" & "); +#else + command.append(" && "); +#endif + } + command.append(cmd_launch_cmake); + const auto timer = Chrono::ElapsedTimer::create_started(); + + const int return_code = System::cmd_execute_clean(command); + const auto buildtimeus = timer.microseconds(); + const auto spec_string = spec.to_string(); + + { + auto locked_metrics = Metrics::g_metrics.lock(); + locked_metrics->track_buildtime(spec.to_string() + ":[" + Strings::join(",", config.feature_list) + "]", + buildtimeus); + if (return_code != 0) + { + locked_metrics->track_property("error", "build failed"); + locked_metrics->track_property("build_error", spec_string); + return BuildResult::BUILD_FAILED; + } + } + + const BuildInfo build_info = read_build_info(fs, paths.build_info_file_path(spec)); + const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info); + + auto bcf = create_binary_control_file(*config.scf.core_paragraph, triplet, build_info, abi_tag); + + if (error_count != 0) + { + return BuildResult::POST_BUILD_CHECKS_FAILED; + } + for (auto&& feature : config.feature_list) + { + for (auto&& f_pgh : config.scf.feature_paragraphs) + { + if (f_pgh->name == feature) + bcf->features.push_back( + create_binary_feature_control_file(*config.scf.core_paragraph, *f_pgh, triplet)); + } + } + + write_binary_control_file(paths, *bcf); + return {BuildResult::SUCCEEDED, std::move(bcf)}; + } + + static ExtendedBuildResult do_build_package_and_clean_buildtrees(const VcpkgPaths& paths, + const PreBuildInfo& pre_build_info, + const PackageSpec& spec, + const std::string& abi_tag, + const BuildPackageConfig& config) + { + auto result = do_build_package(paths, pre_build_info, spec, abi_tag, config); + + if (config.build_package_options.clean_buildtrees == CleanBuildtrees::YES) + { + auto& fs = paths.get_filesystem(); + const fs::path buildtrees_dir = paths.buildtrees / config.scf.core_paragraph->name; + auto buildtree_files = fs.get_files_non_recursive(buildtrees_dir); + for (auto&& file : buildtree_files) + { + if (fs.is_directory(file)) // Will only keep the logs + { + std::error_code ec; + fs.remove_all(file, ec); + } + } + } + + return result; + } + + Optional compute_abi_tag(const VcpkgPaths& paths, + const BuildPackageConfig& config, + const PreBuildInfo& pre_build_info, + Span dependency_abis) + { + if (config.build_package_options.binary_caching == BinaryCaching::NO) return nullopt; + + auto& fs = paths.get_filesystem(); + const Triplet& triplet = config.triplet; + const std::string& name = config.scf.core_paragraph->name; + + std::vector abi_tag_entries(dependency_abis.begin(), dependency_abis.end()); + + abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)}); + + // If there is an unusually large number of files in the port then + // something suspicious is going on. Rather than hash all of them + // just mark the port as no-hash + const int max_port_file_count = 100; + + // the order of recursive_directory_iterator is undefined so save the names to sort + std::vector port_files; + for (auto &port_file : fs::stdfs::recursive_directory_iterator(config.port_dir)) + { + if (fs::is_regular_file(status(port_file))) + { + port_files.push_back(port_file); + if (port_files.size() > max_port_file_count) + { + abi_tag_entries.emplace_back(AbiEntry{ "no_hash_max_portfile", "" }); + break; + } + } + } + + if (port_files.size() <= max_port_file_count) + { + std::sort(port_files.begin(), port_files.end()); + + int counter = 0; + for (auto & port_file : port_files) + { + // When vcpkg takes a dependency on C++17 it can use fs::relative, + // which will give a stable ordering and better names in the key entry. + // this is not available in the filesystem TS so instead number the files for the key. + std::string key = Strings::format("file_%03d", counter++); + if (GlobalState::debugging) + { + System::println("[DEBUG] mapping %s from %s", key, port_file.string()); + } + abi_tag_entries.emplace_back(AbiEntry{ key, vcpkg::Hash::get_file_hash(fs, port_file, "SHA1") }); + } + } + + abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"}); + + abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag}); + + const std::string features = Strings::join(";", config.feature_list); + abi_tag_entries.emplace_back(AbiEntry{"features", features}); + + if (config.build_package_options.use_head_version == UseHeadVersion::YES) + abi_tag_entries.emplace_back(AbiEntry{"head", ""}); + + Util::sort(abi_tag_entries); + + const std::string full_abi_info = + Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; }); + + if (GlobalState::debugging) + { + System::println("[DEBUG] "); + for (auto&& entry : abi_tag_entries) + { + System::println("[DEBUG] %s|%s", entry.key, entry.value); + } + System::println("[DEBUG] "); + } + + auto abi_tag_entries_missing = abi_tag_entries; + Util::erase_remove_if(abi_tag_entries_missing, [](const AbiEntry& p) { return !p.value.empty(); }); + + if (abi_tag_entries_missing.empty()) + { + std::error_code ec; + fs.create_directories(paths.buildtrees / name, ec); + const auto abi_file_path = paths.buildtrees / name / (triplet.canonical_name() + ".vcpkg_abi_info.txt"); + fs.write_contents(abi_file_path, full_abi_info); + + return AbiTagAndFile{Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path}; + } + + System::println( + "Warning: binary caching disabled because abi keys are missing values:\n%s", + Strings::join("", abi_tag_entries_missing, [](const AbiEntry& e) { return " " + e.key + "\n"; })); + + return nullopt; + } + + static void decompress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& archive_path) + { + auto& fs = paths.get_filesystem(); + + auto pkg_path = paths.package_dir(spec); + std::error_code ec; + fs.remove_all(pkg_path, 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", pkg_path.u8string()); + +#if defined(_WIN32) + auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); + + System::cmd_execute_clean(Strings::format( + R"("%s" x "%s" -o"%s" -y >nul)", seven_zip_exe.u8string(), archive_path.u8string(), pkg_path.u8string())); +#else + System::cmd_execute_clean( + Strings::format(R"(unzip -qq "%s" "-d%s")", archive_path.u8string(), pkg_path.u8string())); +#endif + } + + static void compress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& tmp_archive_path) + { + auto& fs = paths.get_filesystem(); + + std::error_code ec; + + fs.remove(tmp_archive_path, ec); + Checks::check_exit( + VCPKG_LINE_INFO, !fs.exists(tmp_archive_path), "Could not remove file: %s", tmp_archive_path.u8string()); +#if defined(_WIN32) + auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); + + System::cmd_execute_clean(Strings::format(R"("%s" a "%s" "%s\*" >nul)", + seven_zip_exe.u8string(), + tmp_archive_path.u8string(), + paths.package_dir(spec).u8string())); +#else + System::cmd_execute_clean(Strings::format( + R"(cd '%s' && zip --quiet -r '%s' *)", paths.package_dir(spec).u8string(), tmp_archive_path.u8string())); +#endif + } + + ExtendedBuildResult build_package(const VcpkgPaths& paths, + const BuildPackageConfig& config, + const StatusParagraphs& status_db) + { + auto& fs = paths.get_filesystem(); + const Triplet& triplet = config.triplet; + const std::string& name = config.scf.core_paragraph->name; + + std::vector required_fspecs = compute_required_feature_specs(config, status_db); + + // extract out the actual package ids + auto dep_pspecs = Util::fmap(required_fspecs, [](FeatureSpec const& fspec) { return fspec.spec(); }); + Util::sort_unique_erase(dep_pspecs); + + // Find all features that aren't installed. This mutates required_fspecs. + Util::erase_remove_if(required_fspecs, [&](FeatureSpec const& fspec) { + return status_db.is_installed(fspec) || fspec.name() == name; + }); + + if (!required_fspecs.empty()) + { + return {BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES, std::move(required_fspecs)}; + } + + const PackageSpec spec = + PackageSpec::from_name_and_triplet(config.scf.core_paragraph->name, triplet).value_or_exit(VCPKG_LINE_INFO); + + std::vector dependency_abis; + + // dep_pspecs was not destroyed + for (auto&& pspec : dep_pspecs) + { + if (pspec == spec) continue; + const auto status_it = status_db.find_installed(pspec); + Checks::check_exit(VCPKG_LINE_INFO, status_it != status_db.end()); + dependency_abis.emplace_back( + AbiEntry{status_it->get()->package.spec.name(), status_it->get()->package.abi}); + } + + const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet); + + auto maybe_abi_tag_and_file = compute_abi_tag(paths, config, pre_build_info, dependency_abis); + + const auto abi_tag_and_file = maybe_abi_tag_and_file.get(); + + if (config.build_package_options.binary_caching == BinaryCaching::YES && abi_tag_and_file) + { + const fs::path archives_root_dir = paths.root / "archives"; + const std::string archive_name = abi_tag_and_file->tag + ".zip"; + const fs::path archive_subpath = fs::u8path(abi_tag_and_file->tag.substr(0, 2)) / archive_name; + const fs::path archive_path = archives_root_dir / archive_subpath; + const fs::path archive_tombstone_path = archives_root_dir / "fail" / archive_subpath; + + if (fs.exists(archive_path)) + { + System::println("Using cached binary package: %s", archive_path.u8string()); + + decompress_archive(paths, spec, archive_path); + + auto maybe_bcf = Paragraphs::try_load_cached_package(paths, spec); + std::unique_ptr bcf = + std::make_unique(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO)); + return {BuildResult::SUCCEEDED, std::move(bcf)}; + } + + if (fs.exists(archive_tombstone_path)) + { + if (config.build_package_options.fail_on_tombstone == FailOnTombstone::YES) + { + System::println("Found failure tombstone: %s", archive_tombstone_path.u8string()); + return BuildResult::BUILD_FAILED; + } + else + { + System::println( + System::Color::warning, "Found failure tombstone: %s", archive_tombstone_path.u8string()); + } + } + + System::println("Could not locate cached archive: %s", archive_path.u8string()); + + ExtendedBuildResult result = do_build_package_and_clean_buildtrees( + paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config); + + std::error_code ec; + fs.create_directories(paths.package_dir(spec) / "share" / spec.name(), ec); + auto abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt"; + fs.copy_file(abi_tag_and_file->tag_file, abi_file_in_package, fs::stdfs::copy_options::none, ec); + Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", abi_file_in_package.u8string()); + + if (result.code == BuildResult::SUCCEEDED) + { + const auto tmp_archive_path = paths.buildtrees / spec.name() / (spec.triplet().to_string() + ".zip"); + + compress_archive(paths, spec, tmp_archive_path); + + fs.create_directories(archive_path.parent_path(), ec); + fs.rename_or_copy(tmp_archive_path, archive_path, ".tmp", ec); + if (ec) + { + System::println(System::Color::warning, + "Failed to store binary cache %s: %s", + archive_path.u8string(), + ec.message()); + } + else + System::println("Stored binary cache: %s", archive_path.u8string()); + } + else if (result.code == BuildResult::BUILD_FAILED || result.code == BuildResult::POST_BUILD_CHECKS_FAILED) + { + // Build failed, so store tombstone archive + fs.create_directories(archive_tombstone_path.parent_path(), ec); + fs.write_contents(archive_tombstone_path, "", ec); + } + + return result; + } + + return do_build_package_and_clean_buildtrees( + paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config); + } + + const std::string& to_string(const BuildResult build_result) + { + static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string("vcpkg::Commands::Build::BuildResult"); + static const std::string SUCCEEDED_STRING = "SUCCEEDED"; + static const std::string BUILD_FAILED_STRING = "BUILD_FAILED"; + static const std::string FILE_CONFLICTS_STRING = "FILE_CONFLICTS"; + 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"; + + switch (build_result) + { + case BuildResult::NULLVALUE: return NULLVALUE_STRING; + case BuildResult::SUCCEEDED: return SUCCEEDED_STRING; + case BuildResult::BUILD_FAILED: return BUILD_FAILED_STRING; + case BuildResult::POST_BUILD_CHECKS_FAILED: return POST_BUILD_CHECKS_FAILED_STRING; + 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; + default: Checks::unreachable(VCPKG_LINE_INFO); + } + } + + std::string create_error_message(const BuildResult build_result, const PackageSpec& spec) + { + return Strings::format("Error: Building package %s failed with: %s", spec, Build::to_string(build_result)); + } + + std::string create_user_troubleshooting_message(const PackageSpec& spec) + { + return Strings::format("Please ensure you're using the latest portfiles with `.\\vcpkg update`, then\n" + "submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n" + " Package: %s\n" + " Vcpkg version: %s\n" + "\n" + "Additionally, attach any relevant sections from the log files above.", + spec, + Commands::Version::version()); + } + + static BuildInfo inner_create_buildinfo(std::unordered_map pgh) + { + Parse::ParagraphParser parser(std::move(pgh)); + + BuildInfo build_info; + + { + std::string crt_linkage_as_string; + parser.required_field(BuildInfoRequiredField::CRT_LINKAGE, crt_linkage_as_string); + + 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); + } + + { + std::string library_linkage_as_string; + 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); + + std::map policies; + for (auto policy : G_ALL_POLICIES) + { + const auto setting = parser.optional_field(to_string(policy)); + if (setting.empty()) continue; + if (setting == "enabled") + policies.emplace(policy, true); + else if (setting == "disabled") + policies.emplace(policy, false); + else + Checks::exit_with_message( + VCPKG_LINE_INFO, "Unknown setting for policy '%s': %s", to_string(policy), setting); + } + + if (const auto err = parser.error_info("PostBuildInformation")) + { + print_error_message(err); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + build_info.policies = BuildPolicies(std::move(policies)); + + return build_info; + } + + BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath) + { + const Expected> pghs = + Paragraphs::get_single_paragraph(fs, filepath); + Checks::check_exit(VCPKG_LINE_INFO, pghs.get() != nullptr, "Invalid BUILD_INFO file for package"); + return inner_create_buildinfo(*pghs.get()); + } + + PreBuildInfo PreBuildInfo::from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet) + { + static constexpr CStringView FLAG_GUID = "c35112b6-d1ba-415b-aa5d-81de856ef8eb"; + + const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); + const fs::path ports_cmake_script_path = paths.scripts / "get_triplet_environment.cmake"; + const fs::path triplet_file_path = paths.triplets / (triplet.canonical_name() + ".cmake"); + + const auto cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path, + ports_cmake_script_path, + { + {"CMAKE_TRIPLET_FILE", triplet_file_path}, + }); + const auto ec_data = System::cmd_execute_and_capture_output(cmd_launch_cmake); + Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, ec_data.output); + + const std::vector lines = Strings::split(ec_data.output, "\n"); + + PreBuildInfo pre_build_info; + + const auto e = lines.cend(); + auto cur = std::find(lines.cbegin(), e, FLAG_GUID); + if (cur != e) ++cur; + + for (; cur != e; ++cur) + { + auto&& line = *cur; + + const std::vector s = Strings::split(line, "="); + Checks::check_exit(VCPKG_LINE_INFO, + s.size() == 1 || s.size() == 2, + "Expected format is [VARIABLE_NAME=VARIABLE_VALUE], but was [%s]", + line); + + const bool variable_with_no_value = s.size() == 1; + const std::string variable_name = s.at(0); + const std::string variable_value = variable_with_no_value ? "" : s.at(1); + + if (variable_name == "VCPKG_TARGET_ARCHITECTURE") + { + pre_build_info.target_architecture = variable_value; + continue; + } + + if (variable_name == "VCPKG_CMAKE_SYSTEM_NAME") + { + pre_build_info.cmake_system_name = variable_value; + continue; + } + + if (variable_name == "VCPKG_CMAKE_SYSTEM_VERSION") + { + pre_build_info.cmake_system_version = variable_value; + continue; + } + + if (variable_name == "VCPKG_PLATFORM_TOOLSET") + { + pre_build_info.platform_toolset = + variable_value.empty() ? nullopt : Optional{variable_value}; + continue; + } + + if (variable_name == "VCPKG_VISUAL_STUDIO_PATH") + { + pre_build_info.visual_studio_path = + variable_value.empty() ? nullopt : Optional{variable_value}; + continue; + } + + if (variable_name == "VCPKG_CHAINLOAD_TOOLCHAIN_FILE") + { + pre_build_info.external_toolchain_file = + variable_value.empty() ? nullopt : Optional{variable_value}; + continue; + } + + if (variable_name == "VCPKG_BUILD_TYPE") + { + if (variable_value.empty()) + pre_build_info.build_type = nullopt; + else if (Strings::case_insensitive_ascii_equals(variable_value, "debug")) + pre_build_info.build_type = ConfigurationType::DEBUG; + else if (Strings::case_insensitive_ascii_equals(variable_value, "release")) + pre_build_info.build_type = ConfigurationType::RELEASE; + else + Checks::exit_with_message( + VCPKG_LINE_INFO, "Unknown setting for VCPKG_BUILD_TYPE: %s", variable_value); + continue; + } + + Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown variable name %s", line); + } + + pre_build_info.triplet_abi_tag = [&]() { + const auto& fs = paths.get_filesystem(); + static std::map s_hash_cache; + + auto it_hash = s_hash_cache.find(triplet_file_path); + if (it_hash != s_hash_cache.end()) + { + return it_hash->second; + } + auto hash = Hash::get_file_hash(fs, triplet_file_path, "SHA1"); + + if (auto p = pre_build_info.external_toolchain_file.get()) + { + hash += "-"; + hash += Hash::get_file_hash(fs, *p, "SHA1"); + } + else if (pre_build_info.cmake_system_name == "Linux") + { + hash += "-"; + hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "linux.cmake", "SHA1"); + } + else if (pre_build_info.cmake_system_name == "Darwin") + { + hash += "-"; + hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "osx.cmake", "SHA1"); + } + else if (pre_build_info.cmake_system_name == "FreeBSD") + { + hash += "-"; + hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "freebsd.cmake", "SHA1"); + } + else if (pre_build_info.cmake_system_name == "Android") + { + hash += "-"; + hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "android.cmake", "SHA1"); + } + + s_hash_cache.emplace(triplet_file_path, hash); + return hash; + }(); + + return pre_build_info; + } + ExtendedBuildResult::ExtendedBuildResult(BuildResult code) : code(code) {} + ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::unique_ptr&& bcf) + : code(code), binary_control_file(std::move(bcf)) + { + } + ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::vector&& unmet_deps) + : code(code), unmet_dependencies(std::move(unmet_deps)) + { + } +} -- cgit v1.2.3 From e9439ff5ca27c4d4ba43b33380f21933f32c61b7 Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Mon, 4 Feb 2019 20:05:42 +0100 Subject: [libzip] Add features to libzip (#5121) * add features to libzip * add documentation * undo add bzip2 as linux build dependency * Use default features, and remove mbedtls feature --- ports/libzip/CONTROL | 7 ++++++- ports/libzip/portfile.cmake | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index 52681ed04..c318303dc 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,4 +1,9 @@ Source: libzip -Version: rel-1-5-1-vcpkg1 +Version: rel-1-5-1-vcpkg2 Build-Depends: zlib +Default-Features: openssl Description: A library for reading, creating, and modifying zip archives. + +Feature: openssl +Build-Depends: openssl +Description: AES (encryption) support using OpenSSL diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index de7940b3a..c4dee7221 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -8,9 +8,18 @@ vcpkg_from_github( PATCHES cmake_dont_build_more_than_needed.patch ) +# AES encryption +set(USE_OPENSSL OFF) +if("openssl" IN_LIST FEATURES) + set(USE_OPENSSL ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + # see https://github.com/nih-at/libzip/blob/rel-1-5-1/INSTALL.md + -DENABLE_OPENSSL=${USE_OPENSSL} ) vcpkg_install_cmake() -- cgit v1.2.3 From 50cf58d4943bea549d08dc9b2ee9dd91b24cf4cb Mon Sep 17 00:00:00 2001 From: Joaquim Date: Tue, 5 Feb 2019 18:19:55 +0000 Subject: Add netcdf and hdf5 dependencies (#5289) Netcdf and HDF are important _formats_ in the scientific domains (lots of satellite data come in nc or hdf) so having them by default in GDAL seems the most natural. --- ports/gdal/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index d2ad4ae77..0814046f5 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,7 +1,7 @@ Source: gdal Version: 2.4.0 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. -Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma +Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5 Feature: mysql-libmariadb Build-Depends: libmariadb -- cgit v1.2.3 From 52f165ef3b162a4910b3e873d547ca994435e751 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 5 Feb 2019 14:46:17 -0800 Subject: [vcpkg] Respect the documented VS environment variable %VCPKG_VISUAL_STUDIO_PATH% --- 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 fc7283599..97565bf41 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -102,7 +102,7 @@ static void inner(const VcpkgCmdArguments& args) Debug::println("Using vcpkg-root: %s", vcpkg_root_dir.u8string()); - auto default_vs_path = System::get_environment_variable("VCPKG_DEFAULT_VS_PATH").value_or(""); + auto default_vs_path = System::get_environment_variable("VCPKG_VISUAL_STUDIO_PATH").value_or(""); const Expected expected_paths = VcpkgPaths::create(vcpkg_root_dir, default_vs_path); Checks::check_exit(VCPKG_LINE_INFO, -- cgit v1.2.3 From 2a7ad32ee8e09b33fa207aa3596c4cc77ceb36d6 Mon Sep 17 00:00:00 2001 From: Daniel Marshall Date: Wed, 6 Feb 2019 16:45:47 +0000 Subject: [nlohmann-json] Added cmake targets (#5258) * Added cmake targets for nlohmann-json * [nlohmann-json] Use vcpkg_from_github() * [nlohmann-json] Enable find_package(nlohmann_json) * Removed unneeded renaming * [nlohmann-json] Revert use of vcpkg_from_github() due to archive size of >100MB * [nlohmann-json] Fix missing natvis --- ports/nlohmann-json/CONTROL | 2 +- ports/nlohmann-json/portfile.cmake | 55 +++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 6d8f59edc..d1d9b689b 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,3 +1,3 @@ Source: nlohmann-json -Version: 3.5.0 +Version: 3.5.0-5 Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 66096ce89..ea95cad97 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,18 +1,53 @@ include(vcpkg_common_functions) set(SOURCE_VERSION 3.5.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nlohmann-json-v${SOURCE_VERSION}) -vcpkg_download_distfile(HEADER - URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp" - FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp" - SHA512 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0 +file(MAKE_DIRECTORY ${SOURCE_PATH}) + +function(download_src SUBPATH SHA512) + vcpkg_download_distfile(FILE + URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/${SUBPATH}" + FILENAME "nlohmann-json-v${SOURCE_VERSION}/${SUBPATH}" + SHA512 ${SHA512} + ) + get_filename_component(SUBPATH_DIR "${SOURCE_PATH}/${SUBPATH}" DIRECTORY) + file(COPY ${FILE} DESTINATION ${SUBPATH_DIR}) +endfunction() + +download_src(CMakeLists.txt c763a16ff8026f049041e4461040416278d51751a6ac37ed1f4bfb565c748f2307e121fa6f71c2420d30ceb231cfb68b3f502cb8c3750371c1bf90e1f651578f) +download_src(LICENSE.MIT 0fdb404547467f4523579acde53066badf458504d33edbb6e39df0ae145ed27d48a720189a60c225c0aab05f2aa4ce4050dcb241b56dc693f7ee9f54c8728a75) +download_src(nlohmann_json.natvis 9bce6758db0e54777394a4e718e60a281952b15f0c6dc6a6ad4a6d023c958b5515b2d39b7d4c66c03f0d3fdfdc1d6c23afb8b8419f1345c9d44d7b9a9ee2582b) +download_src(cmake/config.cmake.in 7caab6166baa891f77f5b632ac4a920e548610ec41777b885ec51fe68d3665ffe91984dd2881caf22298b5392dfbd84b526fda252467bb66de9eb90e6e6ade5a) +download_src(single_include/nlohmann/json.hpp 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DJSON_BuildTests=0 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nlohmann_json TARGET_PATH share/nlohmann_json) + +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_jsonTargets.cmake + "{_IMPORT_PREFIX}/nlohmann_json.natvis" + "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis" ) -vcpkg_download_distfile(LICENSE - URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/LICENSE.MIT" - FILENAME "nlohmann-json-LICENSE-${SOURCE_VERSION}.txt" - SHA512 0fdb404547467f4523579acde53066badf458504d33edbb6e39df0ae145ed27d48a720189a60c225c0aab05f2aa4ce4050dcb241b56dc693f7ee9f54c8728a75 +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib ) -file(INSTALL ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include/nlohmann RENAME json.hpp) -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/nlohmann-json RENAME copyright) +if(EXISTS ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis) + file(RENAME + ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis + ${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis + ) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/nlohmann-json RENAME copyright) -- cgit v1.2.3 From 6509199a2aeb882c91babb7cc95ef36b30738091 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 1 Feb 2019 21:34:02 -0800 Subject: [cpprestsdk] Update to v2.10.10 --- ports/cpprestsdk/CONTROL | 2 +- ports/cpprestsdk/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index e5da66ef7..aaa41316e 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,5 +1,5 @@ Source: cpprestsdk -Version: 2.10.7 +Version: 2.10.10 Build-Depends: zlib, 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) 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. diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index bf8478be0..9f34226ef 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.9 - SHA512 bae55232bdee6dd4cb9e3da81b41c4d9b2c4b7bd514d7a15bbeadf90e13e96a6c3055d40e277f00b8e85f39b7eddd1bf7d4839f0a98a6040a55576e2d6ac2b57 + REF v2.10.10 + SHA512 6169d0907aead80a4e0a3f6a25fb71ab13a46a10a9700974c629b91948a83ee3c841a4ac7dfac8155ea3731c0eedee594c07ec37050d57770faf4eee608660e5 HEAD_REF master ) -- cgit v1.2.3 From f5b06a9ef0b34ef63ed9d2dfca978781a73eaea2 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 7 Feb 2019 03:18:53 +0800 Subject: [corrade] Add the /permissive- option (#5126) --- ports/corrade/CONTROL | 2 +- ports/corrade/fixC2666.patch | 16 ++++++++++++++++ ports/corrade/portfile.cmake | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ports/corrade/fixC2666.patch diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index 116a9f7e7..8e7205158 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,5 +1,5 @@ Source: corrade -Version: 2018.10-1 +Version: 2018.10-2 Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility diff --git a/ports/corrade/fixC2666.patch b/ports/corrade/fixC2666.patch new file mode 100644 index 000000000..e6e2ffccc --- /dev/null +++ b/ports/corrade/fixC2666.patch @@ -0,0 +1,16 @@ +diff --git a/modules/UseCorrade.cmake b/modules/UseCorrade.cmake +index 744d5a1..129e75f 100644 +--- a/modules/UseCorrade.cmake ++++ b/modules/UseCorrade.cmake +@@ -164,7 +164,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL " + # "dllexport and extern are incompatible on an explicit instantiation". + # Why the error is emitted only on classes? Functions are okay with + # dllexport extern?! +- "/wd4910") ++ "/wd4910" ++ ++ #Add the /permissive- option ++ "/permissive-") + set(CORRADE_PEDANTIC_COMPILER_DEFINITIONS + # Disabling warning for not using "secure-but-not-standard" STL algos + "_CRT_SECURE_NO_WARNINGS" "_SCL_SECURE_NO_WARNINGS" diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 0a6f1babb..c5b5780bd 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( REF v2018.10 SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201 HEAD_REF master + PATCHES fixC2666.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -- cgit v1.2.3 From 62f294eeaebaba978634fee5641e507ac997bcf7 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 6 Feb 2019 20:48:27 +0000 Subject: [libarchive] Fix libxml2 feature not taking effect (#5298) --- ports/libarchive/CONTROL | 2 +- ports/libarchive/portfile.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index af3d528b8..7cb34cd94 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,5 @@ Source: libarchive -Version: 3.3.3-2 +Version: 3.3.3-3 Description: Library for reading and writing streaming archives Build-Depends: zlib Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index a2a35ad65..5d6755bc0 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -26,7 +26,6 @@ set(BUILD_libarchive_libxml2 OFF) if("libxml2" IN_LIST FEATURES) set(BUILD_libarchive_libxml2 ON) endif() -set(BUILD_libarchive_libxml2 OFF) set(BUILD_libarchive_lz4 OFF) if("lz4" IN_LIST FEATURES) -- cgit v1.2.3 From ae991ee6ca224b2674aa24c7c705b5c36dcbb361 Mon Sep 17 00:00:00 2001 From: Sam Freed Date: Wed, 6 Feb 2019 13:08:57 -0800 Subject: Warn when unable to determine target architecture instead of error (#5188) * Warn when unable to determine target architecture instead of error * Make the warning not appear multiple times * fix multiple warnings for real --- scripts/buildsystems/vcpkg.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 91c196fb9..4ffb123d4 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -50,7 +50,13 @@ else() elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") set(_VCPKG_TARGET_TRIPLET_ARCH x64) else() - message(FATAL_ERROR "Unable to determine target architecture.") + if( _CMAKE_IN_TRY_COMPILE ) + message(STATUS "Unable to determine target architecture, continuing without vcpkg.") + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + endif() + set(VCPKG_TOOLCHAIN ON) + return() endif() endif() endif() -- cgit v1.2.3 From 846625e48054de2ef6e205d8087feabf003c1b6b Mon Sep 17 00:00:00 2001 From: Rajeev Massand Date: Wed, 6 Feb 2019 13:14:52 -0800 Subject: fix for edge (#5309) --- ports/azure-iot-sdk-c/CONTROL | 6 +++--- ports/azure-iot-sdk-c/portfile.cmake | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 891295f92..79eeb16e6 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,8 +1,8 @@ Source: azure-iot-sdk-c -Version: 1.2.13-1 -Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson +Version: 1.2.13-2 +Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services Feature: public-preview Description: A version of the azure-iot-sdk-c containing public-preview features. -Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview] +Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview] diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 6489d9197..d3acac400 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_configure_cmake( -Duse_installed_dependencies=ON -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF + -Duse_edge_modules=ON ) vcpkg_install_cmake() -- cgit v1.2.3 From aa095559917a495b160986e9ad50556431509ace Mon Sep 17 00:00:00 2001 From: Bobby Martin Date: Wed, 6 Feb 2019 17:21:23 -0800 Subject: [hyperscan] New port (#5285) * add support for building hyperscan * patch hyperscan to work with latest boost * correct hyperscan source dir name * speed the build by depending on only the parts of boost we actually need * make python3 support release-only builds * upgrade to hyperscan 5.1.0 * remove redundant disambiguate patch * Add comments about how to build * restore original x64-windows-static.cmake * [hyperscan] Check linkage * [python3] Allow DLLs without LIBs * [hyperscan] Only static library * [python3] Revert changes that cause regression in boost-python * [python3] Revert changes that cause regression in boost-python --- ports/hyperscan/CONTROL | 4 ++++ ports/hyperscan/portfile.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ ports/python3/CONTROL | 2 +- ports/python3/portfile.cmake | 1 + 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 ports/hyperscan/CONTROL create mode 100644 ports/hyperscan/portfile.cmake diff --git a/ports/hyperscan/CONTROL b/ports/hyperscan/CONTROL new file mode 100644 index 000000000..bf45c2238 --- /dev/null +++ b/ports/hyperscan/CONTROL @@ -0,0 +1,4 @@ +Source: hyperscan +Version: 5.0.1-1 +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-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, python3, ragel \ No newline at end of file diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake new file mode 100644 index 000000000..be8410b38 --- /dev/null +++ b/ports/hyperscan/portfile.cmake @@ -0,0 +1,41 @@ +# Build with 'vcpkg.exe install hyperscan:x86-windows-static-release'; Hyperscan doesn't support dynamic libraries on Windows. +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + + +set(HYPERSCAN_VERSION 5.1.0) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/intel/hyperscan/archive/v${HYPERSCAN_VERSION}.zip" + FILENAME "v${HYPERSCAN_VERSION}.zip" + SHA512 89a826c1e66175f1781f57d0d430f2d5d245ab590acc4b5df6638c5f6fe43914db028f8bc86e566ea27b55883c91be0d8da079b3d7547899f7cf540b52a3cf0a +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${HYPERSCAN_VERSION}) + +vcpkg_find_acquire_program(PYTHON3) + +# Add python3 to path +get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(PREPEND ${PYTHON_PATH}) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/hyperscan RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME hs) diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL index 6c5a835da..f37197e83 100644 --- a/ports/python3/CONTROL +++ b/ports/python3/CONTROL @@ -1,3 +1,3 @@ Source: python3 -Version: 3.6.4-3 +Version: 3.6.4-5 Description: The Python programming language as an embeddable library \ No newline at end of file diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index e3bbfd2f5..308f0aa37 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -73,6 +73,7 @@ file(COPY ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${P file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -- cgit v1.2.3 From 23f70099513254eb2559e887a2a9b5539a217e10 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 7 Feb 2019 10:43:50 -0800 Subject: [strict-variant] Add new header-only library (#5320) --- ports/strict-variant/CONTROL | 3 +++ ports/strict-variant/portfile.cmake | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 ports/strict-variant/CONTROL create mode 100644 ports/strict-variant/portfile.cmake diff --git a/ports/strict-variant/CONTROL b/ports/strict-variant/CONTROL new file mode 100644 index 000000000..cc8af9ef0 --- /dev/null +++ b/ports/strict-variant/CONTROL @@ -0,0 +1,3 @@ +Source: strict-variant +Version: v0.5 +Description: Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves. diff --git a/ports/strict-variant/portfile.cmake b/ports/strict-variant/portfile.cmake new file mode 100644 index 000000000..ef0b34361 --- /dev/null +++ b/ports/strict-variant/portfile.cmake @@ -0,0 +1,17 @@ +# header-only +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cbeck88/strict-variant + REF 5ab330edcb5e3eea67fbedf8ac89648e5bc1e9a1 + SHA512 c80e5cd7cff389174447f5825af57ddea079956b2a4cb89337479e02289e89df19713ff031e914bdff2c823e8d2518311a1118701ae4e173f6557c770e553cd0 + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/strict-variant) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/strict-variant/LICENSE ${CURRENT_PACKAGES_DIR}/share/strict-variant/copyright) -- cgit v1.2.3 From ce9004e1f1e71028c442e0124943a05c594e2708 Mon Sep 17 00:00:00 2001 From: almikhayl Date: Thu, 7 Feb 2019 22:03:09 +0300 Subject: [gcem] new port for kthohr/gcem (#5325) --- ports/gcem/CONTROL | 3 +++ ports/gcem/portfile.cmake | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 ports/gcem/CONTROL create mode 100644 ports/gcem/portfile.cmake diff --git a/ports/gcem/CONTROL b/ports/gcem/CONTROL new file mode 100644 index 000000000..b3c280cd7 --- /dev/null +++ b/ports/gcem/CONTROL @@ -0,0 +1,3 @@ +Source: gcem +Version: 1.8.1 +Description: A C++ compile-time math library using generalized constant expressions diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake new file mode 100644 index 000000000..4a13af1c2 --- /dev/null +++ b/ports/gcem/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kthohr/gcem + REF v1.8.1 + SHA512 dd82a917822ffdfb3f224599340d2a0499e47db8d469d9febf3d37cd796fae3c8186a4fc05cc727d3ef82655359166caafbb5ddee3b79ba7becf1a53cce20e4a + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gcem) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gcem) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/gcem/LICENSE ${CURRENT_PACKAGES_DIR}/share/gcem/copyright) -- cgit v1.2.3 From bc119009abf1d6a4937737a7fd48260f15fbcdec Mon Sep 17 00:00:00 2001 From: Marco Craveiro Date: Thu, 7 Feb 2019 19:17:41 +0000 Subject: [boost-di] Update to version 1.1.0 (#5316) --- ports/boost-di/CONTROL | 4 ++-- ports/boost-di/portfile.cmake | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/boost-di/CONTROL b/ports/boost-di/CONTROL index 29105119e..6243b1446 100644 --- a/ports/boost-di/CONTROL +++ b/ports/boost-di/CONTROL @@ -1,3 +1,3 @@ Source: boost-di -Version: 1.0.2 -Description: C++14 Dependency Injection Library. \ No newline at end of file +Version: 1.1.0 +Description: C++14 Dependency Injection Library. diff --git a/ports/boost-di/portfile.cmake b/ports/boost-di/portfile.cmake index 83ab057d1..f6fe59a3f 100644 --- a/ports/boost-di/portfile.cmake +++ b/ports/boost-di/portfile.cmake @@ -1,11 +1,11 @@ #header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.0.2) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.1.0) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/boost-experimental/di/archive/v1.0.2.tar.gz" - FILENAME "di-1.0.2.tar.gz" - SHA512 1a5fc3738db2c3c18c198ce58e82a60f4f3d39fb66c9dc2b465df89da66a19ffca79eca148e68cd70c76524185ba2145e2857504a25eda4fa70ffd2f05f3be40 + URLS "https://github.com/boost-experimental/di/archive/v1.1.0.tar.gz" + FILENAME "di-1.1.0.tar.gz" + SHA512 69f7b0567cffea9bf983aedd7eabd1a07ae20249cd56a13de98eaa0cc835cbe3b76e790da68489536dd07edeb99271a69111f4d0c6b0aa3721ce9f5ead848fe0 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -19,4 +19,4 @@ vcpkg_download_distfile(LICENSE FILENAME "boost-di-copyright" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-di/copyright) \ No newline at end of file +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-di/copyright) -- cgit v1.2.3 From e1d0090697753e72a2a9fcf5eaf9421fd7aaa51f Mon Sep 17 00:00:00 2001 From: MikeGitb Date: Thu, 7 Feb 2019 21:07:20 +0100 Subject: [Catch2] Upgrade to 2.6.0 (#5327) --- ports/catch2/CONTROL | 2 +- ports/catch2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index 15a9da60a..8a6b57c53 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.5.0 +Version: 2.6.0 Description: A modern, header-only test framework for unit testing. Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index f6ed65251..63bcc3832 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.5.0 - SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 + REF v2.6.0 + SHA512 8d693cce413421ca747a0a3864d72c20f30fb8e432eb1f13e69605a71cc4e536d6710561f989cce6783d28f8b667b8da42c624056c4d412852885a8cf0df1e5d HEAD_REF master ) -- cgit v1.2.3 From 82e19b3804f39423984f0a5519b7fb11c1b0f79b Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Thu, 7 Feb 2019 20:17:36 +0000 Subject: [cryptopp] Update to 8.0.0 (#5328) --- ports/cryptopp/CONTROL | 2 +- ports/cryptopp/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL index 89db4de57..7723d0fbf 100644 --- a/ports/cryptopp/CONTROL +++ b/ports/cryptopp/CONTROL @@ -1,3 +1,3 @@ Source: cryptopp -Version: 7.0.0 +Version: 8.0.0 Description: Crypto++ is a free C++ class library of cryptographic schemes. diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 82893be41..37e89a39d 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO noloader/cryptopp-cmake - REF 2729870f277bd568a8e8183b5ba7799e0c2dbf96 - SHA512 fff9468774f66a895ab44ce76d37b320aeaa9398514b66d5116ffe84705ef7a202586622d598ea03f7c1636587893d46c6eee5e0da965c58fb74131c4b76223c + REF b97d72f083fefa249e46ae3c15a2c294e615fca2 + SHA512 e6c65bb81a47009fa568c957beea65c37f2283bdc5afad6a45983f685c0b9c9c01ac4bb334d45dacbdc74f9d834b316c09cbb16d3ead7fb48737fbad76ff3f8d HEAD_REF master PATCHES cmake.patch @@ -16,8 +16,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF CRYPTOPP_7_0_0 - SHA512 bc83f6adf0ae627c57ff9172d8cee69e7000d9b414ec903a50f11f9a68da08d1dd4985ddaffada86bf58e8168a2df065185efd932201d2df9db3f73025825e54 + REF CRYPTOPP_8_0_0 + SHA512 e3240882748f5306442a3feca5b0718c6ee20a44596f522c6c3ae35e0c81d56412b5b223b2bcf2eb74a8ce4c08a73b4c25f4d005417bdc68f9309708cc5c5ddb HEAD_REF master PATCHES patch.patch ) -- cgit v1.2.3 From 721de0cbbc837c3fb7152192799c50092ed5abb8 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Thu, 7 Feb 2019 21:19:10 +0000 Subject: [tinyfiledialogs] upgrade to 3.3.8 and export cmake config (#5294) * [tinyfiledialogs] export cmake config * [tinyfiledialogs] upgrade to 3.3.8 --- ports/tinyfiledialogs/CMakeLists.txt | 22 +++++++++++++++++++--- ports/tinyfiledialogs/CONTROL | 2 +- ports/tinyfiledialogs/portfile.cmake | 15 ++++++--------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ports/tinyfiledialogs/CMakeLists.txt b/ports/tinyfiledialogs/CMakeLists.txt index 4adabaf9a..34940b79d 100644 --- a/ports/tinyfiledialogs/CMakeLists.txt +++ b/ports/tinyfiledialogs/CMakeLists.txt @@ -5,7 +5,23 @@ add_library(tinyfiledialogs tinyfiledialogs.c) install( TARGETS tinyfiledialogs - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin + EXPORT tinyfiledialogsConfig + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +) +install( + FILES tinyfiledialogs.h + DESTINATION "${CMAKE_INSTALL_PREFIX}/include/tinyfiledialogs" +) + +export( + TARGETS tinyfiledialogs + NAMESPACE tinyfiledialogs:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/tinyfiledialogsConfig.cmake" +) +install( + EXPORT tinyfiledialogsConfig + NAMESPACE tinyfiledialogs:: + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/tinyfiledialogs" ) diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL index bb3a2ff33..485cc4351 100644 --- a/ports/tinyfiledialogs/CONTROL +++ b/ports/tinyfiledialogs/CONTROL @@ -1,3 +1,3 @@ Source: tinyfiledialogs -Version: 3.3.7-1 +Version: 3.3.8 Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index 66f1735a8..73fd52d91 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -2,21 +2,20 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(SHA 03d35a86696859128d41f8b967c1ef3e39c980ce) +set(SHA 21998464c84ddaa9f911d8d05378d6f23a3a3671) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SHA}) vcpkg_download_distfile(HEADERFILE URLS "https://sourceforge.net/p/tinyfiledialogs/code/ci/${SHA}/tree/tinyfiledialogs.h?format=raw" FILENAME "tinyfiledialogs-h-${SHA}" - SHA512 e3503165bcbb665c2f09c19591f28eba63e50b8d20fd4e65f31ec6a33742879c007aa7402cfd429ff92a2847534f0f0cc1b979954372be0c6578d49ed5f3e18d + SHA512 3f15192e2e2ba674308330eca88f5f2430980b93a53389125fab4de0fce775b9a0e2a0464a3a69bd86e362715c866504e752bfea402f1072005f6da3c97316d8 ) vcpkg_download_distfile(SOURCEFILE URLS "https://sourceforge.net/p/tinyfiledialogs/code/ci/${SHA}/tree/tinyfiledialogs.c?format=raw" FILENAME "tinyfiledialogs-c-${SHA}" - SHA512 263a9fcd11af3dcfd3cd7b6cfaad216cfdd94925639e613d43e7a2dbae2b4387fe8182cd72401e19b2891a08809bc68caece341df28e91b5894cc4b9ecd157f4 + SHA512 b03260ba84872b3cf4eae2fed3a1770480021e3d4109f5ef243a433da48e443b7f244b105a16ce9d5655e086774d9098628e56b1559a6862fb5add547210ca58 ) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SHA}) - configure_file(${HEADERFILE} ${SOURCE_PATH}/tinyfiledialogs.h COPYONLY) configure_file(${SOURCEFILE} ${SOURCE_PATH}/tinyfiledialogs.c COPYONLY) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -25,13 +24,11 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) - vcpkg_install_cmake() -vcpkg_copy_pdbs() -configure_file(${HEADERFILE} ${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs.h COPYONLY) +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/tinyfiledialogs) file(READ ${HEADERFILE} _contents) string(SUBSTRING "${_contents}" 0 1024 _contents) file(WRITE ${CURRENT_PACKAGES_DIR}/share/tinyfiledialogs/copyright "${_contents}") -- cgit v1.2.3 From 3155a7c79a81065fcd1a73d64cc613c038a6395c Mon Sep 17 00:00:00 2001 From: JackBoos <398808571@qq.com> Date: Fri, 8 Feb 2019 06:12:31 +0800 Subject: feat(rang, fann): add ports for rang and fann * feat(rang): add port for rang * feat(fann): add port for fann * fix(fann): revert to dynamic if statically linked --- ports/fann/CONTROL | 3 +++ ports/fann/portfile.cmake | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 ports/fann/CONTROL create mode 100644 ports/fann/portfile.cmake diff --git a/ports/fann/CONTROL b/ports/fann/CONTROL new file mode 100644 index 000000000..84b062a30 --- /dev/null +++ b/ports/fann/CONTROL @@ -0,0 +1,3 @@ +Source: fann +Version: 2.2.0 +Description: Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks. \ No newline at end of file diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake new file mode 100644 index 000000000..d18d040e2 --- /dev/null +++ b/ports/fann/portfile.cmake @@ -0,0 +1,53 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libfann/fann + REF 2.2.0 + SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "FANN does not support static linkage. Building dynamically.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # Finish Directories + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/fann.dll ${CURRENT_PACKAGES_DIR}/bin/fann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.dll ${CURRENT_PACKAGES_DIR}/bin/doublefann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.dll ${CURRENT_PACKAGES_DIR}/bin/fixedfann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.dll ${CURRENT_PACKAGES_DIR}/bin/floatfann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/fann.lib ${CURRENT_PACKAGES_DIR}/lib/fann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.lib ${CURRENT_PACKAGES_DIR}/lib/doublefann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.lib ${CURRENT_PACKAGES_DIR}/lib/fixedfann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.lib ${CURRENT_PACKAGES_DIR}/lib/floatfann.lib) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/doublefann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fixedfann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/floatfann.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/doublefann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fixedfann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/floatfann.lib) + + # Remove useless config file and include path + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3 From 728c993bc49376f4edec7238c87caf1c30e55503 Mon Sep 17 00:00:00 2001 From: DDoSolitary Date: Fri, 8 Feb 2019 06:42:50 +0800 Subject: fix(libarchive): fix lz4 patch to align with upstream * Fix fix-lz4.patch. * Switch base to v3.3.3 for fix-lz4.patch. --- ports/libarchive/fix-lz4.patch | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch index 6a3d974fc..163e55ed0 100644 --- a/ports/libarchive/fix-lz4.patch +++ b/ports/libarchive/fix-lz4.patch @@ -1,18 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73bf07b3..76a1d61d 100644 +index 80871bc9..2a16dc70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -515,7 +515,10 @@ IF (LZ4_INCLUDE_DIR) - 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) - IF(LZ4_FOUND) - - \ No newline at end of file +@@ -517,7 +517,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) -- cgit v1.2.3 From 2f4a723ed4dbc7c9f821a32b59ebd2286fc61b7a Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Thu, 7 Feb 2019 15:16:16 -0800 Subject: feat(rocksdb): enable RTTI (#5130) This is so that you can derive a class from things like `rocksdb::AssociativeMergeOperator`. Perhaps a more "correct" patch would be to see if rtti is enabled for other builds, and enable it here, though it's not clear to me if that's feasible, so I'm suggesting this. --- ports/rocksdb/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 2b2013190..5f19e0a88 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -48,6 +48,7 @@ vcpkg_configure_cmake( -DWITH_LZ4=${WITH_LZ4} -DWITH_ZLIB=${WITH_ZLIB} -DWITH_TESTS=OFF + -DUSE_RTTI=1 -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} -- cgit v1.2.3 From cc516fb763b3a4b1faf37efbf0f6fc4c0ccfc60a Mon Sep 17 00:00:00 2001 From: Lassi Date: Fri, 8 Feb 2019 01:20:42 +0200 Subject: [vulkan] fix license copying on macOS (#5319) * Check if license exists in root of VULKAN_DIR, otherwise try one directory higher * [vulkan] Bump control version --- ports/vulkan/CONTROL | 2 +- ports/vulkan/portfile.cmake | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/vulkan/CONTROL b/ports/vulkan/CONTROL index 77f99641d..2d4947d31 100644 --- a/ports/vulkan/CONTROL +++ b/ports/vulkan/CONTROL @@ -1,3 +1,3 @@ Source: vulkan -Version: 1.1.82.1 +Version: 1.1.82.1-1 Description: A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices. \ No newline at end of file diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index 31eb802b4..bf6c2d65e 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -33,5 +33,12 @@ if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))") endif() endif() -configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +if (EXISTS ${VULKAN_DIR}/../LICENSE.TXT) + configure_file(${VULKAN_DIR}/../LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +elseif(EXISTS ${VULKAN_DIR}/LICENSE.TXT) + configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +else() + message(FATAL_ERROR "Could not find LICENSE.TXT") +endif() + SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file -- cgit v1.2.3 From 0b79c4bb74aa1a1908c23edb3ca07b5e6dd39141 Mon Sep 17 00:00:00 2001 From: Luke Sparey <44617984+lsparey@users.noreply.github.com> Date: Fri, 8 Feb 2019 12:22:37 +1300 Subject: [mongo-cxx-driver] Update to 3.2.0 and add cmake targets (#5178) * [mongo-cxx-driver] Update to 3.2.0 and add cmake targets * [mongo-cxx-driver] Replace cmake config files to support debug binaries --- ports/mongo-cxx-driver/CONTROL | 2 +- ports/mongo-cxx-driver/disable_shared.patch | 46 ------- .../disable_test_and_example.patch | 132 +++++++++++---------- ports/mongo-cxx-driver/portfile.cmake | 116 +++++++++--------- 4 files changed, 128 insertions(+), 168 deletions(-) delete mode 100644 ports/mongo-cxx-driver/disable_shared.patch diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL index 08de8ddec..3a8e6108f 100644 --- a/ports/mongo-cxx-driver/CONTROL +++ b/ports/mongo-cxx-driver/CONTROL @@ -1,4 +1,4 @@ Source: mongo-cxx-driver -Version: 3.1.1-3 +Version: 3.2.0-1 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility Description: MongoDB C++ Driver. diff --git a/ports/mongo-cxx-driver/disable_shared.patch b/ports/mongo-cxx-driver/disable_shared.patch deleted file mode 100644 index 5f2f9a04e..000000000 --- a/ports/mongo-cxx-driver/disable_shared.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index a9a7ada..6b87a6d 100644 ---- a/src/bsoncxx/CMakeLists.txt -+++ b/src/bsoncxx/CMakeLists.txt -@@ -117,9 +117,15 @@ if (WIN32) - ) - endif() - --add_library(bsoncxx SHARED -- ${bsoncxx_sources} --) -+if(BUILD_SHARED_LIBS) -+ add_library(bsoncxx SHARED -+ ${bsoncxx_sources} -+ ) -+else() -+ add_library(bsoncxx SHARED -+ exception/error_code.cpp -+ ) -+endif() - - set(bsoncxx_libs ${LIBBSON_LIBRARIES}) - -diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index 2ef54e4..53a13f7 100644 ---- a/src/mongocxx/CMakeLists.txt -+++ b/src/mongocxx/CMakeLists.txt -@@ -134,9 +134,15 @@ set_target_properties(mongocxx_mocked PROPERTIES - VERSION ${MONGOCXX_VERSION} - ) - --add_library(mongocxx SHARED -- ${mongocxx_sources} --) -+if(BUILD_SHARED_LIBS) -+ add_library(mongocxx SHARED -+ ${mongocxx_sources} -+ ) -+else() -+ add_library(mongocxx SHARED -+ exception/error_code.cpp -+ ) -+endif() - - set_target_properties (mongocxx PROPERTIES - OUTPUT_NAME mongocxx diff --git a/ports/mongo-cxx-driver/disable_test_and_example.patch b/ports/mongo-cxx-driver/disable_test_and_example.patch index d542628f7..734f52f26 100644 --- a/ports/mongo-cxx-driver/disable_test_and_example.patch +++ b/ports/mongo-cxx-driver/disable_test_and_example.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4538920..e783ff5 100644 +index 27cf3b6b8..896eee19a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -74,66 +74,66 @@ endif() +@@ -87,68 +87,68 @@ endif() set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -63,63 +63,63 @@ index 4538920..e783ff5 100644 -) - -set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) -+#add_custom_target(hugo_dir -+# COMMAND ${CMAKE_COMMAND} -E make_directory hugo -+#) -+# -+#add_custom_target(hugo -+# DEPENDS hugo_dir -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs -+# COMMAND hugo -+# VERBATIM -+#) -+# -+#add_custom_target(hugo-deploy -+# DEPENDS hugo -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver -+# VERBATIM -+#) -+# -+#add_custom_target(docs_dir_current -+# COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current -+#) -+# -+#add_custom_target(doxygen-current -+# DEPENDS docs_dir_current -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile -+# VERBATIM -+#) -+# -+#add_custom_target(doxygen-all -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND etc/generate-all-apidocs.pl -+# VERBATIM -+#) -+# -+#add_custom_target(doxygen-deploy -+# DEPENDS doxygen-all -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver -+# VERBATIM -+#) -+# -+#add_custom_target(format -+# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format -+# VERBATIM -+#) -+# -+#add_custom_target(format-lint -+# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint -+# VERBATIM -+#) -+# -+#add_custom_target(docs -+# DEPENDS hugo doxygen-current -+#) -+# -+#set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) ++# add_custom_target(hugo_dir ++# COMMAND ${CMAKE_COMMAND} -E make_directory hugo ++# ) ++ ++# add_custom_target(hugo ++# DEPENDS hugo_dir ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs ++# COMMAND hugo ++# VERBATIM ++# ) ++ ++# add_custom_target(hugo-deploy ++# DEPENDS hugo ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++# COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver ++# VERBATIM ++# ) ++ ++# add_custom_target(docs_dir_current ++# COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current ++# ) ++ ++# add_custom_target(doxygen-current ++# DEPENDS docs_dir_current ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++# COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ++# VERBATIM ++# ) ++ ++# add_custom_target(doxygen-all ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++# COMMAND etc/generate-all-apidocs.pl ++# VERBATIM ++# ) ++ ++# add_custom_target(doxygen-deploy ++# DEPENDS doxygen-all ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++# COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver ++# VERBATIM ++# ) ++ ++# add_custom_target(format ++# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format ++# VERBATIM ++# ) ++ ++# add_custom_target(format-lint ++# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint ++# VERBATIM ++# ) ++ ++# add_custom_target(docs ++# DEPENDS hugo doxygen-current ++# ) ++ ++# set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) enable_testing() @@ -127,22 +127,24 @@ index 4538920..e783ff5 100644 -add_subdirectory(examples EXCLUDE_FROM_ALL) +#add_subdirectory(examples EXCLUDE_FROM_ALL) + + add_subdirectory(benchmark EXCLUDE_FROM_ALL) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index 010f5e4..a9a7ada 100644 +index bd6e40662..d6054b022 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt -@@ -202,4 +202,4 @@ install( - DESTINATION lib/cmake/libbsoncxx-${BSONCXX_VERSION} +@@ -249,4 +249,4 @@ install( + DESTINATION lib/cmake/${PKG}-${BSONCXX_VERSION} ) -add_subdirectory(test) +#add_subdirectory(test) diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index 12d188b..2ef54e4 100644 +index a05021228..3dd7c1224 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt -@@ -209,4 +209,4 @@ install( - DESTINATION lib/cmake/libmongocxx-${MONGOCXX_VERSION} +@@ -238,4 +238,4 @@ install( + DESTINATION lib/cmake/${PKG}-${MONGOCXX_VERSION} ) -add_subdirectory(test) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index b80c8a5bf..69ac66b04 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,88 +1,92 @@ include(vcpkg_common_functions) + +set(VERSION_MAJOR 3) +set(VERSION_MINOR 2) +set(VERSION_PATCH 0) +set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) + vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH + OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver - REF r3.1.1 - SHA512 ba8a735e5645cbce4497df71a4577e891d507f577dbd5270ec8a82e54c39c2806bf2ff4848b621f18b36d31fb6031e5b4211972b661c43009bff0ed7ab6cf338 - HEAD_REF master - PATCHES - "${CURRENT_PORT_DIR}/disable_test_and_example.patch" - "${CURRENT_PORT_DIR}/disable_shared.patch" - "${CURRENT_PORT_DIR}/fix-uwp.patch" - "${CURRENT_PORT_DIR}/disable-c2338-mongo-cxx-driver.patch" + REF r${VERSION_FULL} + SHA512 cad8dd6e9fd75aa3aee15321c9b3df21d43c346f5b0b3dd75c86f9117d3376ad83fcda0c4a333c0a23d555e76d79432016623dd5f860ffef9964a6e8046e84b5 + HEAD_REF master + PATCHES + disable_test_and_example.patch + fix-uwp.patch + disable-c2338-mongo-cxx-driver.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR} -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} + -DMONGOCXX_HEADER_INSTALL_DIR=include + -DBSONCXX_HEADER_INSTALL_DIR=include ) vcpkg_install_cmake() -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/v_noabi/bsoncxx - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/bsoncxx) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake +" +set(LIBBSONCXX_VERSION_MAJOR ${VERSION_MAJOR}) +set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR}) +set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH}) +set(LIBBSONCXX_PACKAGE_VERSION ${VERSION_FULL}) -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/mongocxx/v_noabi/mongocxx - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/mongocxx) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/mongocxx) +get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE) -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake +set(LIBBSONCXX_INCLUDE_DIRS \"\${PACKAGE_PREFIX_DIR}/include\") +find_library(LIBBSONCXX_LIBRARY_PATH_RELEASE bsoncxx bsoncxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/lib\" NO_DEFAULT_PATH) +find_library(LIBBSONCXX_LIBRARY_PATH_DEBUG bsoncxx bsoncxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/debug/lib\" NO_DEFAULT_PATH) +set(LIBBSONCXX_LIBRARIES optimized \${LIBBSONCXX_LIBRARY_PATH_RELEASE} debug \${LIBBSONCXX_LIBRARY_PATH_DEBUG}) +" +) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake +" +set(LIBMONGOCXX_VERSION_MAJOR ${VERSION_MAJOR}) +set(LIBMONGOCXX_VERSION_MINOR ${VERSION_MINOR}) +set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH}) +set(LIBMONGOCXX_PACKAGE_VERSION ${VERSION_FULL}) + +include(CMakeFindDependencyMacro) + +find_dependency(libbsoncxx) + +get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE) + +set(LIBMONGOCXX_INCLUDE_DIRS \"\${PACKAGE_PREFIX_DIR}/include\" \${LIBBSONCXX_INCLUDE_DIRS}) +find_library(LIBMONGOCXX_LIBRARY_PATH_RELEASE NAMES mongocxx mongocxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/lib\" NO_DEFAULT_PATH) +find_library(LIBMONGOCXX_LIBRARY_PATH_DEBUG NAMES mongocxx mongocxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/debug/lib\" NO_DEFAULT_PATH) +set(LIBMONGOCXX_LIBRARIES optimized \${LIBMONGOCXX_LIBRARY_PATH_RELEASE} debug \${LIBMONGOCXX_LIBRARY_PATH_DEBUG} \${LIBBSONCXX_LIBRARIES}) +" +) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake ${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private ${CURRENT_PACKAGES_DIR}/include/bsoncxx/private ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test_util ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party ${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake ${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/test - ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util - ${CURRENT_PACKAGES_DIR}/include/mongocxx/private ${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private ${CURRENT_PACKAGES_DIR}/include/mongocxx/options/private + ${CURRENT_PACKAGES_DIR}/include/mongocxx/gridfs/private + ${CURRENT_PACKAGES_DIR}/include/mongocxx/private + ${CURRENT_PACKAGES_DIR}/include/mongocxx/test + ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util - ${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/bsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongocxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib) - - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib - ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib) - - # define MONGOCXX_STATIC in config/export.hpp - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/static.patch - ) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libbsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmongocxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib) -endif() + ${CURRENT_PACKAGES_DIR}/debug/include +) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver RENAME copyright) file(COPY ${SOURCE_PATH}/THIRD-PARTY-NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() -- cgit v1.2.3 From 1eceb88c71b3ed2a12e9a56823c658ebb2e57cc1 Mon Sep 17 00:00:00 2001 From: angelmixu Date: Fri, 8 Feb 2019 00:24:33 +0100 Subject: fix build for harfbuzz on macOS (#4776) * fix library exports for iconv on macOS, add Threads dependency for cairo, add the iconv, intl and Threads dependencies to harfbuzz * updated portfile from harfbuzz fix * fix indenting and order * fix portfile * [gettext] Add unofficial-gettext targets * [gettext] Fixup for Linux --- ports/cairo/CMakeLists.txt | 3 +++ ports/cairo/CONTROL | 2 +- ports/gettext/CMakeLists.txt | 14 ++++++++++++++ ports/gettext/CONTROL | 4 ++-- ports/gettext/portfile.cmake | 26 ++++++++++++++++---------- ports/gettext/unofficial-gettext-config.cmake | 1 + ports/harfbuzz/0002-fix-macos-build.patch | 21 +++++++++++++++++++++ ports/harfbuzz/CONTROL | 4 ++-- ports/harfbuzz/portfile.cmake | 1 + 9 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 ports/gettext/unofficial-gettext-config.cmake create mode 100644 ports/harfbuzz/0002-fix-macos-build.patch diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index 9fc476539..a23d776ed 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -167,6 +167,9 @@ find_package(Freetype REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_package(unofficial-fontconfig CONFIG REQUIRED) find_package(unofficial-pixman CONFIG REQUIRED) +if(APPLE) + find_package(Threads REQUIRED) +endif() # Cairo needs to be told which features of FreeType are availible add_definitions( diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 365fe38e7..d33147b18 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,4 +1,4 @@ Source: cairo -Version: 1.15.8-4 +Version: 1.15.8-5 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, glib, freetype, fontconfig diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt index c94ab4c13..edf46624d 100644 --- a/ports/gettext/CMakeLists.txt +++ b/ports/gettext/CMakeLists.txt @@ -116,8 +116,22 @@ if(NOT WIN32) endif() install(TARGETS libintl + EXPORT unofficial-gettext-targets RUNTIME DESTINATION bin LIBRARY DESTINATION bin 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) +") diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 76e1d22d4..1f96ff735 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,4 +1,4 @@ Source: gettext -Version: 0.19-5 -Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages +Version: 0.19-7 +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/portfile.cmake b/ports/gettext/portfile.cmake index 2a26817d7..d7283cc90 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -1,18 +1,28 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-gettext) return() endif() #Based on https://github.com/winlibs/gettext include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19) + +set(GETTEXT_VERSION 0.19) + vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-0.19.tar.gz" - FILENAME "gettext-0.19.tar.gz" + 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 ) -vcpkg_extract_source_archive(${ARCHIVE}) +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 +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt @@ -24,12 +34,6 @@ file(REMOVE ${SOURCE_PATH}/gettext-runtime/intl/libgnuintl.h ${SOURCE_PATH}/gett file(COPY ${CMAKE_CURRENT_LIST_DIR}/libgnuintl.win32.h DESTINATION ${SOURCE_PATH}/gettext-runtime/intl) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-macro-definitions.patch" - "${CMAKE_CURRENT_LIST_DIR}/0002-Fix-uwp-build.patch" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/gettext-runtime PREFER_NINJA @@ -38,6 +42,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +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) diff --git a/ports/gettext/unofficial-gettext-config.cmake b/ports/gettext/unofficial-gettext-config.cmake new file mode 100644 index 000000000..3b872142a --- /dev/null +++ b/ports/gettext/unofficial-gettext-config.cmake @@ -0,0 +1 @@ +add_library(unofficial::gettext::libintl INTERFACE IMPORTED) diff --git a/ports/harfbuzz/0002-fix-macos-build.patch b/ports/harfbuzz/0002-fix-macos-build.patch new file mode 100644 index 000000000..3b32092c1 --- /dev/null +++ b/ports/harfbuzz/0002-fix-macos-build.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c613e0..32d3a29 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.0) ++cmake_minimum_required(VERSION 3.5.0) + project(harfbuzz) + + enable_testing() +@@ -316,6 +316,10 @@ if (HB_HAVE_GLIB) + + find_package(Threads REQUIRED) + find_package(unofficial-iconv REQUIRED) ++ if(APPLE) ++ find_package(unofficial-gettext CONFIG REQUIRED) ++ list(APPEND THIRD_PARTY_LIBS unofficial::gettext::libintl) ++ endif() + find_package(unofficial-glib CONFIG REQUIRED) + + list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc) diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 32d70f5ec..fccb549ff 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,7 +1,7 @@ Source: harfbuzz -Version: 1.8.4-3 +Version: 1.8.4-4 Description: HarfBuzz OpenType text shaping engine -Build-Depends: freetype, ragel +Build-Depends: freetype, ragel, gettext (osx) Default-Features: ucdn Feature: graphite2 diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 382b045e1..d1455e5dc 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( find-package-freetype-2.patch glib-cmake.patch 0001-fix-cmake-export.patch + 0002-fix-macos-build.patch ) SET(HB_HAVE_ICU "OFF") -- cgit v1.2.3 From 0b59c38dd559a08ab839cc6fa99ff14845f2d029 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Thu, 7 Feb 2019 23:28:50 +0000 Subject: [glad] update to v0.1.29 (#5296) --- ports/glad/CONTROL | 2 +- ports/glad/portfile.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL index d74a35089..5d041c0a0 100644 --- a/ports/glad/CONTROL +++ b/ports/glad/CONTROL @@ -1,4 +1,4 @@ Source: glad -Version: 0.1.28-3 +Version: 0.1.29 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs. Build-Depends: egl-registry, opengl-registry diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index cc73b1e39..252109b8f 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -5,14 +5,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dav1dde/glad - REF v0.1.28 - SHA512 5895e25bffab4ead346f65011cbb52a434779fed1dad619ffde27f68b52994cd0b048a45b4533b22b54971dfdba935d93fcf6bee5789061d0057af869b95998c + REF v0.1.29 + SHA512 056c0439b673d86bd10fe733873d4b82cf70861818980f08b3ec23f7b478750064a6d53925cc2cf9445e570cece5f21e12d7af6f1927b64af05d8d1f2afdedcb HEAD_REF master ) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") file(COPY ${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h -- cgit v1.2.3 From 5f7256c3185841863ab12d5d399a907f08df83bf Mon Sep 17 00:00:00 2001 From: Daniel Marshall Date: Thu, 7 Feb 2019 23:39:09 +0000 Subject: feat(platform-folders): add port for platform-folders (#5329) --- ports/platform-folders/CONTROL | 3 +++ ports/platform-folders/portfile.cmake | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/platform-folders/CONTROL create mode 100644 ports/platform-folders/portfile.cmake diff --git a/ports/platform-folders/CONTROL b/ports/platform-folders/CONTROL new file mode 100644 index 000000000..d964e1d08 --- /dev/null +++ b/ports/platform-folders/CONTROL @@ -0,0 +1,3 @@ +Source: platform-folders +Version: 4.0.0-4 +Description: A C++ library to look for special directories like "My Documents" and "%APPDATA%" diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake new file mode 100644 index 000000000..a08610e18 --- /dev/null +++ b/ports/platform-folders/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions) +set(TARGET_BUILD_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sago007/PlatformFolders + REF 4.0.0 + SHA512 89bd9b971cff55ddb051ffcf2e1bbf1678ec14c601916d65ebd4d8e46a79cf93f12cbe9c13ebd0417808f35d7031d13274cda78f009a26fbd19d71e13a5e5ac6 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON +) + +vcpkg_install_cmake() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(INSTALL ${TARGET_BUILD_PATH}-rel/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) + file(INSTALL ${TARGET_BUILD_PATH}-dbg/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) +endif() + +if (WIN32) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/platform_folders) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/platform-folders RENAME copyright) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From 60deab0a29b64a739f39d60887f3b3d556afcc0e Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Fri, 8 Feb 2019 19:37:08 +0100 Subject: Update to freetype-2.9.1 (#5292) --- ports/freetype/0001-Fix-install-command.patch | 32 ++++++++++++++++ ...dows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch | 25 ------------ .../0002-Add-CONFIG_INSTALL_PATH-option.patch | 30 +++++++++------ ports/freetype/0003-Fix-UWP.patch | 44 ++++++++++++---------- ports/freetype/0004-Fix-macOS-defines.patch | 23 ----------- ports/freetype/CONTROL | 2 +- ports/freetype/portfile.cmake | 15 ++++---- 7 files changed, 82 insertions(+), 89 deletions(-) create mode 100644 ports/freetype/0001-Fix-install-command.patch delete mode 100644 ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch delete mode 100644 ports/freetype/0004-Fix-macOS-defines.patch diff --git a/ports/freetype/0001-Fix-install-command.patch b/ports/freetype/0001-Fix-install-command.patch new file mode 100644 index 000000000..feee3aefa --- /dev/null +++ b/ports/freetype/0001-Fix-install-command.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ad8ded0..32324d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -407,6 +407,7 @@ endif () + include(GNUInstallDirs) + + if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) ++ if(UNIX) + install( + # Note the trailing slash in the argument to `DIRECTORY'! + DIRECTORY ${PROJECT_SOURCE_DIR}/include/ +@@ -420,6 +421,19 @@ if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) + ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config + COMPONENT headers) ++ else() ++ install( ++ # Note the trailing slash in the argument to `DIRECTORY'! ++ DIRECTORY ${PROJECT_SOURCE_DIR}/include/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2 ++ COMPONENT headers ++ PATTERN "internal" EXCLUDE ++ PATTERN "ftoption.h" EXCLUDE) ++ install( ++ FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config ++ COMPONENT headers) ++ endif() + endif () + + if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) diff --git a/ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch b/ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch deleted file mode 100644 index 34318ad61..000000000 --- a/ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7286c233834117404f400e3cfd5500610ca56d9a Mon Sep 17 00:00:00 2001 -From: Robert Schumacher -Date: Sat, 7 May 2016 02:10:45 -0700 -Subject: [PATCH] Support Windows DLLs via CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f02ee51..774737d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,7 +115,7 @@ project(freetype) - - - if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS) -- message(FATAL_ERROR "Building shared libraries on Windows needs MinGW") -+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - endif () - - # Disallow in-source builds --- -2.8.1.windows.1 - diff --git a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch index eeecbc1f7..993576160 100644 --- a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch +++ b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch @@ -1,17 +1,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6bb2558..a894ada 100644 +index 32324d6..89a73a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -419,8 +419,11 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - ARCHIVE DESTINATION lib - FRAMEWORK DESTINATION Library/Frameworks - ) +@@ -151,6 +151,9 @@ option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF) + option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF) + option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF) + ++# vcpkg config install path ++option(CONFIG_INSTALL_PATH "location to install cmake config files" lib/cmake/freetype) + -+ set(CONFIG_INSTALL_PATH "lib/cmake/freetype" CACHE STRING "location to install cmake config files") -+ - install(EXPORT freetype-targets -- DESTINATION lib/cmake/freetype -+ DESTINATION ${CONFIG_INSTALL_PATH} - FILE freetype-config.cmake - ) + + # Disallow in-source builds + if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") +@@ -475,7 +478,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + COMPONENT libraries) + install( + EXPORT freetype-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype ++ DESTINATION ${CONFIG_INSTALL_PATH} + FILE freetype-config.cmake + COMPONENT headers) endif () diff --git a/ports/freetype/0003-Fix-UWP.patch b/ports/freetype/0003-Fix-UWP.patch index 253f91e6a..937942189 100644 --- a/ports/freetype/0003-Fix-UWP.patch +++ b/ports/freetype/0003-Fix-UWP.patch @@ -1,63 +1,67 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 744b2d5..d114b9b 100644 +index 89a73a4..fe9bc65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -312,6 +312,9 @@ else () - set(BASE_SRCS ${BASE_SRCS} src/base/ftdebug.c) +@@ -321,6 +321,10 @@ else () + list(APPEND BASE_SRCS src/base/ftdebug.c) endif () +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) +endif() - ++ if (BUILD_FRAMEWORK) - set(BASE_SRCS + list(APPEND BASE_SRCS builds/mac/freetype-Info.plist) + endif () diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h -index 4666d48..382a915 100644 +index 9664404..f56335a 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h -@@ -845,6 +845,9 @@ FT_BEGIN_HEADER - /*************************************************************************/ - /*************************************************************************/ - +@@ -1066,6 +1066,11 @@ FT_BEGIN_HEADER + /* Especially for TrueType fonts see also the documentation for */ + /* @FT_Size_Metrics. */ + /* */ ++ +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) +#define generic GenericFromFreeTypeLibrary +#endif - - /*************************************************************************/ - /* */ -@@ -1777,6 +1780,10 @@ FT_BEGIN_HEADER ++ + typedef struct FT_FaceRec_ + { + FT_Long num_faces; +@@ -1942,6 +1947,9 @@ FT_BEGIN_HEADER } FT_GlyphSlotRec; +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) +#undef generic +#endif -+ /*************************************************************************/ /*************************************************************************/ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c -index fa05347..ae2754b 100644 +index 8d07e35..ce6fffd 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c -@@ -457,6 +457,9 @@ +@@ -491,6 +491,10 @@ return error; } +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) +#define generic GenericFromFreeTypeLibrary +#endif ++ - /* documentation is in ftobjs.h */ - -@@ -971,6 +974,9 @@ + static void + ft_glyphslot_clear( FT_GlyphSlot slot ) +@@ -1151,6 +1155,10 @@ FT_FREE( face ); } +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) +#undef generic +#endif ++ static void Destroy_Driver( FT_Driver driver ) diff --git a/ports/freetype/0004-Fix-macOS-defines.patch b/ports/freetype/0004-Fix-macOS-defines.patch deleted file mode 100644 index 92e676b52..000000000 --- a/ports/freetype/0004-Fix-macOS-defines.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt 2018-11-16 10:49:22.000000000 +0100 -+++ b/CMakeLists.txt 2018-11-16 10:50:26.000000000 +0100 -@@ -200,17 +200,17 @@ - FTCONFIG_H) - if (HAVE_UNISTD_H) - string(REGEX REPLACE -- "#undef +(HAVE_UNISTD_H)" "#define \\1" -+ "#undef +(HAVE_UNISTD_H)" "#define \\1 1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - if (HAVE_FCNTL_H) - string(REGEX REPLACE -- "#undef +(HAVE_FCNTL_H)" "#define \\1" -+ "#undef +(HAVE_FCNTL_H)" "#define \\1 1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - if (HAVE_STDINT_H) - string(REGEX REPLACE -- "#undef +(HAVE_STDINT_H)" "#define \\1" -+ "#undef +(HAVE_STDINT_H)" "#define \\1 1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - string(REPLACE "/undef " "#undef " diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 1052412b4..8afeb5f65 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,4 +1,4 @@ Source: freetype -Version: 2.8.1-4 +Version: 2.9.1 Build-Depends: zlib, bzip2, libpng Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 13926dd19..96e285dec 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,20 +1,19 @@ include(vcpkg_common_functions) -set(FT_VERSION 2.8.1) +set(FT_VERSION 2.9.1) vcpkg_download_distfile(ARCHIVE URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2" "https://downloads.sourceforge.net/project/freetype/freetype2/${FT_VERSION}/freetype-${FT_VERSION}.tar.bz2" FILENAME "freetype-${FT_VERSION}.tar.bz2" - SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823 + SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${FT_VERSION} PATCHES - 0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch + 0001-Fix-install-command.patch 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch - 0004-Fix-macOS-defines.patch ) vcpkg_configure_cmake( @@ -22,10 +21,10 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DCONFIG_INSTALL_PATH=share/freetype - -DWITH_ZLIB=ON - -DWITH_BZip2=ON - -DWITH_PNG=ON - -DWITH_HarfBuzz=OFF + -DFT_WITH_ZLIB=ON + -DFT_WITH_BZIP2=ON + -DFT_WITH_PNG=ON + -DFT_WITH_HARFBUZZ=OFF ) vcpkg_install_cmake() -- cgit v1.2.3 From f54681082c5e2e33dbe6338019c43fec663dd059 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Fri, 8 Feb 2019 17:34:52 -0800 Subject: [cppgraphqlgen] Update to v2.0.0 (#5308) * [cppgraphqlgen] Update to v2.0.0 * [cppgraphqlgen] Pick up bug fix v2.0.1 * [cppgraphqlgen] Pick up bug fix v2.0.2 --- ports/cppgraphqlgen/CONTROL | 2 +- ports/cppgraphqlgen/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index fcdc0fcaa..9626f1a62 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen -Version: 1.0.3 +Version: 2.0.2 Build-Depends: pegtl, rapidjson Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index c6cad7d99..8371cde46 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cppgraphqlgen - REF v1.0.3 - SHA512 136f17460d6a7ed3bd20e2be5f9326d2a4a039bc1a7a212155a31a5e165e0f1fd061638c3f77f22d6c3d4230e9a57563585ad29ef59eea355e1521b374ce1ce4 + REF v2.0.2 + SHA512 259c8bc844b70e99332cd52caf48de3e5f0dfdf5bba6d986209a0e5a9f4491953901b365f43e8612f171bdcaef80b524d6b261b62fb8a429e529a5701a839ca1 HEAD_REF master ) -- cgit v1.2.3 From 4cbd210154db56b1f1c99fc563abceb767b3c8a9 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 8 Feb 2019 17:37:31 -0800 Subject: [rapidjson] PREFER_NINJA --- ports/rapidjson/CONTROL | 2 +- ports/rapidjson/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL index 5e7d4e5cf..b5fe3d4c9 100644 --- a/ports/rapidjson/CONTROL +++ b/ports/rapidjson/CONTROL @@ -1,3 +1,3 @@ Source: rapidjson -Version: 1.1.0-2 +Version: 1.1.0-3 Description: A fast JSON parser/generator for C++ with both SAX/DOM style API diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 45686aab0..8c1c0b938 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( # Use RapidJSON's own build process, skipping examples and tests vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DRAPIDJSON_BUILD_DOC:BOOL=OFF -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF -- cgit v1.2.3 From d82f37b4bfc1422d4601fbb63cbd553c925f7014 Mon Sep 17 00:00:00 2001 From: Marco Craveiro Date: Sat, 9 Feb 2019 02:06:08 +0000 Subject: [vcpkg] Fix warning on Apple (#5333) Return type of _NSGetExecutablePath is int rather than bool [1], causing a warning on Apple. [1] https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/dyld.3.html --- toolsrc/src/vcpkg/base/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index b25412f7a..90b9c34b3 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -30,7 +30,7 @@ namespace vcpkg::System static constexpr const uint32_t buff_size = 1024 * 32; uint32_t size = buff_size; char buf[buff_size] = {}; - bool result = _NSGetExecutablePath(buf, &size); + int result = _NSGetExecutablePath(buf, &size); Checks::check_exit(VCPKG_LINE_INFO, result != -1, "Could not determine current executable path."); std::unique_ptr canonicalPath(realpath(buf, NULL)); Checks::check_exit(VCPKG_LINE_INFO, result != -1, "Could not determine current executable path."); -- cgit v1.2.3 From e6b174ed58b42b6f7cb5c376612add552c04531f Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Mon, 11 Feb 2019 14:12:10 -0600 Subject: [ampl-mp] Add new port (#5331) * [ampl-mp] Add new port This port aims for solver development, so it does not build any existing solver modules. The shared library build is disabled for now because it has some problem on Windows. closes: #4491 * [ampl-mp] Disable MATLAB MEX support --- ports/ampl-mp/CONTROL | 3 ++ ports/ampl-mp/disable-matlab-mex.patch | 11 ++++++ ports/ampl-mp/install-targets.patch | 44 +++++++++++++++++++++++ ports/ampl-mp/portfile.cmake | 42 ++++++++++++++++++++++ ports/ampl-mp/workaround-msvc-optimizer-ice.patch | 14 ++++++++ 5 files changed, 114 insertions(+) create mode 100644 ports/ampl-mp/CONTROL create mode 100644 ports/ampl-mp/disable-matlab-mex.patch create mode 100644 ports/ampl-mp/install-targets.patch create mode 100644 ports/ampl-mp/portfile.cmake create mode 100644 ports/ampl-mp/workaround-msvc-optimizer-ice.patch diff --git a/ports/ampl-mp/CONTROL b/ports/ampl-mp/CONTROL new file mode 100644 index 000000000..8a8c27b3f --- /dev/null +++ b/ports/ampl-mp/CONTROL @@ -0,0 +1,3 @@ +Source: ampl-mp +Version: 2019-02-08 +Description: An open-source library for mathematical programming diff --git a/ports/ampl-mp/disable-matlab-mex.patch b/ports/ampl-mp/disable-matlab-mex.patch new file mode 100644 index 000000000..f1b8be443 --- /dev/null +++ b/ports/ampl-mp/disable-matlab-mex.patch @@ -0,0 +1,11 @@ +--- a/src/asl/CMakeLists.txt 2019-02-08 16:42:50.793071700 -0600 ++++ b/src/asl/CMakeLists.txt 2019-02-08 16:44:04.960894500 -0600 +@@ -266,7 +266,7 @@ endif () + + target_link_libraries(asl ${CMAKE_DL_LIBS}) + +-find_package(MATLAB) ++set(MATLAB_FOUND) + if (MATLAB_FOUND) + set(matlab_asl asl) + if (MSVC) diff --git a/ports/ampl-mp/install-targets.patch b/ports/ampl-mp/install-targets.patch new file mode 100644 index 000000000..8538920b7 --- /dev/null +++ b/ports/ampl-mp/install-targets.patch @@ -0,0 +1,44 @@ +--- a/CMakeLists.txt 2019-02-09 04:38:25.756325900 -0600 ++++ b/CMakeLists.txt 2019-02-09 04:39:55.299417600 -0600 +@@ -289,6 +289,8 @@ add_prefix(MP_SOURCES src/ + add_mp_library(mp ${MP_HEADERS} ${MP_SOURCES} ${MP_EXPR_INFO_FILE} + COMPILE_DEFINITIONS MP_DATE=${MP_DATE} MP_SYSINFO="${MP_SYSINFO}" + INCLUDE_DIRECTORIES src OBJECT_LIBRARIES format) ++set_property(TARGET mp PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES $) + set_target_properties(mp PROPERTIES + VERSION ${MP_VERSION} SOVERSION ${MP_VERSION_MAJOR}) + +@@ -385,5 +387,10 @@ if(BUILD_TESTING) + endif() + + install(DIRECTORY include/mp DESTINATION include) +-install(TARGETS mp DESTINATION lib RUNTIME DESTINATION bin) ++install(TARGETS mp EXPORT unofficial-mp-targets ++ DESTINATION lib RUNTIME DESTINATION bin) + install(FILES LICENSE.rst DESTINATION share/mp) ++install(EXPORT unofficial-mp-targets ++ FILE unofficial-mp-config.cmake ++ NAMESPACE unofficial::mp:: ++ DESTINATION share/unofficial-mp) +--- a/src/asl/CMakeLists.txt 2019-02-09 04:38:27.196322600 -0600 ++++ b/src/asl/CMakeLists.txt 2019-02-09 04:39:32.119889500 -0600 +@@ -235,6 +235,10 @@ add_mp_library(asl-extra OBJECT ${ASL_SO + + add_mp_library(asl STATIC OBJECT_LIBRARIES asl-core asl-extra + LIBRARIES mp INCLUDE_DIRECTORIES ${ASL_INCLUDE_DIRS}) ++set_property(TARGET asl PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++ $ ++ $) + + if (NOT WIN32) + target_link_libraries(asl m) +@@ -353,4 +357,6 @@ endif () + install(FILES ${ASL_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/arith.h + solvers/opcode.hd solvers/r_opn.hd + DESTINATION include/asl) +-install(TARGETS asl tableproxy DESTINATION lib RUNTIME DESTINATION bin) ++install(TARGETS tableproxy DESTINATION lib RUNTIME DESTINATION bin) ++install(TARGETS asl EXPORT unofficial-mp-targets ++ DESTINATION lib RUNTIME DESTINATION bin) diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake new file mode 100644 index 000000000..45bcb6478 --- /dev/null +++ b/ports/ampl-mp/portfile.cmake @@ -0,0 +1,42 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ampl/mp + REF d305155b047b69fc5c6e5fda8630c753d7973b9a + SHA512 2c8ffd6de946a6f8ea94a8e0c00f03f67753ad99534e0d5fcaaaeb472fe76a3383324bcb628a31d8c01bc5f60254790f5508c8394096a4f05672f814dbd6fe2e + HEAD_REF master + PATCHES + disable-matlab-mex.patch + workaround-msvc-optimizer-ice.patch + install-targets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD=asl + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets( + CONFIG_PATH share/unofficial-mp + TARGET_PATH share/unofficial-mp +) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/share/mp) + +configure_file(${SOURCE_PATH}/LICENSE.rst + ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() +vcpkg_test_cmake(PACKAGE_NAME unofficial-mp) diff --git a/ports/ampl-mp/workaround-msvc-optimizer-ice.patch b/ports/ampl-mp/workaround-msvc-optimizer-ice.patch new file mode 100644 index 000000000..cd55be8c0 --- /dev/null +++ b/ports/ampl-mp/workaround-msvc-optimizer-ice.patch @@ -0,0 +1,14 @@ +--- a/src/asl/CMakeLists.txt 2019-02-07 22:45:15.191909400 -0600 ++++ b/src/asl/CMakeLists.txt 2019-02-07 22:47:10.364936600 -0600 +@@ -216,6 +216,11 @@ add_mp_library(asl-core OBJECT ${ASL_COR + COMPILE_DEFINITIONS ${ASL_COMPILE_DEFINITIONS} + INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}) + ++if (MSVC) ++ set_source_files_properties(solvers/avltree.c solvers/sphes.c ++ PROPERTIES COMPILE_OPTIONS /Od) ++endif () ++ + # Public ASL headers. + set(ASL_HEADERS aslbuilder.h aslexpr.h aslexpr-visitor.h + aslproblem.h aslinterface.h ${CMAKE_CURRENT_BINARY_DIR}/stdio1.h) -- cgit v1.2.3 From 6c6516621f487a4fb3fa2d9b9417a54c3013ee23 Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Mon, 11 Feb 2019 22:49:12 +0100 Subject: [corrade,magnum,-integration,-extras,-plugins] Update Magnum to v2019.01 (#5312) * [corrade] Update to v2019.01 Signed-off-by: Squareys * [magnum] Update to v2019.01, remove shapes and glutapplication features These features were deprecated in earlier versions and now removed. Signed-off-by: Squareys * [magnum-(extras,plugins,integration)] Update to v2019.01, add imgui feat. Signed-off-by: Squareys * [magnum] Improve dependencies to corrade Signed-off-by: Squareys * [magnum-plugins] Add faad2audioimporter - faad2 is currently not in vcpkg, hence commented out - The commented out empty line is required to have vcpkg parse the file without issues Signed-off-by: Squareys --- ports/corrade/CONTROL | 2 +- ports/corrade/portfile.cmake | 5 +++-- ports/magnum-extras/CONTROL | 4 ++-- ports/magnum-extras/portfile.cmake | 4 ++-- ports/magnum-integration/CONTROL | 8 ++++++-- ports/magnum-integration/portfile.cmake | 4 ++-- ports/magnum-plugins/CONTROL | 8 ++++++-- ports/magnum-plugins/portfile.cmake | 4 ++-- ports/magnum/CONTROL | 18 ++++++------------ ports/magnum/portfile.cmake | 4 ++-- 10 files changed, 32 insertions(+), 29 deletions(-) diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index 8e7205158..db1dd82f9 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,5 +1,5 @@ Source: corrade -Version: 2018.10-2 +Version: 2019.01-1 Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index c5b5780bd..c9e0321dd 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/corrade - REF v2018.10 - SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201 + REF v2019.01 + SHA512 63468ee0a9362d92d61e2bc77fb8c3e455761894998393910f6bce4111b0ec74db8fe2a8658cec1292c5ceb26e57e005324b34f1ec343d4216abf3a955eaa97e HEAD_REF master PATCHES fixC2666.patch ) @@ -30,6 +30,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS + -DDUTILITY_USE_ANSI_COLORS=ON -DBUILD_STATIC=${BUILD_STATIC} ${_COMPONENT_FLAGS} ) diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL index 2f782f048..9942c9463 100644 --- a/ports/magnum-extras/CONTROL +++ b/ports/magnum-extras/CONTROL @@ -1,6 +1,6 @@ Source: magnum-extras -Version: 2018.10-1 -Build-Depends: magnum +Version: 2019.01-1 +Build-Depends: magnum[core] Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake index 1a080b566..7941aeee9 100644 --- a/ports/magnum-extras/portfile.cmake +++ b/ports/magnum-extras/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-extras - REF v2018.10 - SHA512 2f1164e321ceff9ae526cb2bae961147f52f56b35ea837c29ba0153f418a269056f469415ca0393dfb8fa5d916e92130aaccc61105d18e3f242820d13478eb33 + REF v2019.01 + SHA512 b7116e53a6132c937ad1dc10d251d0b98884375a14e947c5ddfa046cd7a8e7e60eddf2802e1c945168fcb42d78fb13639fe65ea259c6a44f064e6065ee5ae3af HEAD_REF master ) diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL index 6fdb5c5cd..da379258c 100644 --- a/ports/magnum-integration/CONTROL +++ b/ports/magnum-integration/CONTROL @@ -1,6 +1,6 @@ Source: magnum-integration -Version: 2018.10-1 -Build-Depends: magnum +Version: 2019.01-1 +Build-Depends: magnum[core] Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: @@ -11,6 +11,10 @@ Build-Depends: bullet3 Feature: glm Description: GlmIntegration library Build-Depends: glm + +Feature: imgui +Description: ImGuiIntegration library +Build-Depends: imgui #Feature: ovr #Description: OvrIntegration library #Build-Depends: ovrsdk diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake index 1e1ba801a..60231be97 100644 --- a/ports/magnum-integration/portfile.cmake +++ b/ports/magnum-integration/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-integration - REF v2018.10 - SHA512 2743eb7ee377350e85c1112f5c81850922748f50dc2d5409ccb05bec2b3246c91b8e149891a72a8319125a9843b408fd8254efaffaed2100a425e3e7ef426bbe + REF v2019.01 + SHA512 4f892c30c3824aea5d51b9178ca5001b97eb89659b45ac6f5f2182ea2a3a8ff54d80e6b143679ea7f5a07c408afb480d11895c6e7afdc9003951f68e14000f9f HEAD_REF master ) diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index 0aa1b075c..c109f7edf 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,6 +1,6 @@ Source: magnum-plugins -Version: 2018.10-1 -Build-Depends: magnum +Version: 2019.01-1 +Build-Depends: magnum[core] Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter @@ -26,6 +26,10 @@ Build-Depends: magnum[audio] Feature: drwavaudioimporter Description: DrWavAudioImporter plugin Build-Depends: magnum[audio] +# +#Feature: faad2audioimporter +#Description: Faad2AudioImporter plugin +#Build-Depends: magnum[audio], faad2 Feature: freetypefont Description: FreeTypeFont plugin diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index aa7f120fe..c013a0841 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-plugins - REF v2018.10 - SHA512 0ff79d2451957dd38f6bf9b1ee5b99f5ea9ac2cd993124f0bc4ae3e571d1a9f407876ecf59a34fd1bd86cda991e81e6632925b7a289e30b113b457bd1c7a0ae1 + REF v2019.01 + SHA512 482131372671ce0b86b6643f8c584f000db4324fe0f7e32bf9a31febded7b97ab7e947028fe21ce649554d2cff2bc11dfd94fad0006c465911c9f44b28c2d2a5 HEAD_REF master ) diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 8cb02ccc2..29db869a3 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,8 +1,8 @@ Source: magnum -Version: 2018.10-1 -Build-Depends: corrade[pluginmanager], corrade[utility] +Version: 2019.01-1 +Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ -Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shapes, text, texturetools, trade, sdl2application +Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application Feature: al-info Description: magnum-al-info utility @@ -14,7 +14,7 @@ Build-Depends: magnum[trade] Feature: anyaudioimporter Description: AnyAudioImporter plugin -Build-Depends: magnum[audio] +Build-Depends: magnum[audio], corrade[pluginmanager] Feature: anyimageconverter Description: AnyImageConverter plugin @@ -50,10 +50,6 @@ Feature: glfwapplication Description: GlfwApplication library Build-Depends: glfw3 -Feature: glutapplication -Description: GlutApplication library -Build-Depends: freeglut, magnum[gl] - Feature: imageconverter Description: magnum-imageconverter utility Build-Depends: magnum[trade] @@ -90,9 +86,6 @@ Feature: sdl2application Description: Sdl2Application library Build-Depends: sdl2 -Feature: shapes -Description: Shapes library - Feature: scenegraph Description: SceneGraph library @@ -102,7 +95,7 @@ Build-Depends: magnum[gl] Feature: text Description: Text library -Build-Depends: magnum[texturetools], magnum[gl] +Build-Depends: magnum[texturetools], magnum[gl], corrade[pluginmanager] Feature: texturetools Description: TextureTools library @@ -113,6 +106,7 @@ Build-Depends: magnum[trade] Feature: trade Description: Trade library +Build-Depends: corrade[pluginmanager] Feature: wavaudioimporter Description: WavAudioImporter plugin diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index e7f2833e7..9b8d3b424 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum - REF v2018.10 - SHA512 3c0998fc3600cb3799e89b4b97f6640e9b7ea9eb0ba937a2ccc0a9e5411f7dc466524a56a49ec04993530703e6688292af042a9aa6452af37f20d4449351cd96 + REF v2019.01 + SHA512 1edce0a38af90bd456a827b073d30d470a13b47797d62ba22001643be7519722c6886498a63be5e2ee65b8649a7eb2c217bbe2cd36ab4f4523d91aaee573ffd5 HEAD_REF master ) -- cgit v1.2.3 From f5f4070c9659c1fa63e45fea6f74104bc5eaec42 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Mon, 11 Feb 2019 14:12:45 -0800 Subject: Add spirv-cross to tools directory (#4532) --- ports/spirv-cross/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake index 8ed881d41..6495e82bc 100644 --- a/ports/spirv-cross/portfile.cmake +++ b/ports/spirv-cross/portfile.cmake @@ -23,6 +23,9 @@ foreach(COMPONENT core cpp glsl hlsl msl reflect util) vcpkg_fixup_cmake_targets(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake TARGET_PATH share/spirv_cross_${COMPONENT}) endforeach() +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*") +file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + # cleanup configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/spirv-cross/copyright COPYONLY) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -- cgit v1.2.3 From 10bde77210cc5360cdc455ec961e4bfab54592ea Mon Sep 17 00:00:00 2001 From: Calum Robinson Date: Mon, 11 Feb 2019 22:23:46 +0000 Subject: [osg] Add Collada model support to OpenSceneGraph (#3950) * [collada-dom] Initial collada-dom port * [osg] Add Collada file support --- ports/collada-dom/CONTROL | 4 + ports/collada-dom/portfile.cmake | 27 ++++++ ports/collada-dom/use-uriparser.patch | 127 +++++++++++++++++++++++++++ ports/collada-dom/vs-version-detection.patch | 39 ++++++++ ports/osg/CONTROL | 4 + ports/osg/collada.patch | 76 ++++++++++++++++ ports/osg/portfile.cmake | 2 + 7 files changed, 279 insertions(+) create mode 100644 ports/collada-dom/CONTROL create mode 100644 ports/collada-dom/portfile.cmake create mode 100644 ports/collada-dom/use-uriparser.patch create mode 100644 ports/collada-dom/vs-version-detection.patch create mode 100644 ports/osg/collada.patch diff --git a/ports/collada-dom/CONTROL b/ports/collada-dom/CONTROL new file mode 100644 index 000000000..6625c5a4a --- /dev/null +++ b/ports/collada-dom/CONTROL @@ -0,0 +1,4 @@ +Source: collada-dom +Version: 2.5.0 +Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document. +Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system \ No newline at end of file diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake new file mode 100644 index 000000000..2612eca68 --- /dev/null +++ b/ports/collada-dom/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/collada-dom-2.5.0) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rdiankov/collada-dom + REF d37ae7532e350b87c88712e9f6ab4b1f440d20cd + SHA512 cb923d296219765096f5246cc7a2b69712931f58171ae885dbdbd215fca86d911c34d12748d3304d6a5a350dc737ff0caead2495acac488af5431b437cbacc7d + HEAD_REF v2.5.0 + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/vs-version-detection.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-uriparser.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/collada_dom-2.5") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION + ${CURRENT_PACKAGES_DIR}/share/collada-dom + RENAME copyright) \ No newline at end of file diff --git a/ports/collada-dom/use-uriparser.patch b/ports/collada-dom/use-uriparser.patch new file mode 100644 index 000000000..6de0662ef --- /dev/null +++ b/ports/collada-dom/use-uriparser.patch @@ -0,0 +1,127 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ec1527..3f044d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -237,23 +237,29 @@ else() + set(MINIZIP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dom/external-libs/minizip-1.1 ${ZLIB_INCLUDE_DIR}) + endif() + +-pkg_check_modules(liburiparser liburiparser) +- +-if(liburiparser_FOUND) +- set(liburiparser_CFLAGS_OTHERS "-DUSE_URIPARSER") ++find_package(UriParser) ++if(URIPARSER_FOUND) ++ set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER") ++ set(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY}) ++ message(STATUS "liburiparser found") + else() +- # try using pcrecpp +- pkg_check_modules(libpcrecpp libpcrecpp) +- if( libpcrecpp_FOUND ) ++ pkg_check_modules(liburiparser liburiparser) ++ if(liburiparser_FOUND) ++ set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER") ++ message(STATUS "liburiparser found") ++ else() ++ # try using pcrecpp ++ pkg_check_modules(libpcrecpp libpcrecpp) ++ if( libpcrecpp_FOUND ) + set(CMAKE_REQUIRED_INCLUDES ${libpcrecpp_INCLUDE_DIRS}) + check_include_file_cxx(pcrecpp.h HAVE_PCRECPP_H) + set(CMAKE_REQUIRED_INCLUDES) + if( NOT HAVE_PCRECPP_H ) +- set(libpcrecpp_FOUND 0) ++ set(libpcrecpp_FOUND 0) ++ endif() + endif() +- endif() + +- if( NOT libpcrecpp_FOUND ) ++ if( NOT libpcrecpp_FOUND ) + message(STATUS "System pcre not found, using local from sources") + # include the local pcre + add_subdirectory(dom/external-libs/pcre-8.02) +@@ -262,6 +268,7 @@ else() + set(libpcrecpp_LIBRARIES pcrecpp_local) + set(libpcrecpp_CFLAGS_OTHERS "-DPCRE_STATIC") + set(libpcrecpp_LDFLAGS_OTHERS) ++ endif() + endif() + endif() + +diff --git a/cmake-modules/FindUriParser.cmake b/cmake-modules/FindUriParser.cmake +new file mode 100644 +index 0000000..91f466b +--- /dev/null ++++ b/cmake-modules/FindUriParser.cmake +@@ -0,0 +1,35 @@ ++# Find the UriParser library ++# Defines: ++ ++# URIPARSER_INCLUDE_DIR - uriparser include directory ++# URIPARSER_LIBRARY - uriparser library file ++# URIPARSER_FOUND - TRUE if uriparser is found ++ ++if (URIPARSER_INCLUDE_DIR) ++ #check cache ++ set(URIPARSER_FIND_QUIETLY TRUE) ++endif () ++ ++if (NOT URIPARSER_INCLUDE_DIR) ++ find_path(URIPARSER_INCLUDE_DIR NAMES Uri.h PATH_SUFFIXES uriparser) ++ set(URIPARSER_INCLUDE_DIR ${URIPARSER_INCLUDE_DIR}/uriparser CACHE PATH "uriparser includes") ++endif () ++ ++find_library(URIPARSER_LIBRARY NAMES uriparser) ++ ++if (URIPARSER_INCLUDE_DIR AND URIPARSER_LIBRARY) ++ set(URIPARSER_FOUND TRUE) ++ set(UriParser_FOUND TRUE) ++endif () ++ ++if (URIPARSER_FOUND) ++ if (NOT URIPARSER_FIND_QUIETLY) ++ message(STATUS "Found UriParser library: ${URIPARSER_LIBRARY}") ++ endif () ++else () ++ if (NOT URIPARSER_FIND_QUIETLY) ++ message(FATAL_ERROR "Could NOT find UriParser library") ++ else () ++ message(STATUS "Could NOT find UriParser library") ++ endif () ++endif () +diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt +index f7ffb27..62e1b8a 100644 +--- a/dom/CMakeLists.txt ++++ b/dom/CMakeLists.txt +@@ -1,6 +1,6 @@ + set(COLLADA_INTERNAL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include) + include_directories(${COLLADA_INTERNAL_INCLUDE}) +-set(COLLADA_LIBS minizip ${liburiparser_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ++set(COLLADA_LIBS minizip ${URIPARSER_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) + + file(GLOB dae_files ${CMAKE_CURRENT_SOURCE_DIR}/src/dae/*.cpp) + if( LIBXML2_FOUND ) +@@ -13,7 +13,7 @@ file(GLOB stddatabase_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/STLDatabase/ + file(GLOB stderrplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/stdErrPlugin/*.cpp) + + set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files}) +-set(COLLADA_COMPILE_FLAGS "${liburiparser_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}") ++set(COLLADA_COMPILE_FLAGS "${URIPARSER_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}") + # create dynamic libraries + set(COLLADA_COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS} -DDOM_DYNAMIC -DDOM_EXPORT") + +diff --git a/dom/src/dae/daeURI.cpp b/dom/src/dae/daeURI.cpp +index 3a8f815..1623753 100644 +--- a/dom/src/dae/daeURI.cpp ++++ b/dom/src/dae/daeURI.cpp +@@ -790,7 +790,7 @@ bool cdom::parseUriRef(const string& uriRef, + scheme = fromRange(uri.scheme); + authority = fromRange(uri.hostText); + path = fromList(uri.pathHead, "/"); +- if (uri.absolutePath != URI_TRUE and uri.hostText.first == NULL) ++ if (uri.absolutePath != URI_TRUE && uri.hostText.first == NULL) + path = path.erase(0, 1); + query = fromRange(uri.query); + fragment = fromRange(uri.fragment); diff --git a/ports/collada-dom/vs-version-detection.patch b/ports/collada-dom/vs-version-detection.patch new file mode 100644 index 000000000..7379f33be --- /dev/null +++ b/ports/collada-dom/vs-version-detection.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2596a23..3ec1527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.6.0) ++cmake_minimum_required (VERSION 3.7.0) + project (collada-dom) + set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) + +@@ -89,14 +89,22 @@ string(TOUPPER ${COMPONENT_PREFIX} COMPONENT_PREFIX_UPPER) + set(CPACK_COMPONENTS_ALL ${COMPONENT_PREFIX}-base ${COMPONENT_PREFIX}-dev) + + if( MSVC ) +- if( MSVC70 OR MSVC71 ) +- set(MSVC_PREFIX "vc70") +- elseif( MSVC80 ) +- set(MSVC_PREFIX "vc80") +- elseif( MSVC90 ) ++ if( MSVC_VERSION GREATER_EQUAL 1910 ) ++ set(MSVC_PREFIX "vc140") ++ elseif( MSVC_VERSION GREATER_EQUAL 1900 ) ++ set(MSVC_PREFIX "vc130") ++ elseif( MSVC_VERSION GREATER_EQUAL 1800 ) ++ set(MSVC_PREFIX "vc120") ++ elseif( MSVC_VERSION GREATER_EQUAL 1700 ) ++ set(MSVC_PREFIX "vc110") ++ elseif( MSVC_VERSION GREATER_EQUAL 1600 ) ++ set(MSVC_PREFIX "vc100") ++ elseif( MSVC_VERSION GREATER_EQUAL 1500 ) + set(MSVC_PREFIX "vc90") ++ elseif( MSVC_VERSION GREATER_EQUAL 1400 ) ++ set(MSVC_PREFIX "vc80") + else() +- set(MSVC_PREFIX "vc100") ++ set(MSVC_PREFIX "vc70") + endif() + set(COLLADA_DOM_LIBRARY_SUFFIX "${COLLADA_DOM_SOVERSION}-${COLLADA_PRECISION}-${MSVC_PREFIX}-mt") + else() diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index dc9396dd4..2cca0cdaa 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -2,3 +2,7 @@ Source: osg Version: 3.6.2 Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff + +Feature: collada +Description: Support for Collada (.dae) files +Build-Depends: collada-dom diff --git a/ports/osg/collada.patch b/ports/osg/collada.patch new file mode 100644 index 000000000..7c856c86d --- /dev/null +++ b/ports/osg/collada.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake +index 8c9c2fc33..6a8ab04ca 100644 +--- a/CMakeModules/FindCOLLADA.cmake ++++ b/CMakeModules/FindCOLLADA.cmake +@@ -25,11 +25,11 @@ ENDIF() + + IF(APPLE) + SET(COLLADA_BUILDNAME "mac") +- SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) ++ SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) + ELSEIF(MINGW) + SET(COLLADA_BUILDNAME "mingw") +- SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) +-ELSEIF(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION EQUAL 1910 ) ++ SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) ++ELSEIF(MSVC_VERSION GREATER_EQUAL 1900 ) + SET(COLLADA_BUILDNAME "vc14") + SET(COLLADA_BOOST_BUILDNAME "vc140") + ELSEIF(MSVC_VERSION EQUAL 1800) +@@ -58,6 +58,7 @@ ENDIF() + + + FIND_PATH(COLLADA_INCLUDE_DIR dae.h ++ PATHS + ${COLLADA_DOM_ROOT}/include + $ENV{COLLADA_DIR}/include + $ENV{COLLADA_DIR} +@@ -65,27 +66,19 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h + /Library/Frameworks + /opt/local/Library/Frameworks #macports + /usr/local/include +- /usr/local/include/colladadom +- /usr/local/include/collada-dom +- /usr/local/include/collada-dom2.5 +- /usr/local/include/collada-dom2.4 +- /usr/local/include/collada-dom2.2 +- /opt/local/include/collada-dom +- /opt/local/include/collada-dom2.5 +- /opt/local/include/collada-dom2.4 +- /opt/local/include/collada-dom2.2 + /usr/include/ +- /usr/include/colladadom +- /usr/include/collada-dom +- /usr/include/collada-dom2.5 +- /usr/include/collada-dom2.4 +- /usr/include/collada-dom2.2 + /sw/include # Fink + /opt/local/include # DarwinPorts + /opt/csw/include # Blastwave + /opt/include + /usr/freeware/include + ${ACTUAL_3DPARTY_DIR}/include ++ PATH_SUFFIXES ++ colladadom ++ collada-dom ++ collada-dom2.5 ++ collada-dom2.4 ++ collada-dom2.2 + ) + + FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY +diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt +index af03fb866..7eadfc2f3 100644 +--- a/src/osgPlugins/dae/CMakeLists.txt ++++ b/src/osgPlugins/dae/CMakeLists.txt +@@ -49,7 +49,9 @@ ELSE() + ENDIF() + + ADD_DEFINITIONS(-DNO_BOOST) +-ADD_DEFINITIONS(-DCOLLADA_DOM_SUPPORT141) ++ADD_DEFINITIONS(-DCOLLADA_DOM_USING_141 ++ -DCOLLADA_DOM_SUPPORT141 ++ -DCOLLADA_DOM_SUPPORT150) + + IF (COLLADA_DOM_2_4_OR_LATER) + ADD_DEFINITIONS(-DCOLLADA_DOM_2_4_OR_LATER) diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index ca5c18f59..e72b5807b 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -22,6 +22,8 @@ vcpkg_from_github( REF OpenSceneGraph-3.6.2 SHA512 6949dd4dea9dcffe4228086b72eafdb253bf1403b3b7a70a4727848c3cde23ad0270f41b1c3e2bdbfd410ec067ecce2052a5d26c61b032b6d46ce84b8c931bfb HEAD_REF master + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/collada.patch" ) vcpkg_configure_cmake( -- cgit v1.2.3 From 477ba33fbf421ad5f77d3b3448b23abace576ab1 Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Mon, 11 Feb 2019 17:47:17 -0500 Subject: [rocksdb] Add tbb support (#5142) * Add tbb feature support to rocksdb to enable CLOCK algorithm * Use RocksDB master branch. * Undid RocksDB head requirement. * fix: remove unnecessary FindTbb.cmake --- ports/rocksdb/CONTROL | 4 ++++ ports/rocksdb/portfile.cmake | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 94bcc35fd..8ec367068 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -14,3 +14,7 @@ Description: snappy support in rocksdb Feature: zlib Build-Depends: zlib Description: zlib support in rocksdb + +Feature: tbb +Build-Depends: tbb +Description: tbb support in rocksdb diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 5f19e0a88..202ef61a8 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -39,6 +39,14 @@ if("zlib" IN_LIST FEATURES) set(WITH_ZLIB ON) endif() +set(WITH_TBB OFF) +set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) + set(ROCKSDB_IGNORE_PACKAGE_TBB FALSE) +endif() + + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -47,6 +55,7 @@ vcpkg_configure_cmake( -DWITH_SNAPPY=${WITH_SNAPPY} -DWITH_LZ4=${WITH_LZ4} -DWITH_ZLIB=${WITH_ZLIB} + -DWITH_TBB=${WITH_TBB} -DWITH_TESTS=OFF -DUSE_RTTI=1 -DROCKSDB_INSTALL_ON_WINDOWS=ON @@ -56,7 +65,7 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB} -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB} - -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_TBB=${ROCKSDB_IGNORE_PACKAGE_TBB} -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE -- cgit v1.2.3 From 349d82eecac51f8349e0fb82a46fc16ef49fc79e Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Tue, 12 Feb 2019 22:40:27 +0100 Subject: [freetype] fix DLL install on Windows (#5354) * [wip] fix DLL install on Windows * change patchfile encoding to UTF-8 --- ports/freetype/0004-Fix-DLL-install.patch | 13 +++++++++++++ ports/freetype/CONTROL | 2 +- ports/freetype/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/freetype/0004-Fix-DLL-install.patch diff --git a/ports/freetype/0004-Fix-DLL-install.patch b/ports/freetype/0004-Fix-DLL-install.patch new file mode 100644 index 000000000..8d70b993f --- /dev/null +++ b/ports/freetype/0004-Fix-DLL-install.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe9bc65..dd8a878 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -478,6 +478,8 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + EXPORT freetype-targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++# DLL is RUNTIME ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION Library/Frameworks + COMPONENT libraries) + install( diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 8afeb5f65..7e18d1a7c 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,4 +1,4 @@ Source: freetype -Version: 2.9.1 +Version: 2.9.1-1 Build-Depends: zlib, bzip2, libpng Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 96e285dec..ace5a062d 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( 0001-Fix-install-command.patch 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch + 0004-Fix-DLL-install.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 07156ed156ccd88352e7264b28ebe92ac1065d48 Mon Sep 17 00:00:00 2001 From: Charles Milette Date: Tue, 12 Feb 2019 19:56:35 -0500 Subject: [detours] new port (#5347) * [detours] new port * [detours] Use PATCHES parameter instead of vcpkg_apply_patches function --- ports/detours/CONTROL | 3 +++ ports/detours/find-jmp-bounds-arm64.patch | 24 ++++++++++++++++++++++++ ports/detours/portfile.cmake | 28 ++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 ports/detours/CONTROL create mode 100644 ports/detours/find-jmp-bounds-arm64.patch create mode 100644 ports/detours/portfile.cmake diff --git a/ports/detours/CONTROL b/ports/detours/CONTROL new file mode 100644 index 000000000..4998741bd --- /dev/null +++ b/ports/detours/CONTROL @@ -0,0 +1,3 @@ +Source: detours +Version: 4.0.1 +Description: Detours is a software package for monitoring and instrumenting API calls on Windows. \ No newline at end of file diff --git a/ports/detours/find-jmp-bounds-arm64.patch b/ports/detours/find-jmp-bounds-arm64.patch new file mode 100644 index 000000000..21390cec0 --- /dev/null +++ b/ports/detours/find-jmp-bounds-arm64.patch @@ -0,0 +1,24 @@ +diff --git a/src/detours.cpp b/src/detours.cpp +index 8345c4d..3cd0e9d 100644 +--- a/src/detours.cpp ++++ b/src/detours.cpp +@@ -974,6 +974,19 @@ inline PBYTE detour_skip_jmp(PBYTE pbCode, PVOID *ppGlobals) + return pbCode; + } + ++inline void detour_find_jmp_bounds(PBYTE pbCode, ++ PDETOUR_TRAMPOLINE *ppLower, ++ PDETOUR_TRAMPOLINE *ppUpper) ++{ ++ // We have to place trampolines within +/- 2GB of code. ++ ULONG_PTR lo = detour_2gb_below((ULONG_PTR)pbCode); ++ ULONG_PTR hi = detour_2gb_above((ULONG_PTR)pbCode); ++ DETOUR_TRACE(("[%p..%p..%p]\n", lo, pbCode, hi)); ++ ++ *ppLower = (PDETOUR_TRAMPOLINE)lo; ++ *ppUpper = (PDETOUR_TRAMPOLINE)hi; ++} ++ + inline BOOL detour_does_code_end_function(PBYTE pbCode) + { + ULONG Opcode = fetch_opcode(pbCode); diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake new file mode 100644 index 000000000..038f8637c --- /dev/null +++ b/ports/detours/portfile.cmake @@ -0,0 +1,28 @@ +include(vcpkg_common_functions) +find_program(NMAKE nmake) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/Detours + REF v4.0.1 + SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87 + HEAD_REF master + PATCHES + find-jmp-bounds-arm64.patch +) + +set(ENV{DETOURS_TARGET_PROCESSOR} "${VCPKG_TARGET_ARCHITECTURE}") + +vcpkg_execute_required_process( + COMMAND ${NMAKE} + WORKING_DIRECTORY ${SOURCE_PATH}/src + LOGNAME build-${TARGET_TRIPLET} +) + +# Detours does not differentiate between Release and Debug builds, use the same binaries for both. +file(INSTALL ${SOURCE_PATH}/lib.${VCPKG_TARGET_ARCHITECTURE}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${SOURCE_PATH}/lib.${VCPKG_TARGET_ARCHITECTURE}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From 0151644a6bb67c916fd0340e78fad3dbd2ec423c Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 12 Feb 2019 20:01:15 -0500 Subject: Upgrade google-cloud-cpp to 0.6.0. (#5367) In this version we can disable the unit and integration tests, though it still tries to find `googletest` so we cannot remove the dependency just yet. --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 8be4a8c33..195d3d6f5 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.5.0 +Version: 0.6.0 Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 94e227c4f..0f8b14d84 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -27,6 +27,7 @@ vcpkg_configure_cmake( OPTIONS -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) -- cgit v1.2.3 From 1207951b7b706c1d2bfb58c7647479b1430719a1 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 18 Jan 2019 14:40:03 -0800 Subject: Updates 2019.01.30 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/args/CONTROL | 2 +- ports/args/portfile.cmake | 4 ++-- ports/asmjit/CONTROL | 2 +- ports/asmjit/portfile.cmake | 4 ++-- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 ++-- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 4 ++-- ports/doctest/CONTROL | 2 +- ports/doctest/portfile.cmake | 4 ++-- ports/eastl/CONTROL | 2 +- ports/eastl/portfile.cmake | 4 ++-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/libuv/CONTROL | 2 +- ports/libuv/portfile.cmake | 4 ++-- ports/mpark-variant/CONTROL | 2 +- ports/mpark-variant/portfile.cmake | 4 ++-- ports/ms-gsl/CONTROL | 2 +- ports/ms-gsl/portfile.cmake | 4 ++-- ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 ++-- ports/rs-core-lib/CONTROL | 2 +- ports/rs-core-lib/portfile.cmake | 4 ++-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 ++-- ports/trompeloeil/CONTROL | 2 +- ports/trompeloeil/portfile.cmake | 4 ++-- ports/unicorn-lib/CONTROL | 2 +- ports/unicorn-lib/portfile.cmake | 4 ++-- ports/unicorn/CONTROL | 2 +- ports/unicorn/portfile.cmake | 4 ++-- ports/zeromq/CONTROL | 2 +- ports/zeromq/portfile.cmake | 4 ++-- 36 files changed, 54 insertions(+), 54 deletions(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index c1cb755b4..2e0e0b9bd 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2019-01-09-1 +Version: 2019-01-30 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. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index bd2e6a0d4..7aca199a0 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 018b4db1d73ec8238e6dc4b17fd9e1fd7468d0ed - SHA512 55cd4bc801a405c9197d4d9bdd906a3742f9f7ef04a70f6f8a41aa8d2f7f6b9c38501265a4a096a12840b2e48ac0bf93d348b6ba8dea05e0801ed4013941f5dd + REF 540e2537b92cd4abfae6ceddfe24304345461f32 + SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2 HEAD_REF master ) diff --git a/ports/args/CONTROL b/ports/args/CONTROL index 7ab2310aa..0fbd02824 100644 --- a/ports/args/CONTROL +++ b/ports/args/CONTROL @@ -1,3 +1,3 @@ Source: args -Version: 2018-10-25 +Version: 2019-01-18 Description: A simple header-only C++ argument parser library. diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake index e319975e0..76e3d5ce7 100644 --- a/ports/args/portfile.cmake +++ b/ports/args/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args - REF a82a9d6c94d7c58d8b96c65bdc1aba09a4f3e5db - SHA512 0a7caf231117827eb2dbbca3d51259c701c1b8da61518565e5cfe379edd03f34a2dac2d35cdba659042e19e7b3076ef4b6aa6e01d2f9b66db59d1672f9f18f12 + REF f68b7e186cd2a020cbddfe3194c1d8ddfeeb1013 + SHA512 affbda6f679257496de3d3f16db4d7e922ca39a0ef88f0c6b8a2803a7c89e7d12761fa8aa80e823e1c6b227936f1e3d5012b3ae82c0a64fb11179c74bb2e1d1c HEAD_REF master ) diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index 0c64640ca..06674892b 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,3 +1,3 @@ Source: asmjit -Version: 2018-12-14 +Version: 2019-01-30 Description: Complete x86/x64 JIT and Remote Assembler for C++ diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index cfd1ed034..21b2ed894 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 3092065f148d951df281d3f0f1b4922e580b3930 - SHA512 4557bcbbe5b49e2303cfccc2ef9acdb59281a13fe9efe28ac49711736dd45db856f9f67aa9ebcf841e631fc83b8b7e14eee08e3a56d6f982fcc24e23b70b7cc5 + REF 1e550aa568da993acb742ac19f2ab691a2806ad5 + SHA512 e5cf195a6b94173b294cd739009128577dd687220b379490c3d1b616fb6220c085192834850913d9dc0a076b433104853ba9d4f8e48ce0705044891fea24039d HEAD_REF master ) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index ac8859a7e..a888cd33e 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.7.38 +Version: 1.7.41 Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index c4ad3be31..153c3170c 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 1.7.38 - SHA512 01f06d007a5a3d65d377b14e57f864c48020e7f109c4f84caf0ef2b37a5dd4843e12de88af68030c17f2ecb1f88da0f8a021b8bea94b812d43925783d4e219d2 + REF 1.7.41 + SHA512 4cd6bf8aae464caadc696ff204da4d60caab3d4d95c058094b1fa499d53bd585dddc853cfc75295f7731f46a2a0e2a94339a2d83e6b21a12e9c80b7c53556ae9 HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 5bd3ed7d7..6efe6545e 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.4.4 +Version: 2.4.5 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 752f36b9f..e19efd450 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.4.4 + REF v.2.4.5 HEAD_REF master - SHA512 16106e6b225fa53f4d825a1c91a05fca27b7b9219126b4328aa74fc2bdead9f145445524f456d230cef18ea2e2fe39f9f725cdf78ed4556270af728be3aa80e8) + SHA512 0a306ba4265a0e68d358e1ca54c597e80b43e72205de161d0971cd5837ca7d48322725d6ec129381e708a1d11fb5697884a5901ac753080fd8d8c08b80b28138) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 65ac705dd..6e2c6242c 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.2.0 +Version: 2.2.2 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index fffe1bb30..2a698a12d 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.2.0 - SHA512 edf35be338194c7abfb991e6bcc766fe9badc1cc0f21dd7147a6a42ecf451ef6a4eaa1e63b46337fb14a8ed9b107fd381e1b3b502039d7d23476b3f52b12d89c + REF 2.2.2 + SHA512 a312365f156de9d137ae3992bbfdd2875d677259c53a319938e3d31af6ad72fae82f75482bda708fe2b93a5a3fd1369e9bca9d84b1309d865387ad27146e4ac3 HEAD_REF master ) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 5159f18fc..a597fe506 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl -Version: 3.12.08 +Version: 3.13.00 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. diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index b447f1d94..63e6ab6fa 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 3.12.08 - SHA512 8135831a16dcc662de04d8053560a40d2ca8e6b44c5b5b6ccabd7b30241ce299b90fc22ad001cefb8e2c81a6b59847157c6e488ce797ee96314a931df468f16a + REF 3.13.00 + SHA512 5a0a0491e98c1ef18d979865c02f46b3252ecf2757d2f9c5bb07181dfb7b45ff1bba900640fce3771aa4ac06a3e432ce514d1d358ff2066261d0197385419ddb HEAD_REF master ) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index eeffbb2a1..d5dd6754a 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2019.01.07.00 +Version: 2019.01.28.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 1303eca30..72b3485ff 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2019.01.07.00 - SHA512 9f5d39947818315b9a951ec261fef3a69f52a380a29f74555b16a11a276cda168effb4026fc38a2dde31117485074e3aa496a7abb8d317ca7f3c667a54d4851e + REF v2019.01.28.00 + SHA512 cdd32d863bd98b31332fbcb25a548407857ffd8e611fb5d243821f43fcf240cb796fb4520dddec5537f398c10492e1ecb03de22f7ec0384b98411e9906f40d09 HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index 1106a3285..611be7070 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.24.1 +Version: 1.25.0 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 6b15dba59..8179c28bb 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.24.1 - SHA512 19cb03a7a62ad2a1f392e1de3e4fdb622e3ac5afe890bfb819c30118f4745f81ecc343d5b633eebb8471fdfb4025652bbface245fd616c55346aae82376f6836 + REF v1.25.0 + SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd HEAD_REF v1.x ) diff --git a/ports/mpark-variant/CONTROL b/ports/mpark-variant/CONTROL index d6cbf380e..45cd9e237 100644 --- a/ports/mpark-variant/CONTROL +++ b/ports/mpark-variant/CONTROL @@ -1,3 +1,3 @@ Source: mpark-variant -Version: 1.3.0 +Version: 1.4.0 Description: an implementation of C++17 std::variant for C++11/14/17. diff --git a/ports/mpark-variant/portfile.cmake b/ports/mpark-variant/portfile.cmake index b400507ee..c6010356e 100644 --- a/ports/mpark-variant/portfile.cmake +++ b/ports/mpark-variant/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mpark/variant - REF v1.3.0 - SHA512 53735d14a9b241d93191fa3b7ac8ed8fb17a8f8766318b2817c4dd1948088377190ca168027a297bae41bb2cc1f6043fe51752d43b8c33badcc9f2df9fa08ece + REF v1.4.0 + SHA512 598ef21824f9cd7586f88de5a51bfe24dde4c492e8e6b8288d2912920812c48fd01c54d9683e1620cb034563c4eac737a382620e6b4af473808a2e77017a89e3 HEAD_REF master ) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index b17888fd3..913ed8375 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2019-01-15 +Version: 2019-01-18 Description: Microsoft implementation of the Guidelines Support Library diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index a1359d206..b424ec3a7 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF 6418b5f4de2204cd5a335b00d2f8754301b8b382 - SHA512 d585ce18ff190e681f55c53978bd8d84dd0f8ebf0f572a49a38be07c44bd97b6d99c46b9f5fff2455dbd934e242be4a2d6d3ca2ba193358cafa14272d7a6fba8 + REF 7d78b743e43ecba06ca47426d03d9d16076dec16 + SHA512 2174ad6a1eaced41e00f0781d13e68ca981644c20ba66e8e6e10b75d910203d860a93d3e9875a0560a9b7aee88e5703880014af67ab32028bffebb06f79811b7 HEAD_REF master ) diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 46bab0028..b83dc9cba 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2019-01-09 +Version: 2019-01-30 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 95816db3d..e2c284be9 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF 90970542fe952602f42150c6e71d086f5afebcb3 - SHA512 910e8ec958d559e2d71bcc701bdb2ac52e319025470a6690cdf86c10ec385789b81392f61f3d5586f4bc4b686714c05ebe67e5596978c0c6c2e5b4b3694cf8d9 + REF 98ad734aae9996a6dd1aa1fec72e800d621acd51 + SHA512 e28a6b3428ca2714a48194f82f9d6ea4c56b3d4bc776bf3b9402bc081ca8d667f37f4ce98cd89ed1077998f945f1eebee1f501a1acdcb1fb16e741643bc8d8ab HEAD_REF master ) diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 0dbf976ce..ca587479a 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2019-01-09 +Version: 2019-01-30 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index a7eb6a76d..eb7e36a9c 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF fa2144ec238def8d5e08d8489fda6ccfe19a8db1 - SHA512 c6c6405a15e197cc7f335e26193b46f00d3293606c042d7d6a2c50e79aa93c9c2ed14537a71b6dad30c271f80138cb7d294bf85bf0e67cbec6c0709e9f0f624f + REF 0d70c5fcce34b05aa871bd77241315ff3cbed19f + SHA512 58753805178ea92c8863636df88c2b25f1eaadcd5f5a626a589141ac1a429208322c9d965577c6d1035ebd881b0c105c9f75e74636a509e60f9e833cc518b5ca HEAD_REF master ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index f00c0c0e2..2180e3932 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2019-01-09 +Version: 2019-01-30 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 41b2189d7..cd0faf0f1 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF a5df39032ca206e2e6a9ec975147e81746d9a255 - SHA512 765227283477dc0c0d0e94da34f1d11e90ccdfc61752662e9da7c9e4793d655de2a6c42e8e44c488e264b8b1f071c5a1324bb63111d471718c6e85b39b812ddd + REF 2ec93c8a2da2531755078ab6d5a65a96e26cf4c2 + SHA512 6e6787e04ec963516be669511a18e128e5aff19bf33c70b37d9488b4abf42c20de75c8e72d60a81e679dea2faa8abe526deb71a6fc8ef7ba27216990be07c22c HEAD_REF master ) diff --git a/ports/trompeloeil/CONTROL b/ports/trompeloeil/CONTROL index 4c7b96ec1..d719459fa 100644 --- a/ports/trompeloeil/CONTROL +++ b/ports/trompeloeil/CONTROL @@ -1,4 +1,4 @@ Source: trompeloeil -Version: 32-1 +Version: 33 Description: A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0 For issues/pull requests/questions visit https://github.com/rollbear/trompeloeil diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake index a499ad4de..ded47bf85 100644 --- a/ports/trompeloeil/portfile.cmake +++ b/ports/trompeloeil/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rollbear/trompeloeil - REF v32 - SHA512 001660b540880d9b1777d41ceb564b603a8d442649da86f9272e34cc642e10b43217ffadbc7d7fa7d32cb60dcc3daa0be17f86d5de48e8fce25f8681c645025d + REF v33 + SHA512 944f8ee3d2c11877e56cfef7cbcf217ce88dbf8e426a39bba4c74c00057647503394ee9736ce19b0653cd8bba83ac717ea251155e665d3810bd5aba5133ac1b3 HEAD_REF master PATCHES disable_master_project.patch ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index 11845151a..6deb2ea41 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2019-01-09 +Version: 2019-01-30 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index a982e1a24..68f14fef2 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF a1e3df0dd62004c244d00825867aea30c83d678e - SHA512 febc79ba30ba023f24a8b5ae01465bf353457d37cfccbdaebeabde16f7a4758a8acd8f9c6ddd9f453fc0918b6c02631a45107f322297ea0e32ac46c548d9e7b3 + REF e5e6615ce4297a8b385884c21c1b78a6515cb766 + SHA512 bdffd177d106882f1dcb59ac9dcecb985a8b6f9cec8dc44ff1eea3201bed1258e760a964163fed3514aa661a4be4bd92a0c437d769dbdffa04693a870ecf355c HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index f01523040..ea9008367 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2019-01-09 +Version: 2019-01-30 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 93c4d8f34..4eabb25be 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF ac0cd2144df92a487acd98a43b1d7880a3044835 - SHA512 68bd31beabdad80e80e049159a9345cd7a6830a01f63f813612a14802fe1d8bcf2f7089e120b2cd0ebd432fe0b17adc2cd9177485c694c7d963beae10580446b + REF 3df5ef8ab1cffc43fab461bfd24e42ae6c5919cf + SHA512 0b3037138075ad1bdc3be38295308dc15b5930b3c5de10cd0ac203e159b2dd0423ab74fe1a53e1922a5c809b2862e17b8a8d8d921335687755c1d210e21e4d0e HEAD_REF master ) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index 2fe693a12..85bee72f7 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2019-01-09 +Version: 2019-01-30 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 929df2718..2ceba5e3a 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF 3154f3eab7fee360991e244c2d710f274e0ad4d9 - SHA512 c964add0fb93965bc26f6e981908dd2c8c321ed9857621a4f8a35145a4cd0f087298db0eddf659f4e91e0c4c1641edbba00a3771e520771bfdcbe8fb925cfb05 + REF 19b64709bbf9f119d66cdacb9c0e89e4becd9775 + SHA512 7743097d6251764b911e586a9f857331b834b7223d6c3f2630fec71c310ba2927118410ab6c270c07d87329c15dd00fd89c843f20eb22d6c042d83b740c5e34e HEAD_REF master ) -- cgit v1.2.3 From 51653d2506b5bb68cbc5018fa5de44f69217ec3b Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 12 Feb 2019 18:27:03 -0800 Subject: [grpc] Update to v1.18.0 --- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index f7a46c9f6..274faed53 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.17.1 +Version: 1.18.0 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 77db34226..492025ff3 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.17.1 - SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e + REF v1.18.0 + SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52 HEAD_REF master PATCHES fix-uwp.patch ) -- cgit v1.2.3 From 4f7460f685e9f54667cdf62c51e65ac079676c83 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Thu, 14 Feb 2019 19:22:04 +0100 Subject: [tiff] Disable libwebp support. (#5348) * [tiff]: disable libwebp support. Since version 4.0.10, libtiff supports optional compression modes using either libweb or zstd. When libtiff is built, and libwebp and/or zstd are found anywhere on the system, these modes will be enabled. However, the respective libraries are not added as link targets, so this will result in linker errors for any unsuspecting project using libtiff. Since zstd support was already disabled by a previous commit, I have also simply disabled libwebp support to fix this issue. A more proper fix might be to add both libwebp and zstd as required libtiff dependencies, and to patch libtiff's CMakeLists.txt, such that these libraries are properly linked to. However, it is currently very unlikely to encounter TIFF images in the wild compressed using either of these methods, so the effect of disabling support may not be noticeable at all. * [tiff] Change CONTROL version --- ports/tiff/CONTROL | 2 +- ports/tiff/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 45499f1fd..9723ea8b8 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.10-1 +Version: 4.0.10-2 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 6e46ee6d2..d51d772ca 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_configure_cmake( -DBUILD_TESTS=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF + -Dwebp=OFF -Dzstd=OFF ${TIFF_CXX_TARGET} ) -- cgit v1.2.3 From 26e8a0d3793927307467637d63b105b201ca21d3 Mon Sep 17 00:00:00 2001 From: Helco Date: Thu, 14 Feb 2019 19:25:00 +0100 Subject: Fix uvw.hpp not being installed (#5355) --- ports/uvw/CONTROL | 2 +- ports/uvw/portfile.cmake | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL index 1fc066ee2..0a055ad8b 100644 --- a/ports/uvw/CONTROL +++ b/ports/uvw/CONTROL @@ -1,3 +1,3 @@ Source: uvw -Version: 1.11.2 +Version: 1.11.3 Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake index 0cbacec21..e7d2c9b00 100644 --- a/ports/uvw/portfile.cmake +++ b/ports/uvw/portfile.cmake @@ -13,6 +13,11 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/include ) +file(INSTALL + ${SOURCE_PATH}/src/uvw.hpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + # Handle copyright/readme/package files file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw RENAME copyright) file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw) -- cgit v1.2.3 From 1daccb57b771d50368568245b95d205d5518b17f Mon Sep 17 00:00:00 2001 From: John Travers Date: Thu, 14 Feb 2019 22:50:08 +0000 Subject: [fftw3] Add openmp to fftw3 (#4351) --- ports/fftw3/CONTROL | 3 +++ ports/fftw3/omp_test.patch | 17 +++++++++++++++++ ports/fftw3/portfile.cmake | 13 +++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 ports/fftw3/omp_test.patch diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL index a0ed88124..55cd702d2 100644 --- a/ports/fftw3/CONTROL +++ b/ports/fftw3/CONTROL @@ -1,3 +1,6 @@ Source: fftw3 Version: 3.3.8 Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST). + +Feature: openmp +Description: Builds openmp enabled lib \ No newline at end of file diff --git a/ports/fftw3/omp_test.patch b/ports/fftw3/omp_test.patch new file mode 100644 index 000000000..6123798a2 --- /dev/null +++ b/ports/fftw3/omp_test.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f3cfc20..9826bff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -385,6 +385,12 @@ if (BUILD_TESTS) + target_link_libraries (bench ${fftw3_lib}) + endif () + ++ if (ENABLE_OPENMP) ++ target_link_libraries (bench ${fftw3_lib}_omp) ++ else () ++ target_link_libraries (bench ${fftw3_lib}) ++ endif () ++ + + enable_testing () + diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index ca3201ec3..4efb47075 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -17,12 +17,25 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/omp_test.patch +) + +if ("openmp" IN_LIST FEATURES) + set(ENABLE_OPENMP ON) +else() + set(ENABLE_OPENMP OFF) +endif() + foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -D${PRECISION}=ON + -DENABLE_OPENMP=${ENABLE_OPENMP} ) vcpkg_install_cmake() -- cgit v1.2.3 From d10bf0f6c4affb57d116370175c96a21516e8a16 Mon Sep 17 00:00:00 2001 From: emptyVoid Date: Fri, 15 Feb 2019 07:26:05 +0700 Subject: [opencv] Add feature for building with TBB as parallel framework (#5123) --- ports/opencv/CONTROL | 4 ++++ ports/opencv/portfile.cmake | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 41e73b195..4727d4370 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -37,6 +37,10 @@ Description: prebuilt ffmpeg support for opencv Feature: ipp Description: Enable Intel Integrated Performance Primitives +Feature: tbb +Build-Depends: tbb +Description: Enable Intel Threading Building Blocks + Feature: qt Build-Depends: qt5 Description: Qt GUI support for opencv diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 6fbb535cf..42ac28183 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -145,6 +145,11 @@ if("ipp" IN_LIST FEATURES) endif() endif() +set(WITH_TBB OFF) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) +endif() + set(WITH_QT OFF) if("qt" IN_LIST FEATURES) set(WITH_QT ON) @@ -299,6 +304,7 @@ vcpkg_configure_cmake( -DWITH_PNG=${WITH_PNG} -DWITH_PROTOBUF=${WITH_PROTOBUF} -DWITH_QT=${WITH_QT} + -DWITH_TBB=${WITH_TBB} -DWITH_TIFF=${WITH_TIFF} -DWITH_VTK=${WITH_VTK} -DWITH_WEBP=${WITH_WEBP} -- cgit v1.2.3 From f9c461cecea07a7cee49547074447fa90e9ea9e9 Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Thu, 14 Feb 2019 18:36:29 -0800 Subject: [range-v3] Update to latest (#5365) --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index 076c71211..7dce06170 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0-20181129 +Version: 0.4.0-20190212 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index f7577c9bb..ed54a04cf 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF cf8add9f467aac695b9fa38e168b90df36b1a806 - SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2 + REF c0a1924a3f30bff8c86086849245b6e7ba79b4dd + SHA512 ce7ee4b268db98a21fc1210deb2bb79c6b18b1fc5ce7300d64c8b72b97979c9fb8137af910fe42711e3dc9c1405bbc1bc8a15f3223f9ef5ad8416950f4f1576e HEAD_REF master ) -- cgit v1.2.3 From 04263dd7a435030e2e87b0ab12432d14a0747c5c Mon Sep 17 00:00:00 2001 From: Jon Spencer Date: Fri, 15 Feb 2019 10:57:37 -0800 Subject: [spirv-tools] install executables on linux and macos (#5373) --- ports/spirv-tools/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 11d332a39..bbfdbf242 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*${CMAKE_EXECUTABLE_SUFFIX}") file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) file(REMOVE ${EXES}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -- cgit v1.2.3 From ed3b364917ff051885ff4b39eb4ed5ca4087c31b Mon Sep 17 00:00:00 2001 From: Jon Spencer Date: Fri, 15 Feb 2019 11:09:02 -0800 Subject: [shaderc] install executable files on linux and macos (#5372) --- ports/shaderc/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index d3ed5d023..c77110dbe 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -36,7 +36,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*${CMAKE_EXECUTABLE_SUFFIX}") file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) #Safe to remove as libs are static -- cgit v1.2.3 From 84a6baab2652d3703152c9a687ccb1add0456900 Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Fri, 15 Feb 2019 15:57:48 -0600 Subject: [xtensor] Upgrade xtensor, xsimd, and xtl (#5338) One patch down, accepted by upstream. --- ports/xsimd/CONTROL | 2 +- ports/xsimd/PatchHeaderIncludeGuard.patch | 24 ------------------------ ports/xsimd/portfile.cmake | 5 ++--- ports/xtensor/CONTROL | 2 +- ports/xtensor/portfile.cmake | 4 ++-- ports/xtl/CONTROL | 2 +- ports/xtl/portfile.cmake | 4 ++-- 7 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 ports/xsimd/PatchHeaderIncludeGuard.patch diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL index f75d920ab..e5f8d0f14 100644 --- a/ports/xsimd/CONTROL +++ b/ports/xsimd/CONTROL @@ -1,5 +1,5 @@ Source: xsimd -Version: 7.1.2 +Version: 7.1.3 Description: Modern, portable C++ wrappers for SIMD intrinsics Feature: xcomplex diff --git a/ports/xsimd/PatchHeaderIncludeGuard.patch b/ports/xsimd/PatchHeaderIncludeGuard.patch deleted file mode 100644 index 73ba4a9bf..000000000 --- a/ports/xsimd/PatchHeaderIncludeGuard.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/include/xsimd/stl/algorithms.hpp b/include/xsimd/stl/algorithms.hpp -index 4cb2b79..1590b89 100644 ---- a/include/xsimd/stl/algorithms.hpp -+++ b/include/xsimd/stl/algorithms.hpp -@@ -6,6 +6,9 @@ - * The full license is in the file LICENSE, distributed with this software. * - ****************************************************************************/ - -+#ifndef XSIMD_ALGORITHMS_HPP -+#define XSIMD_ALGORITHMS_HPP -+ - #include "xsimd/memory/xsimd_load_store.hpp" - - namespace xsimd -@@ -126,4 +129,6 @@ namespace xsimd - - #undef XSIMD_LOOP_MACRO - } --} -\ No newline at end of file -+} -+ -+#endif -\ No newline at end of file diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index 7e128cd8f..3b51bd9a8 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -5,10 +5,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO QuantStack/xsimd - REF 7.1.2 - SHA512 9479eb6188a68388d470e38ec7b08aaeeb03a1028a574258b52e1c39ce0b1b1aaf97a5cb898447f68c989badd23903ba7a059f5daf59160c660ba751d668c0eb + REF 7.1.3 + SHA512 9f0e2babee9a3a80e16440466277bd635a26197f80cdf806312f7e1cc616db59062887566d50b4cdebe3c3ba4d60155b477684177607428aee53e1d5a95de926 HEAD_REF master - PATCHES PatchHeaderIncludeGuard.patch ) if("xcomplex" IN_LIST FEATURES) diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL index 01614cba0..9b84a6ff3 100644 --- a/ports/xtensor/CONTROL +++ b/ports/xtensor/CONTROL @@ -1,5 +1,5 @@ Source: xtensor -Version: 2019-01-20 +Version: 0.19.3 Description: C++ tensors with broadcasting and lazy computing Build-Depends: nlohmann-json, xtl diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index 795bb3ce8..99f52d195 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO QuantStack/xtensor - REF ca0cfdbde852ee61a3ef20076e2733030f3d6479 - SHA512 d960a3c1c3e6c9250c6bc5ed4e641486980a3ffa4179696eabb92fee50673901324cd2174b76cbd74ab07e6f3c175a26cb564b3087863602c3dce0a83a263da6 + REF 0.19.3 + SHA512 e3b0085115252441ef4ddf21ef48ca18c3872c24d7f94d2f7533fa8f4b00dff0b5613946296f9dd4d7db3381ff43b41dd2f1ae3857a409fabd439eade431aba2 HEAD_REF master ) diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL index f5158ebe5..1ee82f60a 100644 --- a/ports/xtl/CONTROL +++ b/ports/xtl/CONTROL @@ -1,4 +1,4 @@ Source: xtl -Version: 0.5.3 +Version: 0.5.4 Build-Depends: nlohmann-json Description: The x template library. diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake index 23a6f9f44..66e504b73 100644 --- a/ports/xtl/portfile.cmake +++ b/ports/xtl/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO QuantStack/xtl - REF 0.5.3 - SHA512 340e10a113d88be81833e8c123835de0fd30bc9b80387cd260edbff5e54ff2d78a72f77ec8803e3031f54f32c7f189a7afc9e0c1b7446fc6340a4482f308ccbf + REF 0.5.4 + SHA512 6181334dda9a2afce4ce2809572605c2f911770f7805a8328e14fa94d4572475c7725f2ead54daec00e62933df6a4c22616a247798c5b7f1f3bd4290945776c8 HEAD_REF master ) -- cgit v1.2.3 From 6e687c3a921ba91b6e5533a653e4faf97bc978b6 Mon Sep 17 00:00:00 2001 From: Jon Spencer Date: Fri, 15 Feb 2019 14:07:08 -0800 Subject: [libunibreak] add missing source files and headers to the package (#5371) --- ports/libunibreak/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/libunibreak/CMakeLists.txt b/ports/libunibreak/CMakeLists.txt index 9ee5437d3..7bbff8f3a 100644 --- a/ports/libunibreak/CMakeLists.txt +++ b/ports/libunibreak/CMakeLists.txt @@ -5,6 +5,7 @@ project(libunibreak) set(libunibreak_srcs src/linebreakdata.c src/linebreakdef.c + src/linebreak.c src/wordbreak.c src/graphemebreak.c src/unibreakbase.c @@ -30,6 +31,8 @@ if(NOT DISABLE_INSTALL_HEADERS) src/linebreakdef.h src/wordbreak.h src/wordbreakdef.h + src/unibreakbase.h + src/unibreakdef.h DESTINATION include ) endif() -- cgit v1.2.3 From 7a18088cf2c513863761200b0d01f20be8bfa2c2 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 15 Feb 2019 14:32:07 -0800 Subject: [vcpkg create, docs] Update create command's template and documentation on patching (#5370) --- docs/examples/patching.md | 10 +++++----- scripts/templates/portfile.in.cmake | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/docs/examples/patching.md b/docs/examples/patching.md index 98115400e..b152231e2 100644 --- a/docs/examples/patching.md +++ b/docs/examples/patching.md @@ -147,11 +147,11 @@ Finally, we need to apply the patch after extracting the source. ```cmake # ports\libpng\portfile.cmake ... -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "use-abort-on-all-platforms.patch" ) vcpkg_configure_cmake( diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index e44f53aa8..33f8a4853 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -11,13 +11,24 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@) + vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" SHA512 @SHA512@ ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). + # REF 1.0.0 + # (Optional) Read the docs for how to generate patches at: + # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md + # PATCHES + # 001_port_fixes.patch + # 002_more_port_fixes.patch +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From b316f9e7439f79b685592bb7914bf92c0a972c83 Mon Sep 17 00:00:00 2001 From: JackBister Date: Sat, 16 Feb 2019 23:42:47 +0100 Subject: [sdl2-mixer] Fixes for installing on Linux (#5366) * [sdl2-mixer] Fix libFLAC capitalization * [sdl2-mixer] Only build native_midi on Windows * [sdl2-mixer] Slight modernization; bump control version --- ports/sdl2-mixer/CMakeLists.txt | 18 +++++++++--------- ports/sdl2-mixer/CONTROL | 2 +- ports/sdl2-mixer/portfile.cmake | 18 ++++++++++++------ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 6992521b1..5edb15906 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.1) project(SDL2_MIXER C) find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2) @@ -7,9 +7,7 @@ set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR}) set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY}) # builtin formats -set(SDL_MIXER_DEFINES - MUSIC_WAV - MUSIC_MID_NATIVE) +set(SDL_MIXER_DEFINES MUSIC_WAV) # MP3 support if(SDL_MIXER_ENABLE_MP3) @@ -22,8 +20,8 @@ endif() # FLAC support if(SDL_MIXER_ENABLE_FLAC) - find_path(FLAC_INCLUDE_DIR flac/all.h) - find_library(FLAC_LIBRARY flac) + find_path(FLAC_INCLUDE_DIR FLAC/all.h) + find_library(FLAC_LIBRARY FLAC) list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR}) list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY}) list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC) @@ -62,15 +60,17 @@ add_library(SDL2_mixer music_mikmod.c music_modplug.c music_mpg123.c - music_nativemidi.c music_ogg.c music_smpeg.c music_timidity.c music_wav.c - native_midi/native_midi_common.c - native_midi/native_midi_win32.c version.rc) +if(WIN32) + list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE) + target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c native_midi/native_midi_win32.c) +endif() + set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES}) target_include_directories(SDL2_mixer PRIVATE ${SDL_MIXER_INCLUDES} ./native_midi) diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index 7f953a2f9..4f0c86ff1 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,4 +1,4 @@ Source: sdl2-mixer -Version: 2.0.2-4 +Version: 2.0.2-5 Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2, libflac, mpg123, libmodplug, libvorbis diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 9f6240bcf..c04d63654 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -1,11 +1,16 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_mixer-2.0.2) +set(SDL2_MIXER_VERSION 2.0.2) vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.2.zip" - FILENAME "SDL2_mixer-2.0.2.zip" - SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc) + URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip" + FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip" + SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc +) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SDL2_MIXER_VERSION} +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( @@ -17,7 +22,8 @@ vcpkg_configure_cmake( -DSDL_MIXER_ENABLE_MOD=ON # libmodplug -DSDL_MIXER_ENABLE_OGGVORBIS=ON # libvorbis OPTIONS_DEBUG - -DSDL_MIXER_SKIP_HEADERS=ON) + -DSDL_MIXER_SKIP_HEADERS=ON +) vcpkg_install_cmake() vcpkg_copy_pdbs() -- cgit v1.2.3 From 7e8a854a994f70dc5ad5db7399003fc4a51e47c7 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Sat, 16 Feb 2019 22:45:10 +0000 Subject: [doctest] update to 2.2.3, export cmake config (#5386) * [doctest] update to 2.2.3, export cmake config * [doctest] do not build tests --- ports/doctest/CONTROL | 2 +- ports/doctest/portfile.cmake | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 6e2c6242c..c4afd763a 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.2.2 +Version: 2.2.3 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 2a698a12d..53defc430 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,15 +1,23 @@ -#header-only library include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.2.2 - SHA512 a312365f156de9d137ae3992bbfdd2875d677259c53a319938e3d31af6ad72fae82f75482bda708fe2b93a5a3fd1369e9bca9d84b1309d865387ad27146e4ac3 + REF 2.2.3 + SHA512 764463178ea109d46714751a0e5a74d9896c3cf3f8b8c3424a9252c58d9f2c1a2c7fa7eec68e516fb96f4634ae0078ea00d49d28d45a6331c3ebcbe1ed6b1175 HEAD_REF master ) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/doctest RENAME copyright) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDOCTEST_WITH_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) -# Copy header file -file(INSTALL ${SOURCE_PATH}/doctest/doctest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/doctest) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/doctest/copyright COPYONLY) -- cgit v1.2.3 From 92f57e460a1bd3c054b20970baab19ca358bdd4b Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Sun, 17 Feb 2019 00:46:16 -0800 Subject: [vcpkg] Save failure logs in tombstone in CI tests --- toolsrc/src/vcpkg/build.cpp | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index f39707065..c0afd7772 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -579,28 +579,34 @@ namespace vcpkg::Build #endif } - static void compress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& tmp_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) { auto& fs = paths.get_filesystem(); std::error_code ec; - fs.remove(tmp_archive_path, ec); + fs.remove(destination, ec); Checks::check_exit( - VCPKG_LINE_INFO, !fs.exists(tmp_archive_path), "Could not remove file: %s", tmp_archive_path.u8string()); + VCPKG_LINE_INFO, !fs.exists(destination), "Could not remove file: %s", destination.u8string()); #if defined(_WIN32) auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); System::cmd_execute_clean(Strings::format(R"("%s" a "%s" "%s\*" >nul)", seven_zip_exe.u8string(), - tmp_archive_path.u8string(), - paths.package_dir(spec).u8string())); + destination.u8string(), + source.u8string())); #else System::cmd_execute_clean(Strings::format( - R"(cd '%s' && zip --quiet -r '%s' *)", paths.package_dir(spec).u8string(), tmp_archive_path.u8string())); + R"(cd '%s' && zip --quiet -r '%s' *)", source.u8string(), destination.u8string())); #endif } + static void compress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& destination) + { + compress_directory(paths, paths.package_dir(spec), destination); + } + ExtendedBuildResult build_package(const VcpkgPaths& paths, const BuildPackageConfig& config, const StatusParagraphs& status_db) @@ -711,9 +717,30 @@ namespace vcpkg::Build } else if (result.code == BuildResult::BUILD_FAILED || result.code == BuildResult::POST_BUILD_CHECKS_FAILED) { - // Build failed, so store tombstone archive - fs.create_directories(archive_tombstone_path.parent_path(), ec); - fs.write_contents(archive_tombstone_path, "", ec); + if (!fs.exists(archive_tombstone_path)) + { + // Build failed, store all failure logs in the tombstone. + const auto tmp_log_path = paths.buildtrees / spec.name() / "tmp_failure_logs"; + const auto tmp_log_path_destination = tmp_log_path / spec.name(); + const auto tmp_failure_zip = paths.buildtrees / spec.name() / "failure_logs.zip"; + fs.create_directories(tmp_log_path_destination, ec); + + for (auto &log_file : fs::stdfs::directory_iterator(paths.buildtrees / spec.name())) + { + if (log_file.path().extension() == ".log") + { + fs.copy_file(log_file.path(), tmp_log_path_destination / log_file.path().filename(), fs::stdfs::copy_options::none, ec); + } + } + + compress_directory(paths, tmp_log_path, paths.buildtrees / spec.name() / "failure_logs.zip"); + + fs.create_directories(archive_tombstone_path.parent_path(), ec); + fs.rename_or_copy(tmp_failure_zip, archive_tombstone_path, ".tmp", ec); + + // clean up temporary directory + fs.remove_all(tmp_log_path, ec); + } } return result; -- cgit v1.2.3 From a1e2c81722a4b522850d0eeb12e66ac188dae16b Mon Sep 17 00:00:00 2001 From: Martin Moene Date: Tue, 19 Feb 2019 21:29:28 +0100 Subject: [lest] Add lest v1.34.1 (was: v1.34.0) (#5353) * [lest] Add lest v1.34.0 * [lest] Add lest v1.34.1 To support vcpkg installations, examples now specify folder 'lest' in the include directives, like: #include "lest/lest.hpp". * fix: update hash for lest --- ports/lest/CONTROL | 3 +++ ports/lest/portfile.cmake | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 ports/lest/CONTROL create mode 100644 ports/lest/portfile.cmake diff --git a/ports/lest/CONTROL b/ports/lest/CONTROL new file mode 100644 index 000000000..20913e218 --- /dev/null +++ b/ports/lest/CONTROL @@ -0,0 +1,3 @@ +Source: lest +Version: 1.34.1 +Description: A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant) diff --git a/ports/lest/portfile.cmake b/ports/lest/portfile.cmake new file mode 100644 index 000000000..cb2d9a080 --- /dev/null +++ b/ports/lest/portfile.cmake @@ -0,0 +1,11 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/lest + REF v1.34.1 + SHA512 7f4b0e49c1cf4c55d21752259ee45f9265aba254b9c15f84e77f9ae3e5ef3443abcb43fafe8e16d84bbdffee72dae842de0ed661c2caeb9607fcb188eb3ec7d1 +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/lest RENAME copyright) -- cgit v1.2.3 From 45d21e1254319c31ae7391cd62ccc7aadd454129 Mon Sep 17 00:00:00 2001 From: Lassi Date: Tue, 19 Feb 2019 22:37:19 +0200 Subject: [assimp] added remove debug/share (#5323) * added remove debug/share * removed explicit OFF for framework option * use VCPKG_LIBRARY_LINKAGE to define if using ASSIMP_BUILD_SHARED_LIBS --- ports/assimp/portfile.cmake | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index ecca87277..1dc3b7405 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -17,22 +17,29 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${S set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_SHARED_LIBS "ON") +else() + set(BUILD_SHARED_LIBS "OFF") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_VIEW=OFF -DASSIMP_BUILD_ZLIB=OFF + -DASSIMP_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_INSTALL_PDB=OFF -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include -DZLIB_FOUND=1 OPTIONS_RELEASE - -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/zlib.lib - -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlib.lib + -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/zlib.lib + -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlib.lib OPTIONS_DEBUG - -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib - -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib + -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib + -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib ) vcpkg_install_cmake() @@ -43,6 +50,7 @@ vcpkg_copy_pdbs() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG) string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)" -- cgit v1.2.3 From c18a9ce166c29f6900ba26cba0cdb81456331e21 Mon Sep 17 00:00:00 2001 From: eao197 Date: Tue, 19 Feb 2019 23:42:05 +0300 Subject: [sobjectizer] updated to 5.5.24.2 (#5400) * sobjectizer-v5.5.24 and so5extra-v1.2.2 * sobjectizer updated to v.5.5.24.1 * sobjectizer updated to v.5.5.24.2 --- ports/sobjectizer/CONTROL | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index a0e398e31..8e05a6da9 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.24.1 +Version: 5.5.24.2 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 bf8174bf5..df10f6792 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.24.1) +set(VERSION 5.5.24.2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 a7b8b57626e99588f79e14594dea1cdfe7fea455f01fe4fde9c397b3086c0a9f0c3cb75b531cc8c40a3f38729729ec6764d450ed7fc626ae79e2f2de7cd2a98e + SHA512 50c80efc780850c394f3966f202ce45cde2cbef470ee6ead9c62239a1e9b60b28a970d8b217eca713b09118fbe4a8fc974a35f754d2f3ed395e2752bccd3e330 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From ea720bbf595d48ea610cd32d2064fb0ecf98aa78 Mon Sep 17 00:00:00 2001 From: "Juan C. Santamaria" Date: Wed, 20 Feb 2019 13:23:21 -0500 Subject: [ompl] Add new port (#5350) * [ompl] Add new port Add new port for the https://github.com/ompl/ompl library * [ompl] Disable extra components * [ompl] Disable buggy CMake test --- ports/ompl/001-disable-extra-components.patch | 23 +++++++++++ ports/ompl/CONTROL | 4 ++ ports/ompl/portfile.cmake | 56 +++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 ports/ompl/001-disable-extra-components.patch create mode 100644 ports/ompl/CONTROL create mode 100644 ports/ompl/portfile.cmake diff --git a/ports/ompl/001-disable-extra-components.patch b/ports/ompl/001-disable-extra-components.patch new file mode 100644 index 000000000..b1bb8bc39 --- /dev/null +++ b/ports/ompl/001-disable-extra-components.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbde81b..da11bfe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,12 +173,13 @@ endif() + # R is needed for running Planner Arena locally + find_program(R_EXEC R) + +-add_subdirectory(py-bindings) ++# VCPKG PATCH: Disable extra components from library. ++# add_subdirectory(py-bindings) + add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(demos) +-add_subdirectory(scripts) +-add_subdirectory(doc) ++# add_subdirectory(tests) ++# add_subdirectory(demos) ++# add_subdirectory(scripts) ++# add_subdirectory(doc) + + target_link_flags(ompl) + set(PKG_NAME "ompl") diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL new file mode 100644 index 000000000..082853664 --- /dev/null +++ b/ports/ompl/CONTROL @@ -0,0 +1,4 @@ +Source: ompl +Version: 1.4.1-2 +Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms +Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, eigen3 \ No newline at end of file diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake new file mode 100644 index 000000000..b0814e3b1 --- /dev/null +++ b/ports/ompl/portfile.cmake @@ -0,0 +1,56 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(OMPL_VERSION 1.4.1) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/ompl/ompl/archive/${OMPL_VERSION}.zip" + FILENAME "ompl-${OMPL_VERSION}.zip" + SHA512 2552476e86fdd4d61a5663d401c18f873424127d04d2342f1e0e5d4a15212b952c9de59f1a2483c2c71ee3cc3aadbe1b5912ae7fa262c218dd0b22daadfcd95c +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${OMPL_VERSION} + PATCHES + "001-disable-extra-components.patch" +) +# For some reason, demos and tests are being installed +# even when disabling the correct OMPL options. +# The "001-disable-extra-components.patch" avoids that issue. +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DOMPL_VERSIONED_INSTALL=OFF + -DOMPL_REGISTRATION=OFF + -DOMPL_BUILD_DEMOS=OFF + -DOMPL_BUILD_TESTS=OFF + -DOMPL_BUILD_PYBINDINGS=OFF + -DOMPL_BUILD_PYTESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake) + +# Remove debug distribution +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ompl RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME ompl) -- cgit v1.2.3 From 45c48151d524133cdf1b4a3e5c1543b2b4eb30e2 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Thu, 21 Feb 2019 09:58:33 +1100 Subject: [libics] Add libics (#5398) --- ports/libics/CONTROL | 3 +++ ports/libics/cmakelists.patch | 12 ++++++++++++ ports/libics/portfile.cmake | 23 +++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 ports/libics/CONTROL create mode 100644 ports/libics/cmakelists.patch create mode 100644 ports/libics/portfile.cmake diff --git a/ports/libics/CONTROL b/ports/libics/CONTROL new file mode 100644 index 000000000..5f98c9614 --- /dev/null +++ b/ports/libics/CONTROL @@ -0,0 +1,3 @@ +Source: libics +Version: 1.6.2 +Description: Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject. \ No newline at end of file diff --git a/ports/libics/cmakelists.patch b/ports/libics/cmakelists.patch new file mode 100644 index 000000000..9e7fa498f --- /dev/null +++ b/ports/libics/cmakelists.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -86,7 +86,8 @@ + endif() + + # Install +-install(TARGETS libics libics_static DESTINATION lib) ++install(TARGETS libics DESTINATION bin) ++install(TARGETS libics_static DESTINATION lib) + install(FILES ${HEADERS} DESTINATION include) + + # Unit tests diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake new file mode 100644 index 000000000..9bcf997ed --- /dev/null +++ b/ports/libics/portfile.cmake @@ -0,0 +1,23 @@ +include(vcpkg_common_functions) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO svi-opensource/libics + REF 8d8d2dbe72450cbaf88080b6c0e24a7a4a58009e + SHA512 739668b4d51ddb67d50ed1d41bd6965b90b5e4eafc7ec19e2f1d668f48af6e237f6a1872673e3fec5888efe94c2b321295c4de9502aba1f677fc6d0e0399c141 + HEAD_REF master + PATCHES + cmakelists.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(COPY ${SOURCE_PATH}/GNU_LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libics) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libics/GNU_LICENSE ${CURRENT_PACKAGES_DIR}/share/libics/copyright) \ No newline at end of file -- cgit v1.2.3 From f2eea8f13a846184f56465945d204545597b3c2e Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Thu, 21 Feb 2019 13:46:01 -0600 Subject: Updating HPX to V1.2.1 (#5407) --- ports/hpx/CONTROL | 2 +- ports/hpx/boost-1.69.patch | 36 ------------------------------------ ports/hpx/portfile.cmake | 5 ++--- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 ports/hpx/boost-1.69.patch diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index 5eb1595d2..e99f115ae 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,5 @@ Source: hpx -Version: 1.2.0-1 +Version: 1.2.1-0 Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi Description: The C++ Standards Library for Concurrency and Parallelism HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case. diff --git a/ports/hpx/boost-1.69.patch b/ports/hpx/boost-1.69.patch deleted file mode 100644 index f589ca795..000000000 --- a/ports/hpx/boost-1.69.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/hpx/exception.hpp b/hpx/exception.hpp -index 0c818088c7b..3eeaa579131 100644 ---- a/hpx/exception.hpp -+++ b/hpx/exception.hpp -@@ -50,6 +50,12 @@ namespace hpx - /// Construct a hpx::exception from a boost#system_error. - explicit exception(boost::system::system_error const& e); - -+ /// Construct a hpx::exception from a boost#system#error_code (this is -+ /// new for Boost V1.69). This constructor is required to compensate -+ /// for the changes introduced as a resolution to LWG3162 -+ /// (https://cplusplus.github.io/LWG/issue3162). -+ explicit exception(boost::system::error_code const& e); -+ - /// Construct a hpx::exception from a \a hpx::error and an error message. - /// - /// \param e The parameter \p e holds the hpx::error code the new -diff --git a/src/exception.cpp b/src/exception.cpp -index 52c1cceba6b..cb6535fd008 100644 ---- a/src/exception.cpp -+++ b/src/exception.cpp -@@ -89,6 +89,14 @@ namespace hpx - LERR_(error) << "created exception: " << this->what(); - } - -+ /// Construct a hpx::exception from a boost#system#error_code (this is -+ /// new for Boost V1.69). -+ exception::exception(boost::system::error_code const& e) -+ : boost::system::system_error(e) -+ { -+ LERR_(error) << "created exception: " << this->what(); -+ } -+ - /// Construct a hpx::exception from a \a hpx::error and an error message. - /// - /// \param e The parameter \p e holds the hpx::error code the new diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index d50b18af9..2955905ce 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -8,10 +8,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.2.0 - SHA512 caf2650381856db6a96fd4b120975d94d68d9bb19ada1d6cd076abe2d4aa1418e410167f774a881d95eacd0d46bbd5f90f16a4c77b4a2cf00e5b24ea17bfe670 + REF 1.2.1 + SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7 HEAD_REF master - PATCHES boost-1.69.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From a8e52b1e0597ccbc8f1da1e969501cacb8280daa Mon Sep 17 00:00:00 2001 From: at-2500 Date: Thu, 21 Feb 2019 20:47:54 +0100 Subject: [vtk] Change the runtime dir from tools to bin to fix DLL location (#5150) * [vtk] Change the runtime dir from tools to bin to fix DLL location * Also move the tools on unixoid OS; Fix tool names in targets files * Remove duplicate vcpkg_copy_pdbs() * [vtk] Change version to force rebuild in CI --- ports/vtk/CONTROL | 2 +- ports/vtk/portfile.cmake | 53 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 0eb485dcd..2521ed58c 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-6 +Version: 8.1.0-7 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 7a5536163..8b6123eb7 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -166,7 +166,7 @@ vcpkg_configure_cmake( -DVTK_INSTALL_DATA_DIR=share/vtk/data -DVTK_INSTALL_DOC_DIR=share/vtk/doc -DVTK_INSTALL_PACKAGE_DIR=share/vtk - -DVTK_INSTALL_RUNTIME_DIR=tools + -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON ${ADDITIONAL_OPTIONS} ) @@ -306,12 +306,44 @@ endforeach() # ============================================================================= # Clean-up other directories +# Delete the debug binary TOOL_NAME that is not required +function(_vtk_remove_debug_tool TOOL_NAME) + # on windows, the tools end with .exe + set(filename_win ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) + if(EXISTS ${filename_win}) + file(REMOVE ${filename_win}) + endif() + # on other OS, it doesn't + set(filename_unix ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}) + if(EXISTS ${filename_unix}) + file(REMOVE ${filename_unix}) + endif() + # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake + # to make them point to the release version of the tools + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake" VTK_TARGETS_CONTENT_DEBUG) + string(REPLACE "debug/bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake" "${VTK_TARGETS_CONTENT_DEBUG}") +endfunction() -function(_vtk_remove_tool TOOL_NAME) - set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) - if(EXISTS ${filename}) - file(REMOVE ${filename}) +# Move the release binary TOOL_NAME from bin to tools +function(_vtk_move_release_tool TOOL_NAME) + # on windows, the tools end with .exe + set(old_filename_win "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe") + if(EXISTS ${old_filename_win}) + file(INSTALL ${old_filename_win} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk") + file(REMOVE ${old_filename_win}) endif() + # on other OS, it doesn't + set(old_filename_unix "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}") + if(EXISTS ${old_filename_unix}) + file(INSTALL ${old_filename_unix} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk") + file(REMOVE ${old_filename_unix}) + endif() + # we also have to bend the lines referencing the tools in VTKTargets-release.cmake + # to make them point to the tool folder + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" VTK_TARGETS_CONTENT_RELEASE) + string(REPLACE "bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_RELEASE "${VTK_TARGETS_CONTENT_RELEASE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" "${VTK_TARGETS_CONTENT_RELEASE}") endfunction() set(VTK_TOOLS @@ -329,15 +361,16 @@ set(VTK_TOOLS pvtkpython ) +foreach(TOOL_NAME IN LISTS VTK_TOOLS) + _vtk_remove_debug_tool("${TOOL_NAME}") + _vtk_move_release_tool("${TOOL_NAME}") +endforeach() + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents) string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}") string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}") -foreach(TOOL_NAME IN LISTS VTK_TOOLS) - _vtk_remove_tool("${TOOL_NAME}") -endforeach() - # ============================================================================= # Remove other files and directories that are not valid for vcpkg if(VTK_WITH_ALL_MODULES) @@ -357,3 +390,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk/copyright) + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) -- cgit v1.2.3 From 0396f805607c67b02f4d795f05f031b39afa634c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 21 Feb 2019 11:48:30 -0800 Subject: [gl3w] Update (#3722) --- ports/gl3w/CONTROL | 2 +- ports/gl3w/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL index e8f6fdae1..d2ce04972 100644 --- a/ports/gl3w/CONTROL +++ b/ports/gl3w/CONTROL @@ -1,4 +1,4 @@ Source: gl3w -Version: 8f7f459d +Version: 99ed3211 Description: Simple OpenGL core profile loading Build-Depends: opengl-registry diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index a5a7825b7..c5010491a 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skaslev/gl3w - REF 8f7f459df8725c9614136b49a96023de276219f2 - SHA512 7674008716accb25347c81f755f2db7a885ecb5c51b481e0e8f337bc8ee0949a5a58f5816b27a66535ed4da0b9438ba6a6a84712560c7b1a0f1b2908b4eb81e5 + REF 99ed321100d37032cb6bfa7dd8dea85f10c86132 + SHA512 217f65644c73c33383b09893fa5ede066cc4b1cddab051feac11d7e939dba14ed637b297ea42a0426bc0a1a3bc665998a91c27ca10d28704ce9e2d3d90e73595 HEAD_REF master ) -- cgit v1.2.3 From 434b30185d10a2fd27790d08f0f5678813c09f1c Mon Sep 17 00:00:00 2001 From: xDarKraDx <14582891+xdarkradx@users.noreply.github.com> Date: Thu, 21 Feb 2019 17:39:10 -0500 Subject: Add X-Plane SDK support (#5408) * Add X-Plane SDK support The x-plane SDK website claims that the SDK is only compatible with x64. The PR that adds support for this fails in x86, so I'm disallow x86 builds to align with the x-plane documentation. The x-plane SDK website's examples expect that the sdk headers are at the root of the include path. I'm adjusting this port to align with those samples, as we want examples to "just work" as much as possible. --- ports/x-plane/CONTROL | 3 +++ ports/x-plane/portfile.cmake | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 ports/x-plane/CONTROL create mode 100644 ports/x-plane/portfile.cmake diff --git a/ports/x-plane/CONTROL b/ports/x-plane/CONTROL new file mode 100644 index 000000000..a2b267ed0 --- /dev/null +++ b/ports/x-plane/CONTROL @@ -0,0 +1,3 @@ +Source: x-plane +Version: 3.0.1 +Description: The X-Plane Plugin SDK. \ No newline at end of file diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake new file mode 100644 index 000000000..8946e4eb9 --- /dev/null +++ b/ports/x-plane/portfile.cmake @@ -0,0 +1,44 @@ +include(vcpkg_common_functions) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + message(FATAL_ERROR "the x-plane SDK cannot be built for the x86 architecture") +endif() + +vcpkg_download_distfile( + OUT_SOURCE_PATH + URLS http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK301.zip + FILENAME XPSDK301.zip + SHA512 3044d606039be8230f35a5992d322d4c009b4056f8fb17e929a9f5c2204c084e2c83ddad10801b21727645ec957c8942b83938f81256ec3778dbe75df525e62a +) + +vcpkg_extract_source_archive( + ${OUT_SOURCE_PATH} ${CURRENT_PACKAGES_DIR}/temp/ +) + +file(MAKE_DIRECTORY + ${CURRENT_PACKAGES_DIR}/include/x-plane/ + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug/lib +) + +file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +endif() + +# Handle copyright +file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/x-plane/) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/x-plane/license.txt ${CURRENT_PACKAGES_DIR}/share/x-plane/copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/temp/) \ No newline at end of file -- cgit v1.2.3 From 9ee856b9b8952860c6eeca2715c211431e2f6339 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 22 Feb 2019 00:55:22 +0100 Subject: [mlpack] Add new port (#5409) * [mlpack] Add new port Add new port for the http://www.mlpack.org/ library * Tools optional and static build * Info fix * [mlpack] Use PATCHES parameter instead of apply_patches() --- ports/mlpack/CONTROL | 7 ++ ports/mlpack/cmakelists.patch | 52 +++++++++ ports/mlpack/meta_info_extractor.patch | 189 +++++++++++++++++++++++++++++++++ ports/mlpack/portfile.cmake | 43 ++++++++ 4 files changed, 291 insertions(+) create mode 100644 ports/mlpack/CONTROL create mode 100644 ports/mlpack/cmakelists.patch create mode 100644 ports/mlpack/meta_info_extractor.patch create mode 100644 ports/mlpack/portfile.cmake diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL new file mode 100644 index 000000000..457cb769f --- /dev/null +++ b/ports/mlpack/CONTROL @@ -0,0 +1,7 @@ +Source: mlpack +Version: 3.0.4 +Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms. +Build-Depends: openblas, clapack, boost, armadillo + +Feature: tools +Description: Build command-line executables and tests. diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch new file mode 100644 index 000000000..bc251980a --- /dev/null +++ b/ports/mlpack/cmakelists.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,7 +252,7 @@ + # script Armadillo uses to find these. + if (WIN32) + find_library(LAPACK_LIBRARY +- NAMES lapack liblapack lapack_win32_MT lapack_win32 ++ NAMES clapack lapack liblapack lapack_win32_MT lapack_win32 + PATHS "C:/Program Files/Armadillo" + PATH_SUFFIXES "examples/lib_win32/") + +@@ -261,7 +261,7 @@ + endif () + + find_library(BLAS_LIBRARY +- NAMES blas libblas blas_win32_MT blas_win32 ++ NAMES openblas blas libblas blas_win32_MT blas_win32 + PATHS "C:/Program Files/Armadillo" + PATH_SUFFIXES "examples/lib_win32/") + +@@ -281,6 +281,9 @@ + # Unfortunately this configuration variable is necessary and will need to be + # updated as time goes on and new versions are released. + set(Boost_ADDITIONAL_VERSIONS ++ "1.69.0" "1.69" ++ "1.68.0" "1.68" ++ "1.67.0" "1.67" + "1.66.0" "1.66" + "1.65.1" "1.65.0" "1.65" + "1.64.1" "1.64.0" "1.64" +@@ -307,19 +310,11 @@ + REQUIRED + ) + +-link_directories(${Boost_LIBRARY_DIRS}) +- +-# In Visual Studio, automatic linking is performed, so we don't need to worry +-# about it. Clear the list of libraries to link against and let Visual Studio +-# handle it. +-if (MSVC) +- link_directories(${Boost_LIBRARY_DIRS}) +- set(Boost_LIBRARIES "") +-endif () ++link_directories(${Boost_LIBRARIES}) + + set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) + set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES}) +-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) ++set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES}) + + # For Boost testing framework (will have no effect on non-testing executables). + # This specifies to Boost that we are dynamically linking to the Boost test diff --git a/ports/mlpack/meta_info_extractor.patch b/ports/mlpack/meta_info_extractor.patch new file mode 100644 index 000000000..3a9fa00dd --- /dev/null +++ b/ports/mlpack/meta_info_extractor.patch @@ -0,0 +1,189 @@ +--- a/src/mlpack/core/cv/meta_info_extractor.hpp ++++ b/src/mlpack/core/cv/meta_info_extractor.hpp +@@ -38,50 +38,142 @@ + bool NumClasses> + struct TrainForm; + +-template +-struct TrainFormBase +-{ +- using PredictionsType = PT; +- using WeightsType = WT; +- +- /* A minimum number of parameters that should be inferred */ +- static const size_t MinNumberOfAdditionalArgs = 1; +- +- template +- using Type = RT(Class::*)(SignatureParams..., Ts...); +-}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; +- +-template +-struct TrainForm : public TrainFormBase {}; ++#if _MSC_VER <= 1916 // Visual Studio 2017 version 15.9 or older. ++ // Due to an internal MSVC compiler bug (MSVC ) we can't use two parameter ++ // packs. So we have to write multiple TrainFormBase forms. ++ template ++ struct TrainFormBase4 ++ { ++ using PredictionsType = PT; ++ using WeightsType = WT; ++ ++ /* A minimum number of parameters that should be inferred */ ++ static const size_t MinNumberOfAdditionalArgs = 1; ++ ++ template ++ using Type = RT(Class::*)(T1, T2, Ts...); ++ }; ++ ++ template ++ struct TrainFormBase5 ++ { ++ using PredictionsType = PT; ++ using WeightsType = WT; ++ ++ /* A minimum number of parameters that should be inferred */ ++ static const size_t MinNumberOfAdditionalArgs = 1; ++ ++ template ++ using Type = RT(Class::*)(T1, T2, T3, Ts...); ++ }; ++ ++ template ++ struct TrainFormBase6 ++ { ++ using PredictionsType = PT; ++ using WeightsType = WT; ++ ++ /* A minimum number of parameters that should be inferred */ ++ static const size_t MinNumberOfAdditionalArgs = 1; ++ ++ template ++ using Type = RT(Class::*)(T1, T2, T3, T4, Ts...); ++ }; ++ ++ template ++ struct TrainFormBase7 ++ { ++ using PredictionsType = PT; ++ using WeightsType = WT; ++ ++ /* A minimum number of parameters that should be inferred */ ++ static const size_t MinNumberOfAdditionalArgs = 1; ++ ++ template ++ using Type = RT(Class::*)(T1, T2, T3, T4, T5, Ts...); ++ }; ++ ++ template ++ struct TrainForm : public TrainFormBase4 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase5 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase5 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase6 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase5 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase6 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase6 {}; ++ ++ template ++ struct TrainForm : public TrainFormBase7 {}; ++#else ++ template ++ struct TrainFormBase ++ { ++ using PredictionsType = PT; ++ using WeightsType = WT; ++ ++ /* A minimum number of parameters that should be inferred */ ++ static const size_t MinNumberOfAdditionalArgs = 1; ++ ++ template ++ using Type = RT(Class::*)(SignatureParams..., Ts...); ++ }; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++ ++ template ++ struct TrainForm : public TrainFormBase {}; ++#endif + + /* A struct for indication that a right method form can't be found */ + struct NotFoundMethodForm diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake new file mode 100644 index 000000000..9bd69ed8b --- /dev/null +++ b/ports/mlpack/portfile.cmake @@ -0,0 +1,43 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mlpack/mlpack + REF mlpack-3.0.4 + SHA512 07730a826efb55a41fce2286de8df15421e7a7189b9cdc4699c6a32e3d4b1964a98e3829a60513994ef747640952229e7a3b744ac0ae324f5e5e57f982a86f66 + HEAD_REF master + PATCHES + meta_info_extractor.patch + cmakelists.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MLPACK_SHARED_LIBS) + +set(BUILD_TOOLS OFF) +if("tools" IN_LIST FEATURES) + set(BUILD_TOOLS ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=${BUILD_TOOLS} + -DBUILD_CLI_EXECUTABLES=${BUILD_TOOLS} + -DBUILD_SHARED_LIBS=${MLPACK_SHARED_LIBS} +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlpack RENAME copyright) + +if(BUILD_TOOLS) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) + file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(COPY ${MLPACK_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${MLPACK_TOOLS}) + file(GLOB MLPACK_TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${MLPACK_TOOLS_DEBUG}) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -- cgit v1.2.3 From 3e6ea891e02a8dd9d4b6c2042eb4a5439d44de9a Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 21 Feb 2019 16:34:32 -0800 Subject: [caffe2] Fix linux build (#5385) --- ports/caffe2/CONTROL | 2 +- ports/caffe2/portfile.cmake | 28 ++++++++++------------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL index d09de8e6d..2f40d9825 100644 --- a/ports/caffe2/CONTROL +++ b/ports/caffe2/CONTROL @@ -1,4 +1,4 @@ Source: caffe2 -Version: 0.8.1 +Version: 0.8.1-1 Build-Depends: lmdb, gflags, glog, eigen3, protobuf Description: Caffe2 is a lightweight, modular, and scalable deep learning framework. diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake index fa87542ed..41abd403e 100644 --- a/ports/caffe2/portfile.cmake +++ b/ports/caffe2/portfile.cmake @@ -15,12 +15,8 @@ vcpkg_from_github( REF eab13a2d5c807bf5d49efd4584787b639a981b79 SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch + ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) @@ -29,6 +25,12 @@ else() set(USE_STATIC_RUNTIME OFF) endif() +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -62,7 +64,7 @@ vcpkg_configure_cmake( -DUSE_SNPE=OFF -DUSE_ZMQ=OFF -DBUILD_TEST=OFF - -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe + -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX} ) vcpkg_install_cmake() @@ -86,7 +88,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/binaries) # Move bin to tools file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}) foreach(binary ${BINARIES}) get_filename_component(binary_name ${binary} NAME) file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name}) @@ -95,22 +97,12 @@ endforeach() # Remove bin directory if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) endif() # Remove headers and tools from debug build file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe) -foreach(binary ${BINARIES}) - get_filename_component(binary_name ${binary} NAME) - file(REMOVE ${binary}) -endforeach() - -# Remove bin directory -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - # install license file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 RENAME copyright) -- cgit v1.2.3 From 969299ddbfc9d844a0795a3321e873dc22c221c1 Mon Sep 17 00:00:00 2001 From: Rajeev Massand Date: Thu, 21 Feb 2019 16:46:24 -0800 Subject: [azure] vcpkg update for master release 1.2.14 (#5405) --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 4 ++-- ports/azure-iot-sdk-c/CONTROL | 2 +- 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(+), 15 deletions(-) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 644b33cb6..0b3a6c231 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: 1.1.11-4 +Version: 1.1.11-5 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 20e4b4cf9..ebfb097f5 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -15,8 +15,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 773980d7882e4d5f1e7c9be2a0797d61fbc19da1 - SHA512 fa374db336f5d186bcfd6ba70660167fdc87a1847376579cee894af3d2810aba097b3468e75c0b4213b68423cc07215032eeae6ee07590378237606112286ac4 + REF 6229ecb0d49b7e75fdb88d2c477e94e5b5394c43 + SHA512 b0426702dd7a79e149dd4f6c2b8d0b43cd06a82ce014112dcaba1de4e669157fe08a5f3748d431a9e2f559e066f658c1a62f5ac08d2da0bd1f5cf04dca2e52c2 HEAD_REF master PATCHES no-double-expand-cmake.patch ) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 79eeb16e6..151da2b3e 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-iot-sdk-c -Version: 1.2.13-2 +Version: 1.2.14-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index d3acac400..c672754a9 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 738f160116a689566f6f20e0200a0c3c86e85dee - SHA512 e697fcefaae938c66e6cca5b35b6924bff76f6b147afeffe45acff63aa6e6ed99da53450fc2a1e80700f44928ce3cd3a3e6d3ce72f96a1b22a74557828be1cbc + REF a46d038a9151ff1fc7d9b70f2d7fcca03c19b972 + SHA512 bcd9c656ab721ab15da3cb690772c84e58e09d8785b975b046d4986b5fa16fb9e74a06af00acbe91fd8d4b897cd12dba9b2318ea5465865bff98f5429d2ee618 HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 5b5d08897..7dde811fc 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-uamqp-c -Version: 1.2.11-3 +Version: 1.2.11-4 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 7ccf30f34..8490ec0d4 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 195f2480f31e0a9492e3ff3a7a1eed4a69205ddd - SHA512 fa2cab67d119018b7e28dd002641bc3e87ac2d45ecddeddb867135bac6e5eda02588f84c26283947bdc47789c90a3f9e04dab16e5eb9be8a384ef5c9bcf39572 + REF 32f53b92ab864ea9e54e7ae262dc72bdabfcfa01 + SHA512 3a96feb3d04a2e90b59e897b6da93410de330963c75a0cb875d53b91838c977f6a801f4812b67c4e519059fd04aed9baf43f72258652832cf49b12692a47d188 HEAD_REF master ) endif() diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index 07d6c83e2..ab1b8de01 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-uhttp-c -Version: 1.1.11-3 +Version: 1.1.11-4 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 901489a1d..a4d525fae 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 3a81e598caf2bd37077b7cd20bb45aaa9e694df7 - SHA512 6f12efdd2f02adb2414e10daa0604f5351f7731b997d69a9ca2923b6246c7a628bd859c6dca2503e51eeece851421b7739ffbf31a3f3d34dca4dcbadb54411d2 + REF 2e838f1587d7493f3bb0470b7e21b39c3f7c84ab + SHA512 30114e995bfdfa73dc43d016588290ef886e3c24d586f443d7f82d9c577f7274b5fc4b2ca40c9dd39883262cab30bf5b3e3eb560c27191ec4e9bb893e468bb54 HEAD_REF master ) endif() diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 6f44bd7b6..9729cd209 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-umqtt-c -Version: 1.1.11-3 +Version: 1.1.11-4 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 23ced94b8..6833b5eb4 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF f68e8d535d18028e3e6ed4d806ce8994037a49fa - SHA512 9bea4c3dbd26f5221c4da782954a4e8b4d372aca75b71a9eb63b818f31f153e4be534a20960c007c3aa184766f2a826c5ba11e780e23098707419ab39f055cc1 + REF 6bb14b0a731e5c896758fc2f6ffe3d4bd31d2187 + SHA512 001b04f203327e5096ad3453268939da7738952704a4e0b88ea033b0a2566bec7502b3a674eadf476f9df0da605d25b8a7f6a306e23a42690884188326bd0743 HEAD_REF master ) endif() -- cgit v1.2.3 From 9aad2e8f3342a09bb1c70f552431a129895bd063 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 22 Feb 2019 08:49:17 +0800 Subject: [xeus] Add new port (#5351) * [xeus] Add new port * [xeus] Update to 2019-02-04 * [xeus] Update cryptopp dependency * [xeus] Update to 2019-02-13 * [xeus] Static building support --- ports/xeus/CONTROL | 4 +++ ports/xeus/portfile.cmake | 47 +++++++++++++++++++++++++++++++++ ports/xeus/static-lib.patch | 63 +++++++++++++++++++++++++++++++++++++++++++++ ports/xeus/usage | 4 +++ 4 files changed, 118 insertions(+) create mode 100644 ports/xeus/CONTROL create mode 100644 ports/xeus/portfile.cmake create mode 100644 ports/xeus/static-lib.patch create mode 100644 ports/xeus/usage diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL new file mode 100644 index 000000000..f0581395c --- /dev/null +++ b/ports/xeus/CONTROL @@ -0,0 +1,4 @@ +Source: xeus +Version: 2019-02-13-1 +Description: C++ implementation of the Jupyter kernel protocol +Build-Depends: cppzmq, cryptopp, libuuid (linux), nlohmann-json, xtl, zeromq diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake new file mode 100644 index 000000000..1ba0df8f7 --- /dev/null +++ b/ports/xeus/portfile.cmake @@ -0,0 +1,47 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xeus + REF f78c60c7ce28baecb2479f2b82e4e8d1a6c35188 + SHA512 9d83f32f641bcad4ac96e263c465d46bdfa7d18d41f1e201309244c95587ce08ff2426f7cdd3a4399563d46064ed9bedd4d0babf4840f65e95c6a2c6f23ac9bb + HEAD_REF master + PATCHES + static-lib.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF + -DXEUS_USE_SHARED_CRYPTOPP=OFF # `cryptopp` port currently only supports static linkage. + -DDISABLE_ARCH_NATIVE=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/xeus/xeus.hpp + "#ifdef XEUS_STATIC_LIB" + "#if 1 // #ifdef XEUS_STATIC_LIB" + ) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# Install usage +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# CMake integration test +#vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/xeus/static-lib.patch b/ports/xeus/static-lib.patch new file mode 100644 index 000000000..e9ab41f01 --- /dev/null +++ b/ports/xeus/static-lib.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 26118eb..ccda00b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,12 @@ set(XEUS_SOURCES + # Output + # ====== + +-add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS}) ++option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON) ++if (BUILD_SHARED_LIBS) ++ add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS}) ++else () ++ add_library(xeus STATIC ${XEUS_SOURCES} ${XEUS_HEADERS}) ++endif () + + if (APPLE) + set_target_properties(xeus PROPERTIES +@@ -166,9 +171,9 @@ target_link_libraries(xeus + + OPTION(XEUS_USE_SHARED_CRYPTOPP "Used shared library for cryptopp" OFF) + if (XEUS_USE_SHARED_CRYPTOPP) +- target_link_libraries(xeus PRIVATE cryptopp-shared) ++ target_link_libraries(xeus PUBLIC cryptopp-shared) + else () +- target_link_libraries(xeus PRIVATE cryptopp-static) ++ target_link_libraries(xeus PUBLIC cryptopp-static) + endif () + + if(NOT MSVC) +@@ -226,6 +231,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" + message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") + endif() + ++if (NOT BUILD_SHARED_LIBS) ++ target_compile_definitions(xeus PUBLIC XEUS_STATIC_LIB) ++endif () ++ + if(MSVC) + target_compile_definitions(xeus PUBLIC -DNOMINMAX) + target_compile_options(xeus PUBLIC /DGUID_WINDOWS /MP /bigobj) +diff --git a/include/xeus/xeus.hpp b/include/xeus/xeus.hpp +index 99e1d79..522bb78 100644 +--- a/include/xeus/xeus.hpp ++++ b/include/xeus/xeus.hpp +@@ -10,10 +10,14 @@ + #define XEUS_EXPORT_HPP + + #ifdef _WIN32 +- #ifdef XEUS_EXPORTS +- #define XEUS_API __declspec(dllexport) ++ #ifdef XEUS_STATIC_LIB ++ #define XEUS_API + #else +- #define XEUS_API __declspec(dllimport) ++ #ifdef XEUS_EXPORTS ++ #define XEUS_API __declspec(dllexport) ++ #else ++ #define XEUS_API __declspec(dllimport) ++ #endif + #endif + #else + #define XEUS_API diff --git a/ports/xeus/usage b/ports/xeus/usage new file mode 100644 index 000000000..bac932eb9 --- /dev/null +++ b/ports/xeus/usage @@ -0,0 +1,4 @@ +The package xeus provides CMake targets: + + find_package(xeus CONFIG REQUIRED) + target_link_libraries(main PRIVATE xeus) -- cgit v1.2.3 From 9446cc6729a9afbdcfe010bf0408ab703eee31a9 Mon Sep 17 00:00:00 2001 From: kiwixz Date: Fri, 22 Feb 2019 01:05:19 +0000 Subject: [x265] upgrade to 3.0, enable assembly (upgrade nasm to 2.14) (#5389) * [acquire nasm] upgrade to 2.14 * [x265] upgrade to 3.0, enable assembly * [x265] Enable assembly only on Windows --- ports/x265/CONTROL | 2 +- ports/x265/disable-install-pdb.patch | 2 +- ports/x265/portfile.cmake | 19 +++++++++++++++---- scripts/cmake/vcpkg_find_acquire_program.cmake | 11 ++++------- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index f2185d2f0..ae598d613 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.9-2 +Version: 3.0-1 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/disable-install-pdb.patch b/ports/x265/disable-install-pdb.patch index 1b58d287c..4d57d764b 100644 --- a/ports/x265/disable-install-pdb.patch +++ b/ports/x265/disable-install-pdb.patch @@ -2,7 +2,7 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 33b6523..06e3193 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -556,13 +556,13 @@ endif() +@@ -559,13 +559,13 @@ endif() install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) if(MSVC_IDE) diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 87f11c4f4..6b207baf3 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO multicoreware/x265 - REF 2.9 - SHA512 5bd9732b6af67e7f7c5b1e71d26acbd98fb98e9e81c6052cda2e1e9254e3eaaa28914805d3f8cd2535dd042022047e54f8ae49ea02269160b609d191a7d99e94 + REF 3.0 + SHA512 698fd31bf30c65896717225de69714523bcbd3d835474f777bf32c3a6d6dbbf941a09db076e13e76917a5ca014c89fca924fcb0ea3d15bc09748b6fc834a4ba2 HEAD_REF master ) @@ -13,13 +13,24 @@ vcpkg_apply_patches( PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-install-pdb.patch ) +set(ENABLE_ASSEMBLY OFF) +if (WIN32) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") + set(ENABLE_ASSEMBLY ON) +endif () + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/source PREFER_NINJA - OPTIONS -DENABLE_SHARED=${ENABLE_SHARED} - OPTIONS_DEBUG -DENABLE_CLI=OFF + OPTIONS + -DENABLE_ASSEMBLY=${ENABLE_ASSEMBLY} + -DENABLE_SHARED=${ENABLE_SHARED} + OPTIONS_DEBUG + -DENABLE_CLI=OFF ) vcpkg_install_cmake() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 87b6fb4fe..1f856b69e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -58,15 +58,12 @@ function(vcpkg_find_acquire_program VAR) set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26) elseif(VAR MATCHES "NASM") set(PROGNAME nasm) - set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02) + set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.14) set(BREW_PACKAGE_NAME "nasm") set(APT_PACKAGE_NAME "nasm") - set(URL - "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip" - "http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip" - ) - set(ARCHIVE "nasm-2.12.02-win32.zip") - set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36) + set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.14/win32/nasm-2.14-win32.zip") + set(ARCHIVE "nasm-2.14-win32.zip") + set(HASH 64481b0346b83de8c9568f04a54f68e0f4c71724afa0b414f12e4080951d8c49e489bfc32117f9a489e3e49477b1cadc583c672311316d27c543af304c4b7f2a) elseif(VAR MATCHES "YASM") set(PROGNAME yasm) set(SUBDIR 1.3.0.6) -- cgit v1.2.3 From 8fd34506c3f2d06af8abd8cfbb543ad16e79c6a3 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 21 Feb 2019 22:24:20 -0800 Subject: [vcpkg] improve xunit xml output used in CI tests --- toolsrc/include/vcpkg/install.h | 1 - toolsrc/src/vcpkg/commands.ci.cpp | 235 ++++++++++++++++++++++++++++++++------ toolsrc/src/vcpkg/install.cpp | 10 +- 3 files changed, 204 insertions(+), 42 deletions(-) diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h index b7acbf15f..2e92764dc 100644 --- a/toolsrc/include/vcpkg/install.h +++ b/toolsrc/include/vcpkg/install.h @@ -37,7 +37,6 @@ namespace vcpkg::Install std::string total_elapsed_time; void print() const; - static std::string xunit_result(const PackageSpec& spec, Chrono::ElapsedTime time, Build::BuildResult code); std::string xunit_results() const; }; diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 5ca962744..4ff503e1c 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -52,24 +52,176 @@ namespace vcpkg::Commands::CI nullptr, }; + struct XunitTestResults + { + public: + + XunitTestResults() + { + m_assembly_run_datetime = Chrono::CTime::get_current_date_time(); + } + + void add_test_results(const std::string& spec, const Build::BuildResult& build_result, const Chrono::ElapsedTime& elapsed_time, const std::string& abi_tag) + { + m_collections.back().tests.push_back({ spec, build_result, elapsed_time, abi_tag }); + } + + // Starting a new test collection + void push_collection( const std::string& name) + { + m_collections.push_back({name}); + } + + void collection_time(const vcpkg::Chrono::ElapsedTime& time) + { + m_collections.back().time = time; + } + + const std::string& build_xml() + { + m_xml.clear(); + xml_start_assembly(); + + for (const auto& collection : m_collections) + { + xml_start_collection(collection); + for (const auto& test : collection.tests) + { + xml_test(test); + } + xml_finish_collection(); + } + + xml_finish_assembly(); + return m_xml; + } + + void assembly_time(const vcpkg::Chrono::ElapsedTime& assembly_time) + { + m_assembly_time = assembly_time; + } + + private: + + struct XunitTest + { + std::string name; + vcpkg::Build::BuildResult result; + vcpkg::Chrono::ElapsedTime time; + std::string abi_tag; + }; + + struct XunitCollection + { + std::string name; + vcpkg::Chrono::ElapsedTime time; + std::vector tests; + }; + + void xml_start_assembly() + { + std::string datetime; + if (m_assembly_run_datetime) + { + auto rawDateTime = m_assembly_run_datetime.get()->to_string(); + // The expected format is "yyyy-mm-ddThh:mm:ss.0Z" + // 0123456789012345678901 + datetime = Strings::format(R"(run-date="%s" run-time="%s")", + rawDateTime.substr(0, 10), rawDateTime.substr(11, 8)); + } + + std::string time = Strings::format(R"(time="%lld")", m_assembly_time.as().count()); + + m_xml += Strings::format( + R"()" "\n" + R"( )" "\n" + , datetime, time); + } + void xml_finish_assembly() + { + m_xml += " \n" + "\n"; + } + + void xml_start_collection(const XunitCollection& collection) + { + m_xml += Strings::format(R"( )" + "\n", + collection.name, + collection.time.as().count()); + } + void xml_finish_collection() + { + m_xml += " \n"; + } + + void xml_test(const XunitTest& test) + { + std::string message_block; + const char* result_string = ""; + switch (test.result) + { + case BuildResult::POST_BUILD_CHECKS_FAILED: + case BuildResult::FILE_CONFLICTS: + case BuildResult::BUILD_FAILED: + result_string = "Fail"; + message_block = Strings::format("", to_string(test.result)); + break; + case BuildResult::EXCLUDED: + case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: + result_string = "Skip"; + message_block = Strings::format("", to_string(test.result)); + break; + case BuildResult::SUCCEEDED: + result_string = "Pass"; + break; + default: + Checks::exit_fail(VCPKG_LINE_INFO); + break; + } + + std::string traits_block; + if (test.abi_tag != "") // only adding if there is a known abi tag + { + traits_block = Strings::format(R"()", test.abi_tag); + } + + m_xml += Strings::format(R"( %s%s)" + "\n", + test.name, + test.name, + test.time.as().count(), + result_string, + traits_block, + message_block); + } + + Optional m_assembly_run_datetime; + vcpkg::Chrono::ElapsedTime m_assembly_time; + std::vector m_collections; + + std::string m_xml; + }; + + struct UnknownCIPortsResults { std::vector unknown; std::map known; std::map> features; + std::map abi_tag_map; }; - static UnknownCIPortsResults find_unknown_ports_for_ci(const VcpkgPaths& paths, + static std::unique_ptr find_unknown_ports_for_ci(const VcpkgPaths& paths, const std::set& exclusions, const Dependencies::PortFileProvider& provider, const std::vector& fspecs, const bool purge_tombstones) { - UnknownCIPortsResults ret; + auto ret = std::make_unique(); auto& fs = paths.get_filesystem(); - std::map abi_tag_map; std::set will_fail; const Build::BuildPackageOptions build_options = { @@ -103,9 +255,9 @@ namespace vcpkg::Commands::CI auto dependency_abis = Util::fmap(p->computed_dependencies, [&](const PackageSpec& spec) -> Build::AbiEntry { - auto it = abi_tag_map.find(spec); + auto it = ret->abi_tag_map.find(spec); - if (it == abi_tag_map.end()) + if (it == ret->abi_tag_map.end()) return {spec.name(), ""}; else return {spec.name(), it->second}; @@ -118,13 +270,13 @@ namespace vcpkg::Commands::CI if (auto tag_and_file = maybe_tag_and_file.get()) { abi = tag_and_file->tag; - abi_tag_map.emplace(p->spec, abi); + ret->abi_tag_map.emplace(p->spec, abi); } } else if (auto ipv = p->installed_package.get()) { abi = ipv->core->package.abi; - if (!abi.empty()) abi_tag_map.emplace(p->spec, abi); + if (!abi.empty()) ret->abi_tag_map.emplace(p->spec, abi); } std::string state; @@ -143,35 +295,35 @@ namespace vcpkg::Commands::CI bool b_will_build = false; - ret.features.emplace(p->spec, + ret->features.emplace(p->spec, std::vector {p->feature_list.begin(), p->feature_list.end()}); if (Util::Sets::contains(exclusions, p->spec.name())) { - ret.known.emplace(p->spec, BuildResult::EXCLUDED); + ret->known.emplace(p->spec, BuildResult::EXCLUDED); will_fail.emplace(p->spec); } else if (std::any_of(p->computed_dependencies.begin(), p->computed_dependencies.end(), [&](const PackageSpec& spec) { return Util::Sets::contains(will_fail, spec); })) { - ret.known.emplace(p->spec, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES); + ret->known.emplace(p->spec, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES); will_fail.emplace(p->spec); } else if (fs.exists(archive_path)) { state += "pass"; - ret.known.emplace(p->spec, BuildResult::SUCCEEDED); + ret->known.emplace(p->spec, BuildResult::SUCCEEDED); } else if (fs.exists(archive_tombstone_path)) { state += "fail"; - ret.known.emplace(p->spec, BuildResult::BUILD_FAILED); + ret->known.emplace(p->spec, BuildResult::BUILD_FAILED); will_fail.emplace(p->spec); } else { - ret.unknown.push_back({p->spec, {p->feature_list.begin(), p->feature_list.end()}}); + ret->unknown.push_back({p->spec, {p->feature_list.begin(), p->feature_list.end()}}); b_will_build = true; } @@ -229,23 +381,29 @@ namespace vcpkg::Commands::CI }; std::vector> all_known_results; + std::map abi_tag_map; + + XunitTestResults xunitTestResults; std::vector all_ports = Install::get_all_port_names(paths); std::vector results; + auto timer = Chrono::ElapsedTimer::create_started(); for (const Triplet& triplet : triplets) { Input::check_triplet(triplet, paths); + xunitTestResults.push_collection(triplet.canonical_name()); + Dependencies::PackageGraph pgraph(paths_port_file, status_db); std::vector specs = PackageSpec::to_package_specs(all_ports, triplet); // Install the default features for every package - auto all_fspecs = Util::fmap(specs, [](auto& spec) { return FeatureSpec(spec, ""); }); + auto all_feature_specs = Util::fmap(specs, [](auto& spec) { return FeatureSpec(spec, ""); }); auto split_specs = - find_unknown_ports_for_ci(paths, exclusions_set, paths_port_file, all_fspecs, purge_tombstones); - auto fspecs = FullPackageSpec::to_feature_specs(split_specs.unknown); + find_unknown_ports_for_ci(paths, exclusions_set, paths_port_file, all_feature_specs, purge_tombstones); + auto feature_specs = FullPackageSpec::to_feature_specs(split_specs->unknown); - for (auto&& fspec : fspecs) + for (auto&& fspec : feature_specs) pgraph.install(fspec); Dependencies::CreateInstallPlanOptions serialize_options; @@ -284,7 +442,7 @@ namespace vcpkg::Commands::CI p->plan_type = InstallPlanType::EXCLUDED; } - for (auto&& feature : split_specs.features[p->spec]) + for (auto&& feature : split_specs->features[p->spec]) if (p->feature_list.find(feature) == p->feature_list.end()) { pgraph.install({p->spec, feature}); @@ -304,13 +462,32 @@ namespace vcpkg::Commands::CI } else { + auto collection_timer = Chrono::ElapsedTimer::create_started(); auto summary = Install::perform(action_plan, Install::KeepGoing::YES, paths, status_db); + auto collection_time_elapsed = collection_timer.elapsed(); + + // Adding results for ports that were built or pulled from an archive for (auto&& result : summary.results) - split_specs.known.erase(result.spec); - results.push_back({triplet, std::move(summary)}); - all_known_results.emplace_back(std::move(split_specs.known)); + { + split_specs->known.erase(result.spec); + xunitTestResults.add_test_results(result.spec.to_string(), result.build_result.code, result.timing, split_specs->abi_tag_map.at(result.spec)); + } + + // Adding results for ports that were not built because they have known states + for (auto&& port : split_specs->known) + { + xunitTestResults.add_test_results(port.first.to_string(), port.second, Chrono::ElapsedTime{}, split_specs->abi_tag_map.at(port.first)); + } + + all_known_results.emplace_back(std::move(split_specs->known)); + abi_tag_map.insert(split_specs->abi_tag_map.begin(), split_specs->abi_tag_map.end()); + + results.push_back({ triplet, std::move(summary)}); + + xunitTestResults.collection_time( collection_time_elapsed ); } } + xunitTestResults.assembly_time(timer.elapsed()); for (auto&& result : results) { @@ -322,21 +499,7 @@ namespace vcpkg::Commands::CI auto it_xunit = options.settings.find(OPTION_XUNIT); if (it_xunit != options.settings.end()) { - std::string xunit_doc = "\n"; - - for (auto&& result : results) - xunit_doc += result.summary.xunit_results(); - for (auto&& known_result : all_known_results) - { - for (auto&& result : known_result) - { - xunit_doc += - Install::InstallSummary::xunit_result(result.first, Chrono::ElapsedTime {}, result.second); - } - } - - xunit_doc += "\n"; - paths.get_filesystem().write_contents(fs::u8path(it_xunit->second), xunit_doc); + paths.get_filesystem().write_contents(fs::u8path(it_xunit->second), xunitTestResults.build_xml()); } Checks::exit_success(VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 1cfa2bf71..434876871 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -719,9 +719,9 @@ namespace vcpkg::Install return nullptr; } - std::string InstallSummary::xunit_result(const PackageSpec& spec, Chrono::ElapsedTime time, BuildResult code) + static std::string xunit_result(const PackageSpec& spec, Chrono::ElapsedTime time, BuildResult code) { - std::string inner_block; + std::string message_block; const char* result_string = ""; switch (code) { @@ -729,12 +729,12 @@ namespace vcpkg::Install case BuildResult::FILE_CONFLICTS: case BuildResult::BUILD_FAILED: result_string = "Fail"; - inner_block = Strings::format("", to_string(code)); + message_block = Strings::format("", to_string(code)); break; case BuildResult::EXCLUDED: case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: result_string = "Skip"; - inner_block = Strings::format("", to_string(code)); + message_block = Strings::format("", to_string(code)); break; case BuildResult::SUCCEEDED: result_string = "Pass"; break; default: Checks::exit_fail(VCPKG_LINE_INFO); @@ -746,7 +746,7 @@ namespace vcpkg::Install spec, time.as().count(), result_string, - inner_block); + message_block); } std::string InstallSummary::xunit_results() const -- cgit v1.2.3 From 2140d3c5eb5ec5e54254db032093e7697d7ec8fe Mon Sep 17 00:00:00 2001 From: soroshsabz Date: Fri, 22 Feb 2019 22:17:48 +0330 Subject: [bootstrap.ps1] Fixed some possible incorrect comparison with null warnings. (#5343) * Fixed some possible incorrect comparison with null warnings. * Correct bad indentation. * Removed extra space. --- scripts/bootstrap.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 0a24afa05..07a9fcbaa 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -25,7 +25,7 @@ $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName) { - if ($object -eq $null) + if ($null -eq $object) { return $false } @@ -36,12 +36,12 @@ function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Par function getProgramFiles32bit() { $out = ${env:PROGRAMFILES(X86)} - if ($out -eq $null) + if ($null -eq $out) { $out = ${env:PROGRAMFILES} } - if ($out -eq $null) + if ($null -eq $out) { throw "Could not find [Program Files 32-bit]" } @@ -138,7 +138,7 @@ function getVisualStudioInstances() function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) { $VisualStudioInstances = getVisualStudioInstances - if ($VisualStudioInstances -eq $null) + if ($null -eq $VisualStudioInstances) { throw "Could not find Visual Studio. VS2015 or VS2017 (with C++) needs to be installed." } @@ -210,7 +210,7 @@ function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = # Windows 10 SDK function CheckWindows10SDK($path) { - if ($path -eq $null) + if ($null -eq $path) { return } @@ -262,7 +262,7 @@ function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = # Windows 8.1 SDK function CheckWindows81SDK($path) { - if ($path -eq $null) + if ($null -eq $path) { return } -- cgit v1.2.3 From 4db5f02b8bf9b206b7508a0f4169eff7dfd188ca Mon Sep 17 00:00:00 2001 From: chausner Date: Fri, 22 Feb 2019 19:58:17 +0100 Subject: [liblsl] Add port for sccn/liblsl (#5410) --- ports/liblsl/CONTROL | 3 +++ ports/liblsl/fix-runtime-destination.patch | 13 +++++++++++++ ports/liblsl/hardcode-version.patch | 31 ++++++++++++++++++++++++++++++ ports/liblsl/portfile.cmake | 31 ++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 ports/liblsl/CONTROL create mode 100644 ports/liblsl/fix-runtime-destination.patch create mode 100644 ports/liblsl/hardcode-version.patch create mode 100644 ports/liblsl/portfile.cmake diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL new file mode 100644 index 000000000..0d2d95b1d --- /dev/null +++ b/ports/liblsl/CONTROL @@ -0,0 +1,3 @@ +Source: liblsl +Version: 1.13.0-b4 +Description: C++ lsl library for multi-modal time-synched data transmission over the local network diff --git a/ports/liblsl/fix-runtime-destination.patch b/ports/liblsl/fix-runtime-destination.patch new file mode 100644 index 000000000..a2bdbfbbe --- /dev/null +++ b/ports/liblsl/fix-runtime-destination.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5832a0e6..497dacd1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,7 +170,7 @@ endif() + install(TARGETS lsl + COMPONENT liblsl + EXPORT "${PROJECT_NAME}Config" +- RUNTIME DESTINATION ${LSLPREFIX}lib ++ RUNTIME DESTINATION ${LSLPREFIX}bin + LIBRARY DESTINATION ${LSLPREFIX}lib + INCLUDES DESTINATION ${LSLPREFIX}include + ARCHIVE DESTINATION ${LSLPREFIX}lib diff --git a/ports/liblsl/hardcode-version.patch b/ports/liblsl/hardcode-version.patch new file mode 100644 index 000000000..e7343271e --- /dev/null +++ b/ports/liblsl/hardcode-version.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73e4a7a0..0f8e19f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,26 +106,6 @@ if(LSL_NO_FANCY_LIBNAME) + set(CMAKE_DEBUG_POSTFIX "") + endif() + +-# try to find out which revision is currently checked out +-find_package(Git) +-if(GIT_FOUND) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --tags HEAD +- WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" +- OUTPUT_VARIABLE lslgitrevision +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name --abbrev-ref @ +- WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" +- OUTPUT_VARIABLE lslgitbranch +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- message(STATUS "Git version information: ${lslgitbranch}/${lslgitrevision}") +-else() +- set(lslgitrevision "unknown") +- set(lslgitbranch "unknown") +-endif() + set(LSL_VERSION_INFO "\"git:${lslgitrevision}/branch:${lslgitbranch}/build:${CMAKE_BUILD_TYPE}/compiler:${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}/boost:\" BOOST_LIB_VERSION") + set_source_files_properties("src/lsl_freefuncs_c.cpp" PROPERTIES COMPILE_DEFINITIONS LSL_LIBRARY_INFO_STR=${LSL_VERSION_INFO}) + diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake new file mode 100644 index 000000000..d8670d7e3 --- /dev/null +++ b/ports/liblsl/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sccn/liblsl + REF v1.13.0-b4 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake + SHA512 19bc587afcff315385e7bab1f88cf4edd315acfda61a630b23ffe4c59bc0f5aa570f0a979071f2b60009bb4d4b8ce08c98c414dc5b88042556b2501f4b8dcb79 + HEAD_REF master + PATCHES hardcode-version.patch fix-runtime-destination.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLSL_BUILD_STATIC=OFF + -DLSL_UNIXFOLDERS=ON + -DLSL_NO_FANCY_LIBNAME=ON + -Dlslgitrevision="v1.13.0-b4" + -Dlslgitbranch="master" +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl RENAME copyright) +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl) -- cgit v1.2.3 From 233c4c358a6156913ef635be7717ca83c1c34b3e Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 22 Feb 2019 11:31:35 -0800 Subject: [vcpkg edit] Check for VS Code onlinux (#5391) --- toolsrc/src/vcpkg/commands.edit.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index 044ae1c47..c9d52c572 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -157,6 +157,9 @@ namespace vcpkg::Commands::Edit #elif defined(__APPLE__) candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"}); candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"}); +#elif defined(__linux__) + candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"}); + candidate_paths.push_back(fs::path{"/usr/bin/code"}); #endif const auto it = Util::find_if(candidate_paths, [&](const fs::path& p) { return fs.exists(p); }); -- cgit v1.2.3 From 63265da7779324bf871ca01813f9a892ddae73b1 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 23 Feb 2019 04:10:29 +0800 Subject: [curlpp] Add new port to fix #5352 (#5381) --- ports/curlpp/CONTROL | 4 +++ ports/curlpp/fix-cmake.patch | 52 ++++++++++++++++++++++++++++++++++ ports/curlpp/portfile.cmake | 47 ++++++++++++++++++++++++++++++ ports/curlpp/vcpkg-cmake-wrapper.cmake | 35 +++++++++++++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 ports/curlpp/CONTROL create mode 100644 ports/curlpp/fix-cmake.patch create mode 100644 ports/curlpp/portfile.cmake create mode 100644 ports/curlpp/vcpkg-cmake-wrapper.cmake diff --git a/ports/curlpp/CONTROL b/ports/curlpp/CONTROL new file mode 100644 index 000000000..1c6c07f32 --- /dev/null +++ b/ports/curlpp/CONTROL @@ -0,0 +1,4 @@ +Source: curlpp +Version: 2018-06-15 +Description: C++ wrapper around libcURL +Build-Depends: curl diff --git a/ports/curlpp/fix-cmake.patch b/ports/curlpp/fix-cmake.patch new file mode 100644 index 000000000..3930b65c2 --- /dev/null +++ b/ports/curlpp/fix-cmake.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b183a0..a801ae8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,11 +85,12 @@ endif() + + file(GLOB_RECURSE HeaderFileList "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + file(GLOB_RECURSE SourceFileList "${CMAKE_CURRENT_SOURCE_DIR}/src/*") ++if(BUILD_SHARED_LIBS) + add_library(${PROJECT_NAME} SHARED ${HeaderFileList} ${SourceFileList}) + target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS}) + set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0) +- +-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList}) ++else() ++add_library(${PROJECT_NAME} STATIC ${HeaderFileList} ${SourceFileList}) + + # Make sure that on unix-platforms shared and static libraries have + # the same root name, but different suffixes. +@@ -97,19 +98,28 @@ add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList}) + # (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F) + # + # Making shared and static libraries have the same root name, but different suffixes +-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) + # Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools. + # This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll", + # so we add a "lib" prefix (which is default on other platforms anyway): +-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib") +-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS}) ++SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "lib") ++target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS}) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $) + + # install headers + install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp") + install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp") + +-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static ++install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ++install(EXPORT ${PROJECT_NAME}-config ++ FILE unofficial-${PROJECT_NAME}-config.cmake ++ NAMESPACE unofficial::${PROJECT_NAME}:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++) diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake new file mode 100644 index 000000000..aaa9c51ab --- /dev/null +++ b/ports/curlpp/portfile.cmake @@ -0,0 +1,47 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jpbarrette/curlpp + REF 8810334c830faa3b38bcd94f5b1ab695a4f05eb9 + SHA512 47eb0738d7cd2d4262c455f9472a21535343bcf08bda6de19771dab9204e068272b41782c87057d50e3781683a29e79d6387577be68d175a7fa890367f15d0d2 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets( + CONFIG_PATH lib/cmake/${PORT} + TARGET_PATH share/unofficial-${PORT} +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin + ) + + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake + ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT} + @ONLY + ) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/doc/LICENSE + ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() + +# CMake integration test +#vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/curlpp/vcpkg-cmake-wrapper.cmake b/ports/curlpp/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..0bffdc6b4 --- /dev/null +++ b/ports/curlpp/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,35 @@ +_find_package(${ARGS}) + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if(TARGET unofficial::curlpp::curlpp) + # Fix CURL dependencies. See: + # https://github.com/Microsoft/vcpkg/issues/4312 + + set(_libs "") + + find_package(CURL REQUIRED) + + set(ZLIB_ROOT ${CMAKE_PREFIX_PATH}) # Prefer Zlib installed via `vcpkg` + find_package(ZLIB) + unset(ZLIB_ROOT) + + list(APPEND _libs ${CURL_LIBRARIES} ZLIB::ZLIB) + + find_package(OpenSSL QUIET) + if(OPENSSL_FOUND) + list(APPEND _libs OpenSSL::SSL OpenSSL::Crypto) + endif() + + find_package(Threads REQUIRED) + list(APPEND _libs Threads::Threads) + + if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + list(APPEND _libs Ws2_32 Crypt32) + endif() + + set_target_properties( + unofficial::curlpp::curlpp + PROPERTIES INTERFACE_LINK_LIBRARIES "${_libs}" + ) + endif() +endif() -- cgit v1.2.3 From 473e803451a45ddb4d497d4fb6f863ba1ac2b1b2 Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Fri, 22 Feb 2019 23:57:40 +0100 Subject: [qt5] Update to 5.12.1 and add some missing modules (#5293) * Update qt5-base to 5.12.1 * update qt5-declarative to 5.12.1 * update qt5-modularscripts for 5.12.1 * update qt5-3d to 5.12.1 * update qt5-activeqt to 5.12.1 * add qt5-connectivity * update qt5-charts to 5.12.1 * update qt5-datavis3d to 5.12.1 * update qt5-gamepad to 5.12.1 * update qt5-graphicaleffects to 5.12.1 * update qt5-imageformats to 5.12.1 * add qt5-location * update qt5-multimedia to 5.12.1 * update qt5-networkauth to 5.12.1 * add qt5-purchasing * update qt5-quickcontrols to 5.12.1 * update qt5-quickcontrols2 to 5.12.1 * add qt5-remoteobjects * update qt5-script to 5.12.1 * update qt5-scxml to 5.12.1 * add qt5-sensors * update qt5-serialport to 5.12.1 * update qt5-speech to 5.12.1 * update qt5-svg to 5.12.1 * update qt5-tools to 5.12.1 * update qt5-virtualkeyboard to 5.12.1 * add qt5-webchannel * update qt5-websockets to 5.12.1 * update qt5-winextras to 5.12.1 * update qt5-xmlpatterns to 5.12.1 * update framework port to 5.12.1 and include the new modules * fix building qt5-base on linux * [qt5] Remove non-alphanumerical ASCII chars from dependencies --- ports/qt5-3d/CONTROL | 2 +- ports/qt5-3d/portfile.cmake | 2 +- ports/qt5-activeqt/CONTROL | 2 +- ports/qt5-activeqt/portfile.cmake | 2 +- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/fix-gui-configure-json.patch | 40 +++ ports/qt5-base/portfile.cmake | 385 +++++++++++----------- ports/qt5-base/qtdeploy.ps1 | 1 + ports/qt5-charts/CONTROL | 2 +- ports/qt5-charts/portfile.cmake | 2 +- ports/qt5-connectivity/CONTROL | 4 + ports/qt5-connectivity/portfile.cmake | 5 + ports/qt5-datavis3d/CONTROL | 2 +- ports/qt5-datavis3d/portfile.cmake | 2 +- ports/qt5-declarative/CONTROL | 2 +- ports/qt5-declarative/portfile.cmake | 2 +- ports/qt5-gamepad/CONTROL | 2 +- ports/qt5-gamepad/portfile.cmake | 2 +- ports/qt5-graphicaleffects/CONTROL | 2 +- ports/qt5-graphicaleffects/portfile.cmake | 2 +- ports/qt5-imageformats/CONTROL | 2 +- ports/qt5-imageformats/portfile.cmake | 2 +- ports/qt5-location/CONTROL | 4 + ports/qt5-location/portfile.cmake | 5 + ports/qt5-modularscripts/CONTROL | 2 +- ports/qt5-modularscripts/qt_modular_library.cmake | 2 +- ports/qt5-multimedia/CONTROL | 2 +- ports/qt5-multimedia/portfile.cmake | 2 +- ports/qt5-networkauth/CONTROL | 2 +- ports/qt5-networkauth/portfile.cmake | 2 +- ports/qt5-purchasing/CONTROL | 4 + ports/qt5-purchasing/portfile.cmake | 5 + ports/qt5-quickcontrols/CONTROL | 2 +- ports/qt5-quickcontrols/portfile.cmake | 2 +- ports/qt5-quickcontrols2/CONTROL | 2 +- ports/qt5-quickcontrols2/portfile.cmake | 2 +- ports/qt5-remoteobjects/CONTROL | 4 + ports/qt5-remoteobjects/portfile.cmake | 5 + ports/qt5-script/CONTROL | 2 +- ports/qt5-script/portfile.cmake | 2 +- ports/qt5-scxml/CONTROL | 2 +- ports/qt5-scxml/portfile.cmake | 2 +- ports/qt5-sensors/CONTROL | 4 + ports/qt5-sensors/portfile.cmake | 5 + ports/qt5-serialport/CONTROL | 2 +- ports/qt5-serialport/portfile.cmake | 2 +- ports/qt5-speech/CONTROL | 2 +- ports/qt5-speech/portfile.cmake | 2 +- ports/qt5-svg/CONTROL | 2 +- ports/qt5-svg/portfile.cmake | 2 +- ports/qt5-tools/CONTROL | 2 +- ports/qt5-tools/portfile.cmake | 2 +- ports/qt5-virtualkeyboard/CONTROL | 2 +- ports/qt5-virtualkeyboard/portfile.cmake | 2 +- ports/qt5-webchannel/CONTROL | 4 + ports/qt5-webchannel/portfile.cmake | 5 + ports/qt5-websockets/CONTROL | 2 +- ports/qt5-websockets/portfile.cmake | 2 +- ports/qt5-winextras/CONTROL | 2 +- ports/qt5-winextras/portfile.cmake | 2 +- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5-xmlpatterns/portfile.cmake | 2 +- ports/qt5/CONTROL | 4 +- 63 files changed, 334 insertions(+), 244 deletions(-) create mode 100644 ports/qt5-base/fix-gui-configure-json.patch create mode 100644 ports/qt5-connectivity/CONTROL create mode 100644 ports/qt5-connectivity/portfile.cmake create mode 100644 ports/qt5-location/CONTROL create mode 100644 ports/qt5-location/portfile.cmake create mode 100644 ports/qt5-purchasing/CONTROL create mode 100644 ports/qt5-purchasing/portfile.cmake create mode 100644 ports/qt5-remoteobjects/CONTROL create mode 100644 ports/qt5-remoteobjects/portfile.cmake create mode 100644 ports/qt5-sensors/CONTROL create mode 100644 ports/qt5-sensors/portfile.cmake create mode 100644 ports/qt5-webchannel/CONTROL create mode 100644 ports/qt5-webchannel/portfile.cmake diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 2013fc194..fedcd7bd8 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index ef9c6a44e..96df50dd7 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qt3d 4df1c07d5fce5771779bf8c43f41f97c8135702f606e7d0766bb17f8819057038b0b83366469ffbcef39e36a527a771d6905ae000f37ce67e6cad3a769e28eba) +qt_modular_library(qt3d 4c054b1075e976043fca5033a27be8a3f0d2df5dde5da4a536a9e7d61cdfd91007a2bf687bc19ad59724a2d53a9730b5d2446238bb7c6289d6a5dd3bf220a409) diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index 491702603..486dbf518 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-activeqt -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake index 9af6e19c9..6040fc1aa 100644 --- a/ports/qt5-activeqt/portfile.cmake +++ b/ports/qt5-activeqt/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtactiveqt 439ba83a10763b29419d34bac42d11c59964e9d279cbee0faa51198cfbc91ef0fe60b4b96ea516dcdcc9bc6696599d266b406a0d5e9a6e182ca61df67349a11c) +qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index fdf74b20c..28df38b4f 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/fix-gui-configure-json.patch b/ports/qt5-base/fix-gui-configure-json.patch new file mode 100644 index 000000000..060fd0b3c --- /dev/null +++ b/ports/qt5-base/fix-gui-configure-json.patch @@ -0,0 +1,40 @@ +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 89934c8f..70d08177 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -239,7 +239,8 @@ + "sources": [ + { "type": "pkgConfig", "args": "freetype2" }, + { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, +- { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } ++ { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, ++ { "libs": "-lfreetype" } + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } +@@ -250,7 +251,7 @@ + "test": { + "tail": [ + "#ifndef FC_RGBA_UNKNOWN", +- "# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define", ++ "# error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define", + "#endif" + ], + "main": [ +@@ -1436,7 +1437,7 @@ + }, + "eglfs_x11": { + "label": "EGLFS X11", +- "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11", ++ "condition": "features.eglfs && features.xcb-xlib && features.egl_x11", + "output": [ "privateFeature" ] + }, + "gif": { +@@ -1569,7 +1570,6 @@ + }, + "xcb-xlib": { + "label": "XCB Xlib", +- "emitIf": "features.xcb", + "condition": "features.xlib && libs.xcb_xlib", + "output": [ "privateFeature" ] + }, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 79b7f763d..e5b59aeb9 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -1,195 +1,190 @@ -include(vcpkg_common_functions) - -string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) -if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n" - "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." - ) -endif() - -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -include(configure_qt) -include(install_qt) - -set(MAJOR_MINOR 5.12) -set(FULL_VERSION ${MAJOR_MINOR}.0) -set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") - -vcpkg_download_distfile(ARCHIVE_FILE - URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" - FILENAME ${ARCHIVE_NAME} - SHA512 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570 -) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE_FILE}" - REF ${FULL_VERSION} - PATCHES - fix-system-freetype.patch - fix-system-pcre2.patch - fix-system-pcre2-linux.patch -) - -# Remove vendored dependencies to ensure they are not picked up by the build -foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite) - if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY}) - file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY}) - endif() -endforeach() - -file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib) - -# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings -set(ENV{_CL_} "/utf-8") - -set(CORE_OPTIONS - -confirm-license - -opensource - -system-zlib - -system-libjpeg - -system-libpng - -system-freetype - -system-pcre - -system-harfbuzz - -system-doubleconversion - -system-sqlite - -no-fontconfig - -nomake examples - -nomake tests -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND CORE_OPTIONS - -static - ) -else() - list(APPEND CORE_OPTIONS - -sql-sqlite - -sql-psql - ) -endif() - -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(PLATFORM "win32-msvc") - - configure_qt( - SOURCE_PATH ${SOURCE_PATH} - PLATFORM ${PLATFORM} - OPTIONS - ${CORE_OPTIONS} - -mp - -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - OPTIONS_RELEASE - LIBJPEG_LIBS="-ljpeg" - ZLIB_LIBS="-lzlib" - LIBPNG_LIBS="-llibpng16" - FREETYPE_LIBS="-lfreetype" - PSQL_LIBS="-llibpq" - OPTIONS_DEBUG - LIBJPEG_LIBS="-ljpegd" - ZLIB_LIBS="-lzlibd" - LIBPNG_LIBS="-llibpng16d" - PSQL_LIBS="-llibpqd" - FREETYPE_LIBS="-lfreetyped" - ) - -elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - configure_qt( - SOURCE_PATH ${SOURCE_PATH} - PLATFORM "linux-g++" - OPTIONS - ${CORE_OPTIONS} - -no-sqlite - -no-opengl # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - OPTIONS_RELEASE - "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a" - "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" - "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a" - "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a" - "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" - "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a" - "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a" - OPTIONS_DEBUG - "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a" - "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" - "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" - "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" - "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" - "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a" - "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a" - ) -endif() - -install_qt() - -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) - -file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*") -list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$") -file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) -file(REMOVE ${BINARY_TOOLS}) -file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") -list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$") -file(REMOVE ${BINARY_TOOLS}) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) - -vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py - WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake - LOGNAME fix-cmake -) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5) - -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib) - #--------------------------------------------------------------------------- - # qtmain(d) vs. Qt5AxServer(d) - #--------------------------------------------------------------------------- - # Qt applications have to either link to qtmain(d) or to Qt5AxServer(d), - # never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info. - # - # Create manual-link folders: - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - # - # Either have users explicitly link against qtmain.lib, qtmaind.lib: - file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl) - - #--------------------------------------------------------------------------- - # Qt5Bootstrap: only used to bootstrap qmake dependencies - #--------------------------------------------------------------------------- - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl) - #--------------------------------------------------------------------------- -endif() - -file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl") -file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH) -file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH) -foreach(PRL_FILE IN LISTS PRL_FILES) - file(READ "${PRL_FILE}" _contents) - string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") - string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") - file(WRITE "${PRL_FILE}" "${_contents}") -endforeach() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins) - -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +include(vcpkg_common_functions) + +string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) +if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) + message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." + ) +endif() + +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +include(configure_qt) +include(install_qt) + +set(MAJOR_MINOR 5.12) +set(FULL_VERSION ${MAJOR_MINOR}.1) +set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") + +vcpkg_download_distfile(ARCHIVE_FILE + URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + FILENAME ${ARCHIVE_NAME} + SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_FILE}" + REF ${FULL_VERSION} + PATCHES + fix-gui-configure-json.patch +) + +# Remove vendored dependencies to ensure they are not picked up by the build +foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite) + if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY}) + file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY}) + endif() +endforeach() + +file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib) + +# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings +set(ENV{_CL_} "/utf-8") + +set(CORE_OPTIONS + -confirm-license + -opensource + -system-zlib + -system-libjpeg + -system-libpng + -system-freetype + -system-pcre + -system-harfbuzz + -system-doubleconversion + -system-sqlite + -no-fontconfig + -nomake examples + -nomake tests +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND CORE_OPTIONS + -static + ) +endif() + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(PLATFORM "win32-msvc") + + configure_qt( + SOURCE_PATH ${SOURCE_PATH} + PLATFORM ${PLATFORM} + OPTIONS + ${CORE_OPTIONS} + -mp + -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" + OPTIONS_RELEASE + LIBJPEG_LIBS="-ljpeg" + ZLIB_LIBS="-lzlib" + LIBPNG_LIBS="-llibpng16" + PSQL_LIBS="-llibpq" + PCRE2_LIBS="-lpcre2-16" + FREETYPE_LIBS="-lfreetype" + OPTIONS_DEBUG + LIBJPEG_LIBS="-ljpegd" + ZLIB_LIBS="-lzlibd" + LIBPNG_LIBS="-llibpng16d" + PSQL_LIBS="-llibpqd" + PCRE2_LIBS="-lpcre2-16d" + FREETYPE_LIBS="-lfreetyped" + ) + +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + configure_qt( + SOURCE_PATH ${SOURCE_PATH} + PLATFORM "linux-g++" + OPTIONS + ${CORE_OPTIONS} + OPTIONS_RELEASE + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a" + "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" + "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a" + "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a" + "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" + "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a" + "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a -ldl -lpthread" + "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libsqlite3.a -ldl -lpthread" + OPTIONS_DEBUG + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a" + "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" + "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" + "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" + "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" + "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a" + "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a -ldl -lpthread" + "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libsqlite3.a -ldl -lpthread" + ) +endif() + +install_qt() + +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) + +file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*") +list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$") +file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) +file(REMOVE ${BINARY_TOOLS}) +file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") +list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$") +file(REMOVE ${BINARY_TOOLS}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) + +vcpkg_execute_required_process( + COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py + WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake + LOGNAME fix-cmake +) + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5) + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib) + #--------------------------------------------------------------------------- + # qtmain(d) vs. Qt5AxServer(d) + #--------------------------------------------------------------------------- + # Qt applications have to either link to qtmain(d) or to Qt5AxServer(d), + # never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info. + # + # Create manual-link folders: + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + # + # Either have users explicitly link against qtmain.lib, qtmaind.lib: + file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl) + file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl) + + #--------------------------------------------------------------------------- + # Qt5Bootstrap: only used to bootstrap qmake dependencies + #--------------------------------------------------------------------------- + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl) + #--------------------------------------------------------------------------- +endif() + +file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl") +file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH) +file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH) +foreach(PRL_FILE IN LISTS PRL_FILES) + file(READ "${PRL_FILE}" _contents) + string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") + string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") + file(WRITE "${PRL_FILE}" "${_contents}") +endforeach() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins) + +file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1 index 2161f69c8..c751e891e 100644 --- a/ports/qt5-base/qtdeploy.ps1 +++ b/ports/qt5-base/qtdeploy.ps1 @@ -41,6 +41,7 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str deployPlugins "imageformats" deployPlugins "iconengines" deployPlugins "platforminputcontexts" + deployPlugins "styles" } elseif ($targetBinaryName -match "Qt5Networkd?.dll") { deployPlugins "bearer" if (Test-Path "$binDir\libeay32.dll") diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index a682fb982..0b5964bb3 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake index 6ce32435e..cb3c99d2a 100644 --- a/ports/qt5-charts/portfile.cmake +++ b/ports/qt5-charts/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtcharts f8767dc019cf0b9a983e4fd61ac983184d7f4d3ad3cb748fc26a877892d537808eafc3f18815ba06761818e0fe5a74f0a048772fdac9ce86d7290a078f5e21aa) +qt_modular_library(qtcharts 1915581f9cd644e0c6d9d38f5881ce388437ab1fa45554c01625ffd5c51067188450ff9329ccfcab17222389876658bd1e4595a426e75ef637311888451cfcd2) diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL new file mode 100644 index 000000000..45319857c --- /dev/null +++ b/ports/qt5-connectivity/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-connectivity +Version: 5.12.0 +Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware +Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-connectivity/portfile.cmake b/ports/qt5-connectivity/portfile.cmake new file mode 100644 index 000000000..91e15366a --- /dev/null +++ b/ports/qt5-connectivity/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtconnectivity 89a16da0bb958da3123a2cebec45b954b034b2a586490c8217769e2e0f22080676e57f847c9a6622ea2129f539ac8732e0968f38517236c9880ff9b715492ede) diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index 54d6eb7f6..2b6627465 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake index 0b5430177..4927f7007 100644 --- a/ports/qt5-datavis3d/portfile.cmake +++ b/ports/qt5-datavis3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdatavis3d 6b88551e5ada11333a2202598d2c3732dccafafbf0dd7f245dee103137ca0bd3b547b47d3e6dd6929610764f520baa75cd92bf986493fcd57c7ce61e7d419204) +qt_modular_library(qtdatavis3d a0eff0f58515720d9c8e37bce16a3f6f719ca748c6228f183eb7e2fe2cc024195e5122cc29b9d0dba3319a9d6147105c0b253fb5e633e16db1fb20cca563d956) diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index e16026069..87b5a8da0 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 8999aebb6..afa19aa53 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdeclarative 858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd) +qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts) diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index bf323df72..323bf6747 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake index fe7f260c1..7967f7f41 100644 --- a/ports/qt5-gamepad/portfile.cmake +++ b/ports/qt5-gamepad/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgamepad bf412012b270b1fc594a8f139e5343f45d8b989cbc2d5eb02eb1c06817dd7ffd36706b14e3fa7691e4b4554b56c05e42899d28e278b1f1e0ca278842f46b8cfa) +qt_modular_library(qtgamepad 5e5f2c06103493880793f94aa062b1eccccbe0f53ded457969a0d77e864cee31759267a19edc68f3a015e261b84727f34b991b4a6b3c838600a68b030e77fa1e) diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index 73f051121..3e4fadbe8 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 GraphicalEffects Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake index 6c3ff45e3..2ea131939 100644 --- a/ports/qt5-graphicaleffects/portfile.cmake +++ b/ports/qt5-graphicaleffects/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgraphicaleffects 88545f9f11d5f97aa70b293539aa10b4e87bbf1f585ba57cbf337c0300b2cdad52ab9d25867a663714ae345c21006d10f567fdbb839df235a9faf7f7674a5835) +qt_modular_library(qtgraphicaleffects f7c93fa9b33a4096d5a150a6db984400daecc0ee16203402f1d465fddd288a9ea55625fcbd4ccd4c0b8addaa458d7955244b076a9c6c13a83d7c61c6029ddd81) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 9681cf060..bfb362834 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index 7a3e37749..001661111 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtimageformats c83cfdb7e2c73c796d57e14c26bcf2b7d7d1b72413d0d0d632747f42748368d3538e2b1b2b896fe9ca2f58dda285b3452db42738911f26bad5413adea36a3f45) +qt_modular_library(qtimageformats 1514c5d7a285d718fdf1f3ba11f00029551af70e8b7bd927e061c55a35fca6978164da2846f26b6d57a4c81af2a75eb3f8358f46fa74bd70ba3407aa3bbcb0e5) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL new file mode 100644 index 000000000..fd647d83b --- /dev/null +++ b/ports/qt5-location/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-location +Version: 5.12.1 +Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. +Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake new file mode 100644 index 000000000..1fde2fa48 --- /dev/null +++ b/ports/qt5-location/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtlocation 08dceeef8681b1266763197d8d4cab1d2ae8e8d0b62ae50ab44c64698588652d6ecf976b8f0095fa33b3a93b66b43fd4acbde4ebc47af8bdd79ce708c4237ed2) diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index f738101d7..eedb58432 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 2018-12-17 +Version: 2019-02-02 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 34efa6eb9..a99d18478 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -9,7 +9,7 @@ function(qt_modular_library NAME HASH) endif() set(MAJOR_MINOR 5.12) - set(FULL_VERSION ${MAJOR_MINOR}.0) + set(FULL_VERSION ${MAJOR_MINOR}.1) set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index c2dacdb53..25f96138b 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index 735b53eea..77aee6d10 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtmultimedia b16e657c73e57a8e5588697fda0e902834df10edd52704edcb7deb74fc45054ff9840344309ba720998d8afa6a5f315ce2bd46393ff8db6492694cfce0543692) +qt_modular_library(qtmultimedia cdf9161648abd9f6c6d20171a75e9edefd77a46e946263f7e22e9f2ae69a55132688c31e46378cdc74c3bdf528fd94383b7e3b20bd8befa485a02cabb398dea0) diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index 82809ca9c..b4653798f 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Network Authorization Module Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake index e144088d6..40fda857c 100644 --- a/ports/qt5-networkauth/portfile.cmake +++ b/ports/qt5-networkauth/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtnetworkauth ae00e338ff4b9b3233c821a28d59e601489554ce882e8a1dc22c0d7903fadbee182e1f9a43c3667b707581d196f5615042b230823e48c71a4f2b5d793183f1de) +qt_modular_library(qtnetworkauth 219117019cb98b87a84d351aa6b5479f3fa220c82fd4ff7409d2003c79402ead21454dcd1280be4db78b77045707dfa0fbbdefc738b9ac1142bf338a67447c60) diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL new file mode 100644 index 000000000..35d617b68 --- /dev/null +++ b/ports/qt5-purchasing/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-purchasing +Version: 5.12.1 +Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications. +Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-purchasing/portfile.cmake b/ports/qt5-purchasing/portfile.cmake new file mode 100644 index 000000000..3ea4b192c --- /dev/null +++ b/ports/qt5-purchasing/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtpurchasing 655283a32f02a4a5bb8b890081fa1276e1a0c1396f50bb5c8ea849b55a60d8dde368f05072ab786fb8bb14cc41be8394d635bf4af791f2ef289796e04395dbb6) diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index e76b8f15b..8b0552337 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 QuickControls Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake index 8a93e8947..ac74db9d5 100644 --- a/ports/qt5-quickcontrols/portfile.cmake +++ b/ports/qt5-quickcontrols/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols a2052398c281e81f8a61afe49f262d4feeb4da2593dbec0cc9971e7de6b169b17c1cf2ee7c213b3d5939cc322d4d715a1ce318b031fd4b8a783fac7bae3e37f9) +qt_modular_library(qtquickcontrols 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623) diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index f85acbb14..027cb6e71 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake index 5b9dfed4b..845a4c852 100644 --- a/ports/qt5-quickcontrols2/portfile.cmake +++ b/ports/qt5-quickcontrols2/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols2 e954832787fcb36cc3bab529b5ddf88ffa96d90924b9193a99e524831aff24026c9b278b4f3bb41afb2cc52a89888621637863ad0cda928901d9eb81e49017a5) +qt_modular_library(qtquickcontrols2 fecbde2d38e7b9d18c0cfba8a724bba43d92702b8fb7c15b589a47e584f6023e498b1fb81a864835dbfdf38af6ee20ce9965f233df497a0639aceb87e8c1b123) diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL new file mode 100644 index 000000000..bea95b4ae --- /dev/null +++ b/ports/qt5-remoteobjects/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-remoteobjects +Version: 5.12.1 +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-modularscripts, qt5-base diff --git a/ports/qt5-remoteobjects/portfile.cmake b/ports/qt5-remoteobjects/portfile.cmake new file mode 100644 index 000000000..7a238ebcf --- /dev/null +++ b/ports/qt5-remoteobjects/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtremoteobjects 9b4222c6336374387aa5c5021833b4b12d4ab76f4af3a5f843ce2abca090a6af299b37d34b86bfc46e5ed8e54e50d8abc6804f88c8843327f90795c06a37ca0d) diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 5dd48bac3..b47aa9798 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,4 +1,4 @@ Source: qt5-script -Version: 5.12.0 +Version: 5.12.1 Build-Depends: qt5-base, qt5-modularscripts Description:Qt5 Script Module. diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake index e6465127d..b4e40355b 100755 --- a/ports/qt5-script/portfile.cmake +++ b/ports/qt5-script/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscript f8870208fb0eb35551294739eabe9736a458e79fef1160b836031411b8055df7284339d301f2983c94b3bafeb15919fc575e12541c471655c0db9c0c5d85a087) +qt_modular_library(qtscript 1fe7d0582e6c61fd146d66080bc91b40a6a2bda9b6bdb983339276b1aebb6f3c24070fc5acb2fd90556c11d51708c7bc75542532097b7f4f381b13dadaec5c9e) diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index c3163b420..216fd3fd1 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake index eb912f98b..51c855271 100644 --- a/ports/qt5-scxml/portfile.cmake +++ b/ports/qt5-scxml/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscxml 4a50e6586a452bf0a0e9b40e969d00082c1bc88b50128d8ff211be4f03705e5a5aa3dcee062e9a635f6f520c6b1cbf52b4a68742d0b41409e1d9f650e76dbf49) +qt_modular_library(qtscxml 3bfb08eb8506ca1076a594fb48b09360d258ecf26596045d2bff8702ad1ac0d0cc16dbc5e4528bf2a0fc1fad93c44f5cf34dc86e4d1243764a49a56f99985501) diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL new file mode 100644 index 000000000..55d620ee1 --- /dev/null +++ b/ports/qt5-sensors/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-sensors +Version: 5.12.1 +Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition. +Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-sensors/portfile.cmake b/ports/qt5-sensors/portfile.cmake new file mode 100644 index 000000000..1a90f5486 --- /dev/null +++ b/ports/qt5-sensors/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtsensors 437c8fce62b4fde138a7927ae494526852a63c2c9a392aaa5f79da6b9ec134e54b17dcd908e5cd7d12474dd112672e0a6a478a307cf716cce9fed67937da3fdc) diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index 19c7687b5..7f725ffab 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake index 515535458..019ed1b17 100644 --- a/ports/qt5-serialport/portfile.cmake +++ b/ports/qt5-serialport/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtserialport b8004e844cab66a50f5c899af74f22e62dbac23493210d579344d4a9337990da9781c3647662e7f31b132b4c60d7e3de640a9a636ae7c63de253858324e11428) +qt_modular_library(qtserialport c917e08f417677fb16058c4be95c20dcd5881f41daf6033b864f725b259bfa38ab07a993a6a19f26574f1b662116aaceea26965cd1d2a5df7465e2bda495e7ff) diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index f3c6068d4..336601da2 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Speech Module Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows) diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake index 2cbd8064a..61dfc802a 100644 --- a/ports/qt5-speech/portfile.cmake +++ b/ports/qt5-speech/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtspeech cbc34d2d51ef2cf333dccd0a142198a477187786e743f6322370a197b4bbcba11ef7ce92aa9ea0917cc092f51609e71764ee3e5d356dadd54eaae5783c756887) +qt_modular_library(qtspeech 321f6dafe0751af1e9cb5bd32f340ae445d2d148a8d2060bd5bd65d034f242547a79667253a4d1e220ccd4f59ea36a7fbe1b50093f36e2017b872f2b858050d2) diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index 320a03df8..8a199f1c7 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index b528c806f..091afa59b 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtsvg 571e457dce3b62de5f316ab69fa0a9a9fd6a3ace8b05ae525ad5c82e6784b60f3c06f1ce94c3639c861639740b29d996fda6907ce77b60aeae916788313e0a65) +qt_modular_library(qtsvg c09da58bb901546fa8f408528ed25c9cc57d2bda35e56112eab08a08bf8fdb06cdaed1995d46d6baa08cab8660a3661be3dfa51754cc55e4fab96f7c90533ea3) diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 86d880315..492bf89fc 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 1502646d9..1cc0a7f9b 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qttools 90ce900dc64856e994b05dba8a1f2735357d7cc489b0565beb2553c6007e0a53cedf363cbec96d9af325182f5a164eafe10d2d4d180ee72f544bf0fa9dbc671d) +qt_modular_library(qttools e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts) diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index 2b2e7d291..3b21a1c6d 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake index 4b30772a8..342fd6a5a 100644 --- a/ports/qt5-virtualkeyboard/portfile.cmake +++ b/ports/qt5-virtualkeyboard/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtvirtualkeyboard 984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8) +qt_modular_library(qtvirtualkeyboard 17f85982bb7d39784b5a85fba7758d3c032c158ca453c30255ec03e5e61dc8bbcbcbc58afe8f43bcf0297bb00d4e8606f553501bde68252d097d7bb32af9d24f) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL new file mode 100644 index 000000000..85edc4b81 --- /dev/null +++ b/ports/qt5-webchannel/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-webchannel +Version: 5.12.1 +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-modularscripts, qt5-base diff --git a/ports/qt5-webchannel/portfile.cmake b/ports/qt5-webchannel/portfile.cmake new file mode 100644 index 000000000..f1b5ccd16 --- /dev/null +++ b/ports/qt5-webchannel/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtwebchannel 71f2eb4b808e5892d246bafa289f7a4464e9705d568ceb01443b787d2eade8ee9bd20eef46900ba6fa2b251e7e15aebb7564e854360a3ad70992ad17cc1f9751) diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index 5feba2a6b..f3ed649a9 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake index 7b949223e..8aa9cc9ed 100644 --- a/ports/qt5-websockets/portfile.cmake +++ b/ports/qt5-websockets/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwebsockets 2c176fce2ad92d7c6c23047ea35a7e868d222abaea077f3d1d9e84ff5fccbaa198d1d0583f5686fdc99c71bea9c4a733cf0b718c65262e761e5f07a93452d186) +qt_modular_library(qtwebsockets 4239563f05d65e85d2c46f24b3757e7fcfb119a2c9af0b221b321702f7849a4af05da1fdc1e77c0098df40af231ed781be5ead9361bae3dbf2c7808043601577) diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index 00350de99..0ed5317d2 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-winextras -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-modularscripts, qt5-base, atlmfc diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake index 18e3e40be..64f112bbd 100644 --- a/ports/qt5-winextras/portfile.cmake +++ b/ports/qt5-winextras/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwinextras 37279e56c8317c2303d077d46ccb3780822e0853f9a2b92d3c9566077a977c2322ee46e9eca5f0f417624fe8ea4da03480fb905895dfb6b149a1c98b1caa3707) +qt_modular_library(qtwinextras 2adf2849359ed97724256ba2ce7492f6820c92e898142683b696be0af5393d8af26b5af3d827c25e9027e77f95eb7f12ebb2be22a5d4c99e645c65a7fd7fe0e6) diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 7cc2504d6..04b00a415 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.12.0 +Version: 5.12.1 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index 64832816c..bd39b03f8 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtxmlpatterns 9e9fe5d99957a0079eada985d8b9837cee27c0025851d00024951bb12cf23d0fb2483cbf3a39cb4c5a23b9d453e42d667b0434e73d87447d9b4e84a9dca37ece) +qt_modular_library(qtxmlpatterns 2a75b6fdbe07317ce91b69e0fc9abe39899b5c48885033f734c0d018115762e7558723ae0fcb5ad5a2266a52471f139236778be8191c61abec9bf0b07a0f01f7) diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index d4093b323..6b4b9129b 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.12.0 +Version: 5.12.1-1 Description: Qt5 Application Framework -Build-Depends: qt5-3d, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-winextras, qt5-xmlpatterns +Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras, qt5-xmlpatterns -- cgit v1.2.3 From f10c9d7e21a208d2c60e2ac0b7ee473bb1179549 Mon Sep 17 00:00:00 2001 From: Siarhei Siniak Date: Sat, 23 Feb 2019 02:24:59 +0300 Subject: [fix] Regression of copyright install at netcdf-c (#5414) * [~] Refactor * [~] Refactor --- ports/netcdf-c/portfile.cmake | 5 +++++ ports/netcdf-cxx4/portfile.cmake | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index f2630711e..4abe0f9dc 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -52,3 +52,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/netcdf-c) +file( + RENAME + ${CURRENT_PACKAGES_DIR}/share/netcdf-c/COPYRIGHT + ${CURRENT_PACKAGES_DIR}/share/netcdf-c/copyright +) diff --git a/ports/netcdf-cxx4/portfile.cmake b/ports/netcdf-cxx4/portfile.cmake index 92ae59675..22e4e1653 100644 --- a/ports/netcdf-cxx4/portfile.cmake +++ b/ports/netcdf-cxx4/portfile.cmake @@ -42,3 +42,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/netcdf-cxx4) +file( + RENAME + ${CURRENT_PACKAGES_DIR}/share/netcdf-cxx4/COPYRIGHT + ${CURRENT_PACKAGES_DIR}/share/netcdf-cxx4/copyright +) -- cgit v1.2.3 From 9c8a15919991920b42bc9710cc34fdf59dbd36b4 Mon Sep 17 00:00:00 2001 From: xDarKraDx <14582891+xdarkradx@users.noreply.github.com> Date: Fri, 22 Feb 2019 18:50:46 -0500 Subject: X plane (#5419) * Add X-Plane SDK support * fix: disallow x86 builds The x-plane SDK website claims that the SDK is only compatible with x64. The PR that adds support for this fails in x86, so I'm disallow x86 builds to align with the x-plane documentation. * fix: install sdk headers to the root include path The x-plane SDK website's examples expect that the sdk headers are at the root of the include path. I'm adjusting this port to align with those samples, as we want examples to "just work" as much as possible. * style: whitespace * Remove ununsed directory --- ports/x-plane/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index 8946e4eb9..cfc5fedd3 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -16,7 +16,6 @@ vcpkg_extract_source_archive( ) file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/include/x-plane/ ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug/lib ) -- cgit v1.2.3 From 4ad78224c989953cde21c77dd63345b9f722671b Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Fri, 22 Feb 2019 18:29:05 -0600 Subject: [docs] Show how to default VCPKG_TARGET_TRIPLET (#5346) --- docs/users/integration.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/users/integration.md b/docs/users/integration.md index 10f5574c1..6d56c7c70 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -135,9 +135,16 @@ To override the automatically chosen [triplet][], you can specify the MSBuild pr ``` #### With CMake -Simply set `VCPKG_TARGET_TRIPLET` on the configure line. +You can set `VCPKG_TARGET_TRIPLET` on the configure line: ```no-highlight cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... ``` +If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to contoll the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): + +```cmake +if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) + set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") +endif() +``` [triplet]: triplets.md -- cgit v1.2.3 From b04cb5e35a721ea5a390a0d15c6b643e46c49b33 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 23 Feb 2019 16:16:50 +0800 Subject: [stxxl] Fix missing include directory exporting --- ports/stxxl/fix-include-dir.patch | 31 +++++++++++++++++++++++++++++++ ports/stxxl/portfile.cmake | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 ports/stxxl/fix-include-dir.patch diff --git a/ports/stxxl/fix-include-dir.patch b/ports/stxxl/fix-include-dir.patch new file mode 100644 index 000000000..043252fb6 --- /dev/null +++ b/ports/stxxl/fix-include-dir.patch @@ -0,0 +1,31 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 06f9e50a..281e1f04 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -94,6 +94,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl SHARED ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +@@ -104,6 +106,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl_static STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl_static PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl_static PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl_static PUBLIC $) ++ + install(TARGETS stxxl_static + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) +@@ -122,6 +126,8 @@ else() + add_library(stxxl STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index af574d287..f0f78573d 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_from_github( REF b9e44f0ecba7d7111fbb33f3330c3e53f2b75236 SHA512 800a8fb95b52b21256cecb848f95645c54851f4dc070e0cd64fb5009f7663c0c962a24ca3f246e54d6d45e81a5c734309268d7ea6f0b0987336a50a3dcb99616 HEAD_REF master + PATCHES + fix-include-dir.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 3830517ec7519b823f5d8c404710889c6bd00278 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 23 Feb 2019 18:00:09 +0800 Subject: [stxxl] Fix STXXL_INCLUDE_DIRS --- ports/stxxl/portfile.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index f0f78573d..ec3c5531b 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -46,6 +46,12 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) endif() +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake + "\${STXXL_CMAKE_DIR}/../include" + "\${STXXL_CMAKE_DIR}/../../include" +) + if(CMAKE_HOST_WIN32) set(EXECUTABLE_SUFFIX ".exe") else() @@ -60,7 +66,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/bin) + ${CURRENT_PACKAGES_DIR}/bin +) # Handle copyright configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -- cgit v1.2.3 From 9b9b178d4c7834ce210e5baa46a9364436674a5f Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 26 Feb 2019 03:06:33 +0800 Subject: [qt5-webview] Add new port (fix #5427) (#5441) --- ports/qt5-webview/CONTROL | 4 ++++ ports/qt5-webview/portfile.cmake | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 ports/qt5-webview/CONTROL create mode 100644 ports/qt5-webview/portfile.cmake diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL new file mode 100644 index 000000000..fda869331 --- /dev/null +++ b/ports/qt5-webview/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-webview +Version: 5.12.1 +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-base, qt5-modularscripts, qt5-declarative diff --git a/ports/qt5-webview/portfile.cmake b/ports/qt5-webview/portfile.cmake new file mode 100644 index 000000000..df9f90c0a --- /dev/null +++ b/ports/qt5-webview/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtwebview 27e1904570678691e26831e87953e47d6b707bfe0504cde112ad6c8c18ea163eb83d90f8d4dbbf73873caee827e486691bb73e16a4c8b9e522bbeffbb68e9973) -- cgit v1.2.3 From 5b4cd3fc82b760a9d108805fc2ab9b75f528447c Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 26 Feb 2019 03:09:41 +0800 Subject: [libcuckoo] Add new port (#5436) [libcuckoo] Add new port --- ports/libcuckoo/CONTROL | 3 +++ ports/libcuckoo/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 ports/libcuckoo/CONTROL create mode 100644 ports/libcuckoo/portfile.cmake diff --git a/ports/libcuckoo/CONTROL b/ports/libcuckoo/CONTROL new file mode 100644 index 000000000..b9c1440b3 --- /dev/null +++ b/ports/libcuckoo/CONTROL @@ -0,0 +1,3 @@ +Source: libcuckoo +Version: 2018-12-24-1 +Description: A high-performance, concurrent hash table diff --git a/ports/libcuckoo/portfile.cmake b/ports/libcuckoo/portfile.cmake new file mode 100644 index 000000000..15d6df316 --- /dev/null +++ b/ports/libcuckoo/portfile.cmake @@ -0,0 +1,34 @@ +# Header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO efficient/libcuckoo + REF f3138045810b2c2e9b59dbede296b4a5194af4f9 + SHA512 b1682b7175b2a7fd22c34cbaf9770f2f1bfb3f0d1be046338a8a489c302f0434ca1cbf2ffe5845e09aba132b0be6a1d6472b66b4518bb172b82af93a9d27cd21 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_STRESS_TESTS=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_UNIVERSAL_BENCHMARK=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +#vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 0f04ebaf579bbb56719244cefcd23ab038f7e15c Mon Sep 17 00:00:00 2001 From: piloopin Date: Tue, 26 Feb 2019 00:04:59 +0330 Subject: [mongo-c-driver] fix mongo-c-driver build for linux (#5445) * fix mongo-c-driver build for Linux --- ports/mongo-c-driver/CONTROL | 2 +- ports/mongo-c-driver/fix-uwp.patch | 19 +++++++++++++------ ports/mongo-c-driver/portfile.cmake | 26 ++++++++++++++++++-------- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 700f65d1a..d19dec51c 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,4 +1,4 @@ Source: mongo-c-driver -Version: 1.9.5-1 +Version: 1.9.5-2 Build-Depends: libbson, openssl (uwp) Description: Client library written in C for MongoDB. diff --git a/ports/mongo-c-driver/fix-uwp.patch b/ports/mongo-c-driver/fix-uwp.patch index 59d67c6be..b2ec77ab8 100644 --- a/ports/mongo-c-driver/fix-uwp.patch +++ b/ports/mongo-c-driver/fix-uwp.patch @@ -90,19 +90,26 @@ index 4e181bd..b274fc1 100644 ZeroMemory (&osvi, sizeof (OSVERSIONINFO)); osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); diff --git a/src/mongoc/mongoc-util.c b/src/mongoc/mongoc-util.c -index 6dbb26d..7f33780 100644 +index a4e50ea..4f631e7 100644 --- a/src/mongoc/mongoc-util.c +++ b/src/mongoc/mongoc-util.c -@@ -69,7 +69,11 @@ _mongoc_hex_md5 (const char *input) - void +@@ -70,6 +70,11 @@ void _mongoc_usleep (int64_t usec) { --#ifdef _WIN32 + #ifdef _WIN32 +#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) + if (usec / 1000 > MAXDWORD || usec < 0) + __fastfail(-1); + Sleep((DWORD)(usec / 1000)); -+#elif defined(_WIN32) ++#else LARGE_INTEGER ft; HANDLE timer; - + +@@ -80,6 +85,7 @@ _mongoc_usleep (int64_t usec) + SetWaitableTimer (timer, &ft, 0, NULL, NULL, 0); + WaitForSingleObject (timer, INFINITE); + CloseHandle (timer); ++#endif + #else + BSON_ASSERT (usec >= 0); + usleep ((useconds_t) usec); diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 54d70aaf8..a3c5f2d31 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -14,8 +14,9 @@ else() set(ENABLE_STATIC OFF) endif() -set(ENABLE_SSL "WINDOWS") -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(NOT VCPKG_CMAKE_SYSTEM_NAME) + set(ENABLE_SSL "WINDOWS") +else() set(ENABLE_SSL "OPENSSL") endif() @@ -48,12 +49,21 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + else() + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + endif() # drop the __declspec(dllimport) when building static vcpkg_apply_patches( -- cgit v1.2.3 From 9af611fb8fcb161e51501a244698662ff4704f20 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Mon, 25 Feb 2019 15:39:38 -0500 Subject: [minizip] Fix BZip2 Dependency on Linux (#5448) It was spelled `Bzip2` when the dependency was `BZip2`. --- ports/minizip/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 0b572b39c..4ccf6972a 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -7,7 +7,7 @@ endif() find_package(ZLIB REQUIRED) -find_package(Bzip2 REQUIRED) +find_package(BZip2 REQUIRED) set(MIN_SRC contrib/minizip) -- cgit v1.2.3 From 9ef92a21a07a3f6685df08a6f8cfed2b0cb5ea9c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 25 Feb 2019 13:25:27 -0800 Subject: [vcpkg-docs] Replace reference to VCPKG_DEFAULT_VS_PATH with VCPKG_VISUAL_STUDIO_PATH --- docs/users/config-environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 103c1c547..f25df89a3 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -26,7 +26,7 @@ This environment variable can be set to the full path of an executable to be use This environment variable can be set to a directory to use as the root of the vcpkg instance. Note that mixing vcpkg repo versions and executable versions can cause issues. -#### VCPKG_DEFAULT_VS_PATH +#### VCPKG_VISUAL_STUDIO_PATH This environment variable can be set to the full path to a Visual Studio instance on the machine. This Visual Studio instance will be used if the triplet does not override it via the [`VCPKG_VISUAL_STUDIO_PATH` triplet setting](triplets.md#VCPKG_VISUAL_STUDIO_PATH). -- cgit v1.2.3 From 321d7b17fcf25753c75b233594910eff9e0eeb84 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Mon, 25 Feb 2019 16:26:31 -0500 Subject: Upgrade googletest to 2019-01-04 (b6cd405) version. (#5423) --- ports/gtest/CONTROL | 2 +- ports/gtest/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index 5b3a7c465..97e7f3f8c 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,3 +1,3 @@ Source: gtest -Version: 1.8.1-1 +Version: 2019-01-04 Description: GoogleTest and GoogleMock testing frameworks. diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 4b0857de4..62d307aa2 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest - REF release-1.8.1 - SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 + REF b6cd405286ed8635ece71c72f118e659f4ade3fb + SHA512 1642a9cf1923d00c52c346399941517787431dad3e6d3a5da07bc02243a231a95e30e0a9568ffd29bb9b9757f15c1c47d2d811c2bedb301f2d27cf912be0a534 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-z7-override.patch -- cgit v1.2.3 From 22026ce2d9390a8a900848aadcae55b894d217a6 Mon Sep 17 00:00:00 2001 From: justnope <46006588+justnope@users.noreply.github.com> Date: Mon, 25 Feb 2019 22:39:17 +0100 Subject: [libstk] add new port (#5379) * added libstk * added vcpkg_fixup_cmake_targets * [libstk] Use static builds. Rename targets. Add include directory to cmake config. --- ports/libstk/CMakeLists.txt | 215 ++++++++++++++++++++++++++++++++++++++++++++ ports/libstk/CONTROL | 3 + ports/libstk/portfile.cmake | 36 ++++++++ 3 files changed, 254 insertions(+) create mode 100644 ports/libstk/CMakeLists.txt create mode 100644 ports/libstk/CONTROL create mode 100644 ports/libstk/portfile.cmake diff --git a/ports/libstk/CMakeLists.txt b/ports/libstk/CMakeLists.txt new file mode 100644 index 000000000..7d92632dc --- /dev/null +++ b/ports/libstk/CMakeLists.txt @@ -0,0 +1,215 @@ +cmake_minimum_required(VERSION 3.0) +project(libstk) + +set(LIBSTK_SOURCES + src/ADSR.cpp + src/Asymp.cpp + src/BandedWG.cpp + src/BeeThree.cpp + src/BiQuad.cpp + src/Blit.cpp + src/BlitSaw.cpp + src/BlitSquare.cpp + src/BlowBotl.cpp + src/BlowHole.cpp + src/Bowed.cpp + src/Brass.cpp + src/Chorus.cpp + src/Clarinet.cpp + src/Delay.cpp + src/DelayA.cpp + src/DelayL.cpp + src/Drummer.cpp + src/Echo.cpp + src/Envelope.cpp + src/FileLoop.cpp + src/FileRead.cpp + src/FileWrite.cpp + src/FileWvIn.cpp + src/FileWvOut.cpp + src/Fir.cpp + src/Flute.cpp + src/FM.cpp + src/FMVoices.cpp + src/FormSwep.cpp + src/FreeVerb.cpp + src/Granulate.cpp + src/Guitar.cpp + src/HevyMetl.cpp + src/Iir.cpp + src/JCRev.cpp + src/LentPitShift.cpp + src/Makefile.in + src/Mandolin.cpp + src/Mesh2D.cpp + src/Messager.cpp + src/MidiFileIn.cpp + src/Modal.cpp + src/ModalBar.cpp + src/Modulate.cpp + src/Moog.cpp + src/Noise.cpp + src/NRev.cpp + src/OnePole.cpp + src/OneZero.cpp + src/PercFlut.cpp + src/Phonemes.cpp + src/PitShift.cpp + src/Plucked.cpp + src/PoleZero.cpp + src/PRCRev.cpp + src/Resonate.cpp + src/Rhodey.cpp + src/Sampler.cpp + src/Saxofony.cpp + src/Shakers.cpp + src/Simple.cpp + src/SineWave.cpp + src/SingWave.cpp + src/Sitar.cpp + src/Skini.cpp + src/Sphere.cpp + src/StifKarp.cpp + src/Stk.cpp + src/TapDelay.cpp + src/TubeBell.cpp + src/Twang.cpp + src/TwoPole.cpp + src/TwoZero.cpp + src/Voicer.cpp + src/VoicForm.cpp + src/Whistle.cpp + src/Wurley.cpp) + +set(LIBSTK_REALTIME_SOURCES + src/InetWvIn.cpp + src/InetWvOut.cpp + src/Mutex.cpp + src/RtAudio.cpp + src/RtMidi.cpp + src/RtWvIn.cpp + src/RtWvOut.cpp + src/Socket.cpp + src/TcpClient.cpp + src/TcpServer.cpp + src/Thread.cpp + src/UdpSocket.cpp +) + +set(LIBSTK_HEADERS + include/ADSR.h + include/Asymp.h + include/BandedWG.h + include/BeeThree.h + include/BiQuad.h + include/Blit.h + include/BlitSaw.h + include/BlitSquare.h + include/BlowBotl.h + include/BlowHole.h + include/Bowed.h + include/BowTable.h + include/Brass.h + include/Chorus.h + include/Clarinet.h + include/Cubic.h + include/Delay.h + include/DelayA.h + include/DelayL.h + include/Drummer.h + include/Echo.h + include/Effect.h + include/Envelope.h + include/FileLoop.h + include/FileRead.h + include/FileWrite.h + include/FileWvIn.h + include/FileWvOut.h + include/Filter.h + include/Fir.h + include/Flute.h + include/FM.h + include/FMVoices.h + include/FormSwep.h + include/FreeVerb.h + include/Function.h + include/Generator.h + include/Granulate.h + include/Guitar.h + include/HevyMetl.h + include/Iir.h + include/InetWvIn.h + include/InetWvOut.h + include/Instrmnt.h + include/JCRev.h + include/JetTable.h + include/LentPitShift.h + include/Mandolin.h + include/Mesh2D.h + include/Messager.h + include/MidiFileIn.h + include/Modal.h + include/ModalBar.h + include/Modulate.h + include/Moog.h + include/Mutex.h + include/Noise.h + include/NRev.h + include/OnePole.h + include/OneZero.h + include/PercFlut.h + include/Phonemes.h + include/PitShift.h + include/Plucked.h + include/PoleZero.h + include/PRCRev.h + include/ReedTable.h + include/Resonate.h + include/Rhodey.h + include/RtAudio.h + include/RtMidi.h + include/RtWvIn.h + include/RtWvOut.h + include/Sampler.h + include/Saxofony.h + include/Shakers.h + include/Simple.h + include/SineWave.h + include/SingWave.h + include/Sitar.h + include/Skini.h + include/SKINImsg.h + include/SKINItbl.h + include/Socket.h + include/Sphere.h + include/StifKarp.h + include/Stk.h + include/TapDelay.h + include/TcpClient.h + include/TcpServer.h + include/Thread.h + include/TubeBell.h + include/Twang.h + include/TwoPole.h + include/TwoZero.h + include/UdpSocket.h + include/Vector3D.h + include/Voicer.h + include/VoicForm.h + include/Whistle.h + include/Wurley.h + include/WvIn.h + include/WvOut.h +) + +add_library(libstk ${LIBSTK_SOURCES}) +target_include_directories(libstk PRIVATE include PUBLIC $) +set_target_properties(libstk PROPERTIES PUBLIC_HEADER "${LIBSTK_HEADERS}") +target_compile_definitions(libstk PRIVATE __LITTLE_ENDIAN__) + +install(TARGETS libstk EXPORT unofficial-libstk-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/stk) +install(EXPORT unofficial-libstk-config NAMESPACE unofficial::libstk:: DESTINATION share/unofficial-libstk) diff --git a/ports/libstk/CONTROL b/ports/libstk/CONTROL new file mode 100644 index 000000000..e8f1382b5 --- /dev/null +++ b/ports/libstk/CONTROL @@ -0,0 +1,3 @@ +Source: libstk +Version: 4.6.0-2 +Description: The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. diff --git a/ports/libstk/portfile.cmake b/ports/libstk/portfile.cmake new file mode 100644 index 000000000..1d8ec73f1 --- /dev/null +++ b/ports/libstk/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO thestk/stk + REF v4.6.0 + SHA512 8e40dbd9e2b315df769262889fdf15b4a67843984d27a1f939d8bc6e820abb662eeae3b934fa81097222c67f7922681fe170006bebe5597cbd51b0a8624a6733 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libstk TARGET_PATH share/unofficial-libstk) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk RENAME copyright) + +file(GLOB RAWFILES ${SOURCE_PATH}/rawwaves/*.raw) +file(COPY ${RAWFILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk/rawwaves) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME libstk) -- cgit v1.2.3 From 7befb86005462db5ad8ccf26ab4a370226ae614f Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 26 Feb 2019 05:41:53 +0800 Subject: [imgui] Update to 1.68 (#5426) * [imgui] Update to 1.68 * [imgui] Add an advice from the author of imgui --- ports/imgui/CONTROL | 2 +- ports/imgui/portfile.cmake | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 376a3a103..41c394eac 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.67-1 +Version: 1.68 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index e5aaa471c..2c731a11c 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -1,10 +1,18 @@ include(vcpkg_common_functions) +if (TARGET_TRIPLET MATCHES "^x(86|64)-windows$" AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + message(WARNING "\ +The author of imgui strongly advises users of this lib against using a DLL. \ +For more details, please visit: \ +https://github.com/Microsoft/vcpkg/issues/5110" + ) +endif () + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.67 - SHA512 14cca66a55597517d6e1cafa59897b8e8f482db0a31a73d87a3ca634a12afe9ece2f423c17ece802e23bb2c09322502b2b2c4318054fad03bd1c537031fd6f71 + REF v1.68 + SHA512 4a7996f188816eb1caa3130546fbfbe2069a8a338daf0540ae09e7c7d6a40082e25144e91c94f53d7ff6023925c92ce591e4d59614e08b1ca7b91097519bf4a4 HEAD_REF master ) -- cgit v1.2.3 From ecff2997f686d9169e3d088541fda7aa2ea62011 Mon Sep 17 00:00:00 2001 From: adrido Date: Mon, 25 Feb 2019 22:51:13 +0100 Subject: [Irrlicht] Add new port (#5431) --- ports/irrlicht/CMakeLists.txt | 208 ++++++++++++++++++++++++++++++++++++++++++ ports/irrlicht/CONTROL | 10 ++ ports/irrlicht/portfile.cmake | 94 +++++++++++++++++++ 3 files changed, 312 insertions(+) create mode 100644 ports/irrlicht/CMakeLists.txt create mode 100644 ports/irrlicht/CONTROL create mode 100644 ports/irrlicht/portfile.cmake diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt new file mode 100644 index 000000000..b58739836 --- /dev/null +++ b/ports/irrlicht/CMakeLists.txt @@ -0,0 +1,208 @@ +# +# Irrlicht 3D engine +# +cmake_minimum_required(VERSION 3.8) +project(Irrlicht) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# Irrlicht directories +# ------------------------------------------------------------------------------------------------- +set(IRR_ROOT_DIR "") +set(IRR_SRC_DIR "source/Irrlicht") +set(IRR_INC_DIR "include") + +# Options +# ------------------------------------------------------------------------------------------------- +set(DXSDK "") +if(DEFINED ENV{DXSDK_DIR}) + set(DXSDK "ENV{DXSDK_DIR}") +endif() + +set(IRR_FAST_MATH 0 CACHE BOOL "Whether to enable fast maths (at the expense of precision)") +set(IRR_SHARED_LIB 1 CACHE BOOL "Whether to generate shared libraries instead of static libraries") +set(IRR_DIRECTX_SDK ${DXSDK} CACHE PATH "Path to the DirectX SDK (for DirectX 9, this folder should contain /Include, /Lib)") +set(IRR_BUILD_TOOLS 0 CACHE BOOL "Whether to generate the tools") + +# Some helper functions +# ------------------------------------------------------------------------------------------------- +function(glob_c_cpp_sources result folder) + file(GLOB res + "${folder}/*.c" + "${folder}/*.cpp" + "${folder}/*.h" + "${folder}/*.hpp" + "${folder}/*.rc") + set(${result} ${res} PARENT_SCOPE) +endfunction() + +# Source files +# ------------------------------------------------------------------------------------------------- +glob_c_cpp_sources(IRR_SRC_FILES ${IRR_SRC_DIR}) +glob_c_cpp_sources(IRR_SRC_FILES_INTERFACE ${IRR_INC_DIR}) +glob_c_cpp_sources(IRR_SRC_FILES_AESGLADMAN ${IRR_SRC_DIR}/aesGladman) +glob_c_cpp_sources(IRR_SRC_FILES_LZMA ${IRR_SRC_DIR}/lzma) + +glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_ROOT_DIR}/tools/FileToHeader/) +glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_ROOT_DIR}/tools/GUIEditor/) +glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_ROOT_DIR}/tools/IrrFontTool/newFontTool/) +glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_ROOT_DIR}/tools/MeshConverter/) + +# Group files +# ------------------------------------------------------------------------------------------------- +source_group(Irrlicht\\engine FILES ${IRR_SRC_FILES}) +source_group(Irrlicht\\interface FILES ${IRR_SRC_FILES_INTERFACE}) +source_group(Irrlicht\\libs\\aesGladman FILES ${IRR_SRC_FILES_AESGLADMAN}) +source_group(Irrlicht\\libs\\lzma FILES ${IRR_SRC_FILES_LZMA}) + +# Library files +# ------------------------------------------------------------------------------------------------- +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(BZip2 REQUIRED) +#find_package(LIBLZMA REQUIRED) # LIBLZMA does not export _LzmaDecode + +# Irrlicht target +# ------------------------------------------------------------------------------------------------- +set(IRR_ALL_SRC_FILES + ${IRR_SRC_FILES} + ${IRR_SRC_FILES_INTERFACE} + ${IRR_SRC_FILES_AESGLADMAN} + ${IRR_SRC_FILES_LZMA} + ) + +if(${IRR_SHARED_LIB}) + add_library(Irrlicht SHARED ${IRR_ALL_SRC_FILES}) +else() + add_library(Irrlicht STATIC ${IRR_ALL_SRC_FILES}) +endif() + +target_link_libraries(Irrlicht PRIVATE + ${ZLIB_LIBRARY} + ${PNG_LIBRARY} + ${JPEG_LIBRARY} + ${BZIP2_LIBRARY} + ) + +if(IRR_BUILD_TOOLS) + add_executable(FileToHeader ${IRR_TOOL_FILES_FILE_TO_HEADER}) + + add_executable(GUIEditor ${IRR_TOOL_FILES_GUI_EDITOR}) + target_link_libraries(GUIEditor Irrlicht) + + add_executable(FontTool ${IRR_TOOL_FILES_FONT_TOOL}) + target_link_libraries(FontTool Irrlicht) + + add_executable(MeshConverter ${IRR_TOOL_FILES_MESH_CONVERTER}) + target_link_libraries(MeshConverter Irrlicht) +endif() + +# Target properties (for compilation & export) +# ------------------------------------------------------------------------------------------------- +target_include_directories(Irrlicht + PRIVATE ${IRR_SRC_DIR} + PRIVATE ${IRR_SRC_DIR}/aesGladman + PRIVATE ${BZIP2_INCLUDE_DIR} + PRIVATE ${JPEG_INCLUDE_DIR} + PRIVATE ${LIBPNG_INCLUDE_DIR} + PRIVATE ${IRR_SRC_DIR}/lzma + PRIVATE ${ZLIB_INCLUDE_DIR} + ) + +# I dont realy understand why this is necesary or what it is doing, +# but it is necesarry to build and export a package. +# See: https://cmake.org/cmake/help/v3.8/command/target_include_directories.html +target_include_directories(Irrlicht PUBLIC + $ + $ # /include/irrlicht +) + +if(NOT ${IRR_DIRECTX_SDK} STREQUAL "") + target_include_directories(Irrlicht PRIVATE ${IRR_DIRECTX_SDK}/Include) + if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) + set(DX_LIBS ${IRR_DIRECTX_SDK}/Lib/x86) + else() + set(DX_LIBS ${IRR_DIRECTX_SDK}/Lib/x64) + endif() + target_link_libraries(Irrlicht + PRIVATE ${DX_LIBS}/d3dx9.lib + PRIVATE ${DX_LIBS}/dinput8.lib + PRIVATE ${DX_LIBS}/dxguid.lib) +else() + target_compile_definitions(Irrlicht PRIVATE NO_IRR_COMPILE_WITH_DIRECT3D_9_) +endif() + +if(NOT ${IRR_SHARED_LIB}) + target_compile_definitions(Irrlicht PUBLIC _IRR_STATIC_LIB_) +endif() + +# Per platform config +# ------------------------------------------------------------------------------------------------- + +# Export symbols +target_compile_definitions(Irrlicht PRIVATE IRRLICHT_EXPORTS) + +if(WIN32) + # Import the symbols of bzip2 + target_compile_definitions(Irrlicht PRIVATE BZ_IMPORT) + + # Disable the ton of warnings from standard library + target_compile_definitions(Irrlicht PRIVATE _CRT_SECURE_NO_WARNINGS) + + # Multi processor compilation + target_compile_options(Irrlicht PRIVATE /MP) + + # Fast math options + if(${IRR_FAST_MATH}) + target_compile_options(Irrlicht PRIVATE /fp:fast) + message("Fast Math Enabled") + # SSE2 is automatically activated on x64 + if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) + target_compile_options(Irrlicht PRIVATE /arch:SSE2) + endif() + endif() + +elseif(UNIX) + # Standard mode + target_compile_options(Irrlicht + PRIVATE -Wall + PRIVATE -pipe + PRIVATE -fno-exceptions + PRIVATE -fno-strict-aliasing) + + # Disable RTTI on C++ files only (no sense for C files) + set_source_files_properties(${IRR_SRC_FILES} ${IRR_SRC_FILES_AESGLADMAN} + PROPERTIES COMPILE_FLAGS -fno-rtti) + + # Debug macro + target_compile_options(Irrlicht PRIVATE $<$:-D_DEBUG>) + + # X11 and OpenGL + target_link_libraries(Irrlicht + PRIVATE X11 + PRIVATE GL + PRIVATE Xxf86vm) +endif() + +# Installation +# ------------------------------------------------------------------------------------------------- +install( + TARGETS Irrlicht + EXPORT Irrlicht + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${IRR_SRC_FILES_INTERFACE} DESTINATION "include/irrlicht" CONFIGURATIONS Release) + +if(IRR_BUILD_TOOLS) + install( + TARGETS FileToHeader GUIEditor FontTool MeshConverter + RUNTIME DESTINATION tools/irrlicht/ + CONFIGURATIONS Release + ) +endif() + +install(EXPORT Irrlicht FILE irrlicht-targets.cmake DESTINATION share/irrlicht) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL new file mode 100644 index 000000000..59071e8dc --- /dev/null +++ b/ports/irrlicht/CONTROL @@ -0,0 +1,10 @@ +Source: irrlicht +Version: 1.8.4 +Description: Irrlicht lightning fast 3d engine +Build-Depends: zlib, libpng, bzip2, libjpeg-turbo + +Feature: fast-fpu +Description: Enable fast maths (at the expense of precision) + +Feature: tools +Description: Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake new file mode 100644 index 000000000..0f9f4691e --- /dev/null +++ b/ports/irrlicht/portfile.cmake @@ -0,0 +1,94 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +vcpkg_download_distfile(ARCHIVE + URLS "https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/1.8/1.8.4/irrlicht-1.8.4.zip" + FILENAME "irrlicht-1.8.4.zip" + SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "1.8.4" + # [NO_REMOVE_ONE_LEVEL] + # [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] + # [PATCHES ...] +) + +# Copy CMakeLists.txt to the source, because Irrlicht does not have one. +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +set(FAST_MATH FALSE) +if("fast-fpu" IN_LIST FEATURES) + set(FAST_MATH TRUE) +endif() + +set(BUILD_TOOLS FALSE) +if("tools" IN_LIST FEATURES) + set(BUILD_TOOLS TRUE) +endif() + +set(SHARED_LIB TRUE) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SHARED_LIB FALSE) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DIRR_SHARED_LIB=${SHARED_LIB} + -DIRR_FAST_MATH=${FAST_MATH} + -DIRR_BUILD_TOOLS=${BUILD_TOOLS} + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets() + +if(BUILD_TOOLS) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) +endif() + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") +# Handle copyright +file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/copyright " +The Irrlicht Engine License +=========================== + +Copyright (C) 2002-2015 Nikolaus Gebhardt + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgement in the product documentation would be + appreciated but is not required. +2. Altered source versions must be clearly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution.") + +vcpkg_copy_pdbs() + +# Post-build test for cmake libraries +vcpkg_test_cmake(PACKAGE_NAME irrlicht) -- cgit v1.2.3 From bd94d1e254aede85506e07a632d1a7aafd538115 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Tue, 26 Feb 2019 08:16:20 -0800 Subject: [freeimage, libwebp, OpenEXR, OpenVDB] Updates (#5417) * [libwebp] update to v1.0.2, greatly simplify port, remove unnecessary custom find_package script in favour of original Config files for cmake * [libwebp] enable building of all tools * [libwebp] install cmake config file in expected path * [libwebp] add compatibility layer inside CMake Config file * [libwebp] fix libwebpmux library name * [OpenEXR] Update to v2.3.0, enable tools, improve cmake module while still maintaining backwards compatibility (there's an official one distributed with the package but it is completely different, for now it is avoided) * [OpenEXR] remove unused patches * [OpenEXR] remove forced definition, could hide problems downstream * [freeimage] add compatibility with latest OpenEXR * [freeimage] bump control * [OpenEXR] restore ilmbase as an empty package to permit clean update * [OpenVDB] update to v6.0 * [OpenEXR] disable building on UWP platform * [openexr] Fix tools suffixes * [openexr] Fix Linux build paths --- ports/freeimage/CMakeLists.txt | 51 ++--- ports/freeimage/CONTROL | 2 +- ports/freeimage/cmake/FindJXR.cmake | 28 --- ports/freeimage/cmake/FindOpenEXR.cmake | 28 --- ports/freeimage/cmake/FindWEBP.cmake | 26 --- ports/freeimage/portfile.cmake | 13 +- ports/ilmbase/CONTROL | 7 +- ports/ilmbase/fix-parallel-build.patch | 54 ----- ports/ilmbase/portfile.cmake | 50 +---- ports/libwebp/0001-build-fixes.patch | 163 +++++++++++++++ ...-cmake-config-add-backwards-compatibility.patch | 69 +++++++ ports/libwebp/CONTROL | 8 +- ports/libwebp/FindWebP.cmake | 27 --- ports/libwebp/build_fixes.patch | 33 --- ports/libwebp/portfile.cmake | 89 ++++++-- ports/openexr/CMakeLists.txt.patch | 86 -------- ports/openexr/CONTROL | 4 +- ports/openexr/FindOpenEXR.cmake | 88 +++++++- ports/openexr/add-missing-export.patch | 13 -- ports/openexr/fix-static-linking.patch | 14 -- ports/openexr/portfile.cmake | 98 +++++---- ports/openvdb/0001-fix-cmake-modules.patch | 198 ++++++++++++++++++ ports/openvdb/0002-add-custom-options.patch | 14 ++ .../0003-build-only-necessary-targets.patch | 230 +++++++++++++++++++++ ports/openvdb/AddLinkageAndToolsChoice.patch | 225 -------------------- ports/openvdb/CONTROL | 6 +- ports/openvdb/UseGLEWOnWindowsForViewer.patch | 60 ------ ports/openvdb/portfile.cmake | 89 ++------ 28 files changed, 947 insertions(+), 826 deletions(-) delete mode 100644 ports/freeimage/cmake/FindJXR.cmake delete mode 100644 ports/freeimage/cmake/FindOpenEXR.cmake delete mode 100644 ports/freeimage/cmake/FindWEBP.cmake delete mode 100644 ports/ilmbase/fix-parallel-build.patch create mode 100644 ports/libwebp/0001-build-fixes.patch create mode 100644 ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch delete mode 100644 ports/libwebp/FindWebP.cmake delete mode 100644 ports/libwebp/build_fixes.patch delete mode 100644 ports/openexr/CMakeLists.txt.patch delete mode 100644 ports/openexr/add-missing-export.patch delete mode 100644 ports/openexr/fix-static-linking.patch create mode 100644 ports/openvdb/0001-fix-cmake-modules.patch create mode 100644 ports/openvdb/0002-add-custom-options.patch create mode 100644 ports/openvdb/0003-build-only-necessary-targets.patch delete mode 100644 ports/openvdb/AddLinkageAndToolsChoice.patch delete mode 100644 ports/openvdb/UseGLEWOnWindowsForViewer.patch diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 997fba37a..60c7f9bd8 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -4,22 +4,27 @@ include(GNUInstallDirs) project(FreeImage C CXX) -find_package(zlib REQUIRED) -find_package(PNG REQUIRED) -find_package(JPEG REQUIRED) -if(NOT JPEG_LIBRARY_DEBUG) - set(JPEG_LIBRARY_DEBUG ${JPEG_LIBRARY_RELEASE}) +set(CMAKE_MODULE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/share/JXR" ${CMAKE_MODULE_PATH}) +set(CMAKE_MODULE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/share/OpenEXR" ${CMAKE_MODULE_PATH}) + +if(MSVC) + add_definitions("-D_CRT_SECURE_NO_WARNINGS") + set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}") endif() -find_package(TIFF REQUIRED) -find_package(OPENJPEG REQUIRED) -# Include some custom Find***.cmake modules -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +if(BUILD_SHARED_LIBS) + add_definitions("-DOPENEXR_DLL") +endif() -find_package(WEBP REQUIRED) -find_package(JXR REQUIRED) -find_package(LibRaw REQUIRED) -find_package(OpenEXR REQUIRED) +find_package(zlib REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(TIFF REQUIRED) +find_package(OpenJPEG REQUIRED) +find_package(WebP REQUIRED) +find_package(JXR REQUIRED) +find_package(LibRaw REQUIRED) +find_package(OpenEXR REQUIRED) option(BUILD_SHARED_LIBS "Build shared libraries" ON) option(INSTALL_HEADERS "Install the development headers" ON) @@ -33,12 +38,12 @@ set(CMAKE_DEBUG_POSTFIX "d") set(PUBLIC_HEADERS ${REAL_SOURCE_DIR}/FreeImage.h) # List the private header files -set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h - ${REAL_SOURCE_DIR}/FreeImageIO.h +set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h + ${REAL_SOURCE_DIR}/FreeImageIO.h ${REAL_SOURCE_DIR}/MapIntrospector.h - ${REAL_SOURCE_DIR}/Plugin.h - ${REAL_SOURCE_DIR}/Quantizers.h - ${REAL_SOURCE_DIR}/ToneMapping.h + ${REAL_SOURCE_DIR}/Plugin.h + ${REAL_SOURCE_DIR}/Quantizers.h + ${REAL_SOURCE_DIR}/ToneMapping.h ${REAL_SOURCE_DIR}/Utilities.h) file(GLOB FREEIMAGE_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImage/*.h) @@ -59,7 +64,7 @@ file(GLOB METADATA_SRCS ${REAL_SOURCE_DIR}/Metadata/*.cpp) # The G3 plugin is disabled because it require the private copy of tiff list(REMOVE_ITEM FREEIMAGE_SRCS ${REAL_SOURCE_DIR}/FreeImage/PluginG3.cpp) -# The JPEGTransform plugin is disable because it requires a private copy of jpeg +# The JPEGTransform plugin is disable because it requires a private copy of jpeg list(REMOVE_ITEM FREEIMAGE_TOOLKIT_SRCS ${REAL_SOURCE_DIR}/FreeImageToolkit/JPEGTransform.cpp) @@ -69,8 +74,8 @@ set(SRCS ${DEPRECATION_SRCS} ${METADATA_SRCS} ) -# If FreeImage is used as a static library, FREEIMAGE_LIB -# needs to be defined (at the C preprocessor level) to correctly +# If FreeImage is used as a static library, FREEIMAGE_LIB +# needs to be defined (at the C preprocessor level) to correctly # define (to nothing instead of _declspec(dllimport) ) the DLL_API macro. # For this purpouse we include (depending on the BUILD_SHARED_LIBS ) # the appropriate FreeImageConfig.h . @@ -90,7 +95,7 @@ else() endif() target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR} - ${ZLIB_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} ${JPEG_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} @@ -149,4 +154,4 @@ install(TARGETS FreeImagePlus if(INSTALL_HEADERS) install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -endif() \ No newline at end of file +endif() diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index d8bd820e6..5497b0fa3 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,4 +1,4 @@ Source: freeimage -Version: 3.18.0-2 +Version: 3.18.0-3 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr Description: Support library for graphics image formats diff --git a/ports/freeimage/cmake/FindJXR.cmake b/ports/freeimage/cmake/FindJXR.cmake deleted file mode 100644 index 7e4a5d45e..000000000 --- a/ports/freeimage/cmake/FindJXR.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# - Find JXR -# Find the JXR library -# This module defines -# JXR_INCLUDE_DIRS, where to find jxrlib/JXRGlue.h -# JXR_LIBRARIES, the libraries needed to use JXR -# - -find_path(JXR_INCLUDE_DIRS - NAMES JXRGlue.h - PATH_SUFFIXES jxrlib -) -mark_as_advanced(JXR_INCLUDE_DIRS) - -include(SelectLibraryConfigurations) - -find_library(JPEGXR_LIBRARY_RELEASE NAMES jpegxr PATH_SUFFIXES lib) -find_library(JPEGXR_LIBRARY_DEBUG NAMES jpegxrd PATH_SUFFIXES lib) -select_library_configurations(JPEGXR) - -find_library(JXRGLUE_LIBRARY_RELEASE NAMES jxrglue PATH_SUFFIXES lib) -find_library(JXRGLUE_LIBRARY_DEBUG NAMES jxrglued PATH_SUFFIXES lib) -select_library_configurations(JXRGLUE) - -set(JXR_LIBRARIES ${JPEGXR_LIBRARY} ${JXRGLUE_LIBRARY}) -mark_as_advanced(JXR_LIBRARIES) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JXR DEFAULT_MSG JXR_INCLUDE_DIRS JXR_LIBRARIES) diff --git a/ports/freeimage/cmake/FindOpenEXR.cmake b/ports/freeimage/cmake/FindOpenEXR.cmake deleted file mode 100644 index beca25145..000000000 --- a/ports/freeimage/cmake/FindOpenEXR.cmake +++ /dev/null @@ -1,28 +0,0 @@ -find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h) - -file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H) - -string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}") -string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}") -set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}") - -find_library(OpenEXR_LIBRARY IlmImf-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_UTIL_LIBRARY IlmImfUtil-${OpenEXR_LIB_SUFFIX}) - -find_library(OpenEXR_HALF_LIBRARY Half) -find_library(OpenEXR_IEX_LIBRARY Iex-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_THREAD_LIBRARY IlmThread-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_IEXMATH_LIBRARY IexMath-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_MATH_LIBRARY Imath-${OpenEXR_LIB_SUFFIX}) - -set(OpenEXR_LIBRARIES - ${OpenEXR_LIBRARY} - ${OpenEXR_MATH_LIBRARY} - ${OpenEXR_IEXMATH_LIBRARY} - ${OpenEXR_UTIL_LIBRARY} - ${OpenEXR_HALF_LIBRARY} - ${OpenEXR_IEX_LIBRARY} - ${OpenEXR_THREAD_LIBRARY}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS) diff --git a/ports/freeimage/cmake/FindWEBP.cmake b/ports/freeimage/cmake/FindWEBP.cmake deleted file mode 100644 index b4fefeadc..000000000 --- a/ports/freeimage/cmake/FindWEBP.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# - Find WEBP -# Find the WEBP library -# This module defines -# WEBP_INCLUDE_DIRS, where to find webp/decode.h -# WEBP_LIBRARIES, the libraries needed to use WEBP -# - -find_path(WEBP_INCLUDE_DIRS - NAMES webp/decode.h -) -mark_as_advanced(WEBP_INCLUDE_DIRS) - -find_library(WEBP_LIBRARY_RELEASE NAMES webp PATH_SUFFIXES lib) -find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATH_SUFFIXES lib) - -find_library(WEBPMUX_LIBRARY_RELEASE NAMES webpmux PATH_SUFFIXES lib) -find_library(WEBPMUX_LIBRARY_DEBUG NAMES webpmuxd PATH_SUFFIXES lib) - -include(SelectLibraryConfigurations) -select_library_configurations(WEBP) -select_library_configurations(WEBPMUX) - -set(WEBP_LIBRARIES ${WEBPMUX_LIBRARY} ${WEBP_LIBRARY}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES) diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index 6f3cfaebe..3fea39a0e 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -13,11 +13,8 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-static.h DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-dynamic.h DESTINATION ${SOURCE_PATH}) -# Copy some useful Find***.cmake modules -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}) - -# This is not strictly necessary, but to make sure -# that no "internal" libraries are used by removing them +# This is not strictly necessary, but to make sure +# that no "internal" libraries are used we remove them file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibJPEG) file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibPNG) file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibTIFF4) @@ -46,7 +43,11 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS_DEBUG -DINSTALL_HEADERS=OFF + OPTIONS + -DVCPKG_ROOT_DIR=${VCPKG_ROOT_DIR} + -DTARGET_TRIPLET=${TARGET_TRIPLET} + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF ) vcpkg_install_cmake() diff --git a/ports/ilmbase/CONTROL b/ports/ilmbase/CONTROL index 9e405df31..51ea5dffc 100644 --- a/ports/ilmbase/CONTROL +++ b/ports/ilmbase/CONTROL @@ -1,3 +1,4 @@ -Source: ilmbase -Version: 2.2.1-1 -Description: Base libraries from ILM for OpenEXR +Source: ilmbase +Version: 2.3.0 +Build-Depends: openexr +Description: empty package, linking to newer one diff --git a/ports/ilmbase/fix-parallel-build.patch b/ports/ilmbase/fix-parallel-build.patch deleted file mode 100644 index 85c773f31..000000000 --- a/ports/ilmbase/fix-parallel-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Half/CMakeLists.txt b/Half/CMakeLists.txt -index 6f9714d..0c43904 100644 ---- a/Half/CMakeLists.txt -+++ b/Half/CMakeLists.txt -@@ -2,10 +2,10 @@ - - ADD_EXECUTABLE ( eLut eLut.cpp ) - --ADD_CUSTOM_COMMAND ( -- TARGET eLut POST_BUILD -+ADD_CUSTOM_TARGET ( make_eLut - COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ DEPENDS eLut - ) - SET_SOURCE_FILES_PROPERTIES( - ${CMAKE_CURRENT_BINARY_DIR}/eLut.h -@@ -13,25 +13,16 @@ SET_SOURCE_FILES_PROPERTIES( - ) - - ADD_EXECUTABLE ( toFloat toFloat.cpp ) --ADD_CUSTOM_COMMAND ( -- TARGET toFloat POST_BUILD -+ADD_CUSTOM_TARGET ( make_toFloat - COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ DEPENDS toFloat - ) - SET_SOURCE_FILES_PROPERTIES( - ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h - PROPERTIES HEADER_FILE_ONLY TRUE - ) - --SET_SOURCE_FILES_PROPERTIES( -- half.cpp -- PROPERTIES -- OBJECT_DEPENDS -- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h -- OBJECT_DEPENDS -- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h -- ) -- - IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DHALF_EXPORTS) - ENDIF() -@@ -41,7 +32,7 @@ ADD_LIBRARY ( Half ${LIB_TYPE} - ) - - --ADD_DEPENDENCIES ( Half toFloat eLut ) -+ADD_DEPENDENCIES ( Half make_toFloat make_eLut ) - - INSTALL ( TARGETS - Half diff --git a/ports/ilmbase/portfile.cmake b/ports/ilmbase/portfile.cmake index 1752beb2c..9aefc8241 100644 --- a/ports/ilmbase/portfile.cmake +++ b/ports/ilmbase/portfile.cmake @@ -1,49 +1 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "UWP build not supported") -endif() - -set(ILM_VERSION 2.2.1) -set(ILM_HASH a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320) - -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILM_VERSION}.tar.gz" - FILENAME "ilmbase-${ILM_VERSION}.tar.gz" - SHA512 ${ILM_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-parallel-build.patch) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA) -vcpkg_install_cmake() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - foreach(SUBDIR "" "/debug") - file(GLOB DLLS ${CURRENT_PACKAGES_DIR}${SUBDIR}/lib/*.dll) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}${SUBDIR}/bin) - file(REMOVE ${DLLS}) - endforeach() -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_copy_pdbs() - -foreach(HEADER halfExport.h IexExport.h IexMathFloatExc.h IlmThreadExport.h ImathExport.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} HEADER_FILE) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - string(REPLACE "defined(OPENEXR_DLL)" "1" HEADER_FILE "${HEADER_FILE}") - else() - string(REPLACE "defined(OPENEXR_DLL)" "0" HEADER_FILE "${HEADER_FILE}") - endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} "${HEADER_FILE}") -endforeach() - -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ilmbase) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/ilmbase/LICENSE ${CURRENT_PACKAGES_DIR}/share/ilmbase/copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch new file mode 100644 index 000000000..c25ecbfee --- /dev/null +++ b/ports/libwebp/0001-build-fixes.patch @@ -0,0 +1,163 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 499ddce..895fda9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -159,6 +159,10 @@ add_definitions(-DHAVE_CONFIG_H) + if(MSVC) + # avoid security warnings for e.g., fopen() used in the examples. + add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ add_definitions(-DWEBP_HAVE_JUST_SDL_H) ++ if(BUILD_SHARED_LIBS) ++ add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\)) ++ endif() + else() + add_definitions(-Wall) + endif() +@@ -342,19 +346,23 @@ if(WEBP_BUILD_ANIM_UTILS + "example_util_[^ ]*") + list(APPEND EXAMPLEUTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/stopwatch.h) + add_library(exampleutil ${EXAMPLEUTIL_SRCS}) ++ set_target_properties(exampleutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + target_include_directories( + exampleutil + PUBLIC $) ++ target_link_libraries(exampleutil imageioutil) + + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS" + "imageio_util_[^ ]*") + add_library(imageioutil ${IMAGEIOUTILS_SRCS}) ++ set_target_properties(imageioutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + target_link_libraries(imageioutil webp) + + # Image-decoding utility library. + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS" + "imagedec_[^ ]*") + add_library(imagedec ${IMAGEDEC_SRCS}) ++ set_target_properties(imagedec PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + target_link_libraries(imagedec + imageioutil + webpdemux +@@ -365,7 +373,8 @@ if(WEBP_BUILD_ANIM_UTILS + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEENC_SRCS" + "imageenc_[^ ]*") + add_library(imageenc ${IMAGEENC_SRCS}) +- target_link_libraries(imageenc webp) ++ set_target_properties(imageenc PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) ++ target_link_libraries(imageenc imageioutil webp) + + set_property(TARGET exampleutil + imageioutil +@@ -380,7 +389,7 @@ if(WEBP_BUILD_DWEBP) + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "DWEBP_SRCS" "dwebp") + add_executable(dwebp ${DWEBP_SRCS}) + target_link_libraries(dwebp exampleutil imagedec imageenc) +- target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + install(TARGETS dwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +@@ -389,13 +398,14 @@ if(WEBP_BUILD_CWEBP) + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "CWEBP_SRCS" "cwebp") + add_executable(cwebp ${CWEBP_SRCS}) + target_link_libraries(cwebp exampleutil imagedec webp) +- target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") + add_library(libwebpmux ${WEBP_MUX_SRCS}) ++ set_target_properties(libwebpmux PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + target_link_libraries(libwebpmux webp) + target_include_directories(libwebpmux + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} +@@ -411,7 +421,7 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) + "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ + ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ + ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") +- set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) ++ #set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) + list(APPEND INSTALLED_LIBRARIES libwebpmux) + configure_pkg_config("src/mux/libwebpmux.pc") + endif() +@@ -428,7 +438,7 @@ if(WEBP_BUILD_GIF2WEBP) + webp + libwebpmux + ${WEBP_DEP_GIF_LIBRARIES}) +- target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +@@ -444,7 +454,7 @@ if(WEBP_BUILD_IMG2WEBP) + imageioutil + webp + libwebpmux) +- target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +@@ -464,6 +474,7 @@ if(WEBP_BUILD_VWEBP) + webpdemux) + target_include_directories(vwebp + PRIVATE GLUT::GLUT ++ ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}/src + ${OPENGL_INCLUDE_DIR}) + install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +@@ -483,7 +494,7 @@ if(WEBP_BUILD_WEBPINFO) + "webpinfo") + add_executable(webpinfo ${WEBPINFO_SRCS}) + target_link_libraries(webpinfo exampleutil imageioutil) +- target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +@@ -493,7 +504,7 @@ if(WEBP_BUILD_WEBPMUX) + "webpmux") + add_executable(webpmux ${WEBPMUX_SRCS}) + target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp) +- target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +@@ -540,7 +551,7 @@ if(WEBP_BUILD_WEBP_JS) + # JavaScript version + add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) + target_link_libraries(webp_js webpdecoder SDL) +- target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + set(WEBP_HAVE_SDL 1) + set_target_properties( + webp_js +@@ -553,7 +564,7 @@ if(WEBP_BUILD_WEBP_JS) + # WASM version + add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) + target_link_libraries(webp_wasm webpdecoder SDL) +- target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + set_target_properties( + webp_wasm + PROPERTIES LINK_FLAGS "-s WASM=1 -s 'BINARYEN_METHOD=\"native-wasm\"' \ +@@ -579,7 +590,7 @@ if(WEBP_BUILD_ANIM_UTILS) + libwebpmux + webpdemux + ${WEBP_DEP_GIF_LIBRARIES}) +- target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + + # anim_dump + include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS} ${WEBP_DEP_GIF_INCLUDE_DIRS}) +@@ -595,7 +606,7 @@ if(WEBP_BUILD_ANIM_UTILS) + libwebpmux + webpdemux + ${WEBP_DEP_GIF_LIBRARIES}) +- target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) + endif() + + # Install the different headers and libraries. diff --git a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch new file mode 100644 index 000000000..2ed199ec8 --- /dev/null +++ b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch @@ -0,0 +1,69 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index bb22164..3ad256f 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION}) + @PACKAGE_INIT@ + + include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + +-set(WebP_INCLUDE_DIRS "webp") +-set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) +-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") +-set(WEBP_LIBRARIES "${WebP_LIBRARIES}") ++find_path(WEBP_INCLUDE_DIR NAMES webp/types.h) ++set(WebP_INCLUDE_DIR ${WEBP_INCLUDE_DIR}) ++set(WebP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) ++set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) ++ ++if(NOT WEBP_BASE_LIBRARY AND NOT WebP_BASE_LIBRARY) ++ find_library(WEBP_BASE_LIBRARY_RELEASE NAMES webp) ++ find_library(WEBP_BASE_LIBRARY_DEBUG NAMES webpd) ++ select_library_configurations(WEBP_BASE) ++ set(WebP_BASE_LIBRARY ${WEBP_BASE_LIBRARY}) ++ if(WEBP_BASE_LIBRARY) ++ list(APPEND WEBP_LIBRARIES "${WEBP_BASE_LIBRARY}") ++ list(APPEND WebP_LIBRARIES "${WebP_BASE_LIBRARY}") ++ endif() ++endif() ++ ++if(NOT WEBP_DECODER_LIBRARY AND NOT WebP_DECODER_LIBRARY) ++ find_library(WEBP_DECODER_LIBRARY_RELEASE NAMES webpdecoder) ++ find_library(WEBP_DECODER_LIBRARY_DEBUG NAMES webpdecoderd) ++ select_library_configurations(WEBP_DECODER) ++ set(WebP_DECODER_LIBRARY ${WEBP_DECODER_LIBRARY}) ++ if(WEBP_DECODER_LIBRARY) ++ list(APPEND WEBP_LIBRARIES "${WEBP_DECODER_LIBRARY}") ++ list(APPEND WebP_LIBRARIES "${WebP_DECODER_LIBRARY}") ++ endif() ++endif() ++ ++if(NOT WEBP_DEMUX_LIBRARY AND NOT WebP_DEMUX_LIBRARY) ++ find_library(WEBP_DEMUX_LIBRARY_RELEASE NAMES webpdemux) ++ find_library(WEBP_DEMUX_LIBRARY_DEBUG NAMES webpdemuxd) ++ select_library_configurations(WEBP_DEMUX) ++ set(WebP_DEMUX_LIBRARY ${WEBP_DEMUX_LIBRARY}) ++ if(WEBP_DEMUX_LIBRARY) ++ list(APPEND WEBP_LIBRARIES "${WEBP_DEMUX_LIBRARY}") ++ list(APPEND WebP_LIBRARIES "${WebP_DEMUX_LIBRARY}") ++ endif() ++endif() ++ ++if(NOT WEBP_MUX_LIBRARY AND NOT WebP_MUX_LIBRARY) ++ find_library(WEBP_MUX_LIBRARY_RELEASE NAMES libwebpmux) ++ find_library(WEBP_MUX_LIBRARY_DEBUG NAMES libwebpmuxd) ++ select_library_configurations(WEBP_MUX) ++ set(WebP_MUX_LIBRARY ${WEBP_MUX_LIBRARY}) ++ if(WEBP_MUX_LIBRARY) ++ list(APPEND WEBP_LIBRARIES "${WEBP_MUX_LIBRARY}") ++ list(APPEND WebP_LIBRARIES "${WebP_MUX_LIBRARY}") ++ endif() ++endif() ++ ++set(WEBP_LIBRARY ${WEBP_BASE_LIBRARY}) ++set(WebP_LIBRARY ${WebP_BASE_LIBRARY}) ++if(WEBP_BASE_LIBRARY AND WEBP_INCLUDE_DIR) ++ set(WEBP_FOUND 1) ++ set(WebP_FOUND 1) ++endif() diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index 3e3ae16d8..9ffa6426d 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -1,3 +1,9 @@ Source: libwebp -Version: 0.6.1-2 +Version: 1.0.2-1 Description: Lossy compression of digital photographic images. +Build-Depends: opengl +Default-Features: all + +Feature: all +Description: enable all webp features +Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut, sdl1 diff --git a/ports/libwebp/FindWebP.cmake b/ports/libwebp/FindWebP.cmake deleted file mode 100644 index c39a0eb05..000000000 --- a/ports/libwebp/FindWebP.cmake +++ /dev/null @@ -1,27 +0,0 @@ -include(SelectLibraryConfigurations) -include(FindPackageHandleStandardArgs) - -# If the user has provided ``WEBP_ROOT``, use it! Choose items found -# at this location over system locations. -if( EXISTS "$ENV{WEBP_ROOT}" ) - file( TO_CMAKE_PATH "$ENV{WEBP_ROOT}" WEBP_ROOT ) - set( WEBP_ROOT "${WEBP_ROOT}" CACHE PATH "Prefix for WebP installation." ) -elseif(EXISTS "$ENV{WEBP_DIR}" ) - file( TO_CMAKE_PATH "$ENV{WEBP_DIR}" WEBP_ROOT ) - set( WEBP_ROOT "${WEBP_ROOT}" CACHE PATH "Prefix for WebP installation." ) -endif() - -if(NOT WEBP_INCLUDE_DIR) - FIND_PATH(WEBP_INCLUDE_DIR NAMES webp/decode.h) -endif() - -if(NOT WEBP_LIBRARY) - find_library(WEBP_LIBRARY_RELEASE NAMES webp PATHS ${WEBP_ROOT} PATH_SUFFIXES webp ) - find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATHS ${WEBP_ROOT} PATH_SUFFIXES debug webp webp/debug debug/webp) - select_library_configurations(WEBP) -endif() - -SET(WEBP_LIBRARIES ${WEBP_LIBRARY}) -SET(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) - -find_package_handle_standard_args(WEBP REQUIRED_VARS WEBP_LIBRARY WEBP_INCLUDE_DIR) diff --git a/ports/libwebp/build_fixes.patch b/ports/libwebp/build_fixes.patch deleted file mode 100644 index 72cb304a9..000000000 --- a/ports/libwebp/build_fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b105e37..f9b806c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,9 @@ endforeach() - if(MSVC) - # avoid security warnings for e.g., fopen() used in the examples. - add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ if(BUILD_SHARED_LIBS) -+ add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\)) -+ endif() - else() - add_definitions(-Wall) - endif() -@@ -235,6 +238,10 @@ if(WEBP_BUILD_GIF2WEBP AND NOT GIF_FOUND) - endif() - - if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) -+ set(WEBP_BUILD_MUX ON) -+endif() -+ -+if(WEBP_BUILD_MUX) - parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" - "") - add_library(webpmux ${WEBP_MUX_SRCS}) -@@ -322,6 +329,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h - DESTINATION include/webp) - install(TARGETS ${INSTALLED_LIBRARIES} -+ RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index e4f5dbbc8..bae24ddff 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,37 +1,84 @@ include(vcpkg_common_functions) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO webmproject/libwebp - REF v0.6.1 - SHA512 313b345a01c91eb07c2e4d46b93fcda9c50dca9e05e39f757238a679355514a2e9bc9bc220f3d3eb6d6a55148957cb2be14dac330203953337759841af1a32bf - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebp + REF v1.0.2 + SHA512 27ca4e7c87d3114a5d3dba6801b5608207a9adc44d0fa62f7523d39be789d389d342d9db5e28c9301eff8fcb1471809c76680a68abd4ff97217b17dd13c4e22b + HEAD_REF master + PATCHES + 0001-build-fixes.patch + 0002-cmake-config-add-backwards-compatibility.patch ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/build_fixes.patch -) +set(WEBP_BUILD_ANIM_UTILS OFF) +set(WEBP_BUILD_GIF2WEBP OFF) +set(WEBP_BUILD_IMG2WEBP OFF) +set(WEBP_BUILD_VWEBP OFF) +set(WEBP_BUILD_WEBPINFO OFF) +set(WEBP_BUILD_WEBPMUX OFF) +set(WEBP_BUILD_EXTRAS OFF) +set(WEBP_NEAR_LOSSLESS OFF) +if("all" IN_LIST FEATURES) + set(WEBP_BUILD_ANIM_UTILS ON) + set(WEBP_NEAR_LOSSLESS ON) + set(WEBP_BUILD_GIF2WEBP ON) + set(WEBP_BUILD_IMG2WEBP ON) + set(WEBP_BUILD_VWEBP ON) + set(WEBP_BUILD_WEBPINFO ON) + set(WEBP_BUILD_WEBPMUX ON) + set(WEBP_BUILD_EXTRAS ON) +endif() vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCMAKE_DEBUG_POSTFIX=d - -DWEBP_BUILD_MUX=ON + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DWEBP_ENABLE_SIMD:BOOL=ON + -DWEBP_BUILD_ANIM_UTILS:BOOL=${WEBP_BUILD_ANIM_UTILS} + -DWEBP_BUILD_CWEBP:BOOL=OFF + -DWEBP_BUILD_DWEBP:BOOL=OFF + -DWEBP_BUILD_GIF2WEBP:BOOL=${WEBP_BUILD_GIF2WEBP} + -DWEBP_BUILD_IMG2WEBP:BOOL=${WEBP_BUILD_IMG2WEBP} + -DWEBP_BUILD_VWEBP:BOOL=${WEBP_BUILD_VWEBP} + -DWEBP_BUILD_WEBPINFO:BOOL=${WEBP_BUILD_WEBPINFO} + -DWEBP_BUILD_WEBPMUX:BOOL=${WEBP_BUILD_WEBPMUX} + -DWEBP_BUILD_EXTRAS:BOOL=${WEBP_BUILD_EXTRAS} + -DWEBP_BUILD_WEBP_JS:BOOL=OFF + -DWEBP_NEAR_LOSSLESS:BOOL=${WEBP_NEAR_LOSSLESS} + -DWEBP_ENABLE_SWAP_16BIT_CSP:BOOL=OFF + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) -# Handle copyright +if("all" IN_LIST FEATURES) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality.exe) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libwebp/) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality.exe) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libwebp) +endif() + file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright) - -vcpkg_copy_pdbs() - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindWebP.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp) diff --git a/ports/openexr/CMakeLists.txt.patch b/ports/openexr/CMakeLists.txt.patch deleted file mode 100644 index 0ee0110d5..000000000 --- a/ports/openexr/CMakeLists.txt.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c0a385..887ddf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -157,8 +157,8 @@ IF (HAVE_SYSCONF_NPROCESSORS_ONLN) - FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" ) - ENDIF() - --SET (OPENEXR_LIBSUFFIX "") --SET (ILMBASE_LIBSUFFIX "") -+SET (OPENEXR_LIBSUFFIX "" CACHE STRING "Default suffix for OpenEXR") -+SET (ILMBASE_LIBSUFFIX "" CACHE STRING "Default suffix for ILMBase") - IF (NAMESPACE_VERSIONING) - SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" ) - # assume same NAMESPACE_VERSION setting for IlmBase for now -@@ -188,32 +188,6 @@ SET_TARGET_PROPERTIES ( IlmImfUtil - SOVERSION 23 - OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}" - ) -- --########################## --# Example Code --########################## --ADD_SUBDIRECTORY ( IlmImfExamples ) -- -- --########################## --# Tests --########################## --ADD_SUBDIRECTORY ( IlmImfTest ) --ADD_SUBDIRECTORY ( IlmImfUtilTest ) --ADD_SUBDIRECTORY ( IlmImfFuzzTest ) -- -- --########################## --# Binaries / Utilities --########################## --ADD_SUBDIRECTORY ( exrheader ) --ADD_SUBDIRECTORY ( exrmaketiled ) --ADD_SUBDIRECTORY ( exrstdattr ) --ADD_SUBDIRECTORY ( exrmakepreview ) --ADD_SUBDIRECTORY ( exrenvmap ) --ADD_SUBDIRECTORY ( exrmultiview ) --ADD_SUBDIRECTORY ( exrmultipart ) -- - - ########################## - # Installation -@@ -224,37 +198,3 @@ INSTALL ( FILES - DESTINATION - ${CMAKE_INSTALL_PREFIX}/include/OpenEXR - ) -- --# Documentation --INSTALL ( FILES -- doc/TechnicalIntroduction.pdf -- doc/ReadingAndWritingImageFiles.pdf -- doc/OpenEXRFileLayout.pdf -- doc/MultiViewOpenEXR.pdf -- doc/InterpretingDeepPixels.pdf -- doc/TheoryDeepPixels.pdf -- DESTINATION -- ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION} -- ) -- --# Examples --INSTALL ( FILES -- IlmImfExamples/main.cpp -- IlmImfExamples/drawImage.cpp -- IlmImfExamples/rgbaInterfaceExamples.cpp -- IlmImfExamples/rgbaInterfaceTiledExamples.cpp -- IlmImfExamples/generalInterfaceExamples.cpp -- IlmImfExamples/lowLevelIoExamples.cpp -- IlmImfExamples/previewImageExamples.cpp -- IlmImfExamples/generalInterfaceTiledExamples.cpp -- IlmImfExamples/generalInterfaceTiledExamples.h -- IlmImfExamples/drawImage.h -- IlmImfExamples/rgbaInterfaceExamples.h -- IlmImfExamples/generalInterfaceExamples.h -- IlmImfExamples/rgbaInterfaceTiledExamples.h -- IlmImfExamples/lowLevelIoExamples.h -- IlmImfExamples/previewImageExamples.h -- IlmImfExamples/namespaceAlias.h -- DESTINATION -- ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}/examples -- ) diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL index 752dafc6d..ea85a082f 100644 --- a/ports/openexr/CONTROL +++ b/ports/openexr/CONTROL @@ -1,4 +1,4 @@ Source: openexr -Version: 2.2.1-1 +Version: 2.3.0-2 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, ilmbase +Build-Depends: zlib diff --git a/ports/openexr/FindOpenEXR.cmake b/ports/openexr/FindOpenEXR.cmake index cfff7824c..a381c6db9 100644 --- a/ports/openexr/FindOpenEXR.cmake +++ b/ports/openexr/FindOpenEXR.cmake @@ -1,13 +1,87 @@ include(FindPackageHandleStandardArgs) +find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h) find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR) -find_library(OPENEXR_HALF_LIBRARY NAMES Half) -find_library(OPENEXR_IEX_LIBRARY NAMES Iex-2_2) -find_library(OPENEXR_IMATH_LIBRARY NAMES Imath-2_2) -find_library(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf-2_2) -find_library(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread-2_2) +file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H) -set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY}) +string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}") +string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}") +set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}") -find_package_handle_standard_args(OPENEXR REQUIRED_VARS OPENEXR_LIBRARIES OPENEXR_INCLUDE_PATHS) +include(SelectLibraryConfigurations) + +if(NOT OpenEXR_BASE_LIBRARY) + find_library(OpenEXR_BASE_LIBRARY_RELEASE NAMES IlmImf-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_BASE_LIBRARY_DEBUG NAMES IlmImf-${OpenEXR_LIB_SUFFIX}_d) + select_library_configurations(OpenEXR_BASE) +endif() + +if(NOT OpenEXR_UTIL_LIBRARY) + find_library(OpenEXR_UTIL_LIBRARY_RELEASE NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_UTIL_LIBRARY_DEBUG NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}_d) + select_library_configurations(OpenEXR_UTIL) +endif() + +if(NOT OpenEXR_HALF_LIBRARY) + find_library(OpenEXR_HALF_LIBRARY_RELEASE NAMES Half-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_HALF_LIBRARY_DEBUG NAMES Half-${OpenEXR_LIB_SUFFIX}_d) + select_library_configurations(OpenEXR_HALF) +endif() + +if(NOT OpenEXR_IEX_LIBRARY) + find_library(OpenEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OpenEXR_LIB_SUFFIX}_d) + select_library_configurations(OpenEXR_IEX) +endif() + +if(NOT OpenEXR_MATH_LIBRARY) + find_library(OpenEXR_MATH_LIBRARY_RELEASE NAMES Imath-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_MATH_LIBRARY_DEBUG NAMES Imath-${OpenEXR_LIB_SUFFIX}_d) + select_library_configurations(OpenEXR_MATH) +endif() + +if(NOT OpenEXR_THREAD_LIBRARY) + find_library(OpenEXR_THREAD_LIBRARY_RELEASE NAMES IlmThread-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_THREAD_LIBRARY_DEBUG NAMES IlmThread-${OpenEXR_LIB_SUFFIX}_d) + select_library_configurations(OpenEXR_THREAD) +endif() + +if(NOT OpenEXR_IEXMATH_LIBRARY) + find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX}) + find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}d) + select_library_configurations(OpenEXR_IEXMATH) +endif() + +set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}") +set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}") +set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}") +set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}") +set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}") +set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}") + +set(OpenEXR_LIBRARY "${OpenEXR_BASE_LIBRARY}") + +set(OpenEXR_LIBRARIES + ${OpenEXR_LIBRARY} + ${OpenEXR_MATH_LIBRARY} + ${OpenEXR_IEXMATH_LIBRARY} + ${OpenEXR_UTIL_LIBRARY} + ${OpenEXR_HALF_LIBRARY} + ${OpenEXR_IEX_LIBRARY} + ${OpenEXR_THREAD_LIBRARY} +) + +set(OPENEXR_LIBRARIES + ${OPENEXR_HALF_LIBRARY} + ${OPENEXR_IEX_LIBRARY} + ${OPENEXR_IMATH_LIBRARY} + ${OPENEXR_ILMIMF_LIBRARY} + ${OPENEXR_ILMTHREAD_LIBRARY} +) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS) + +if(OpenEXR_FOUND) + set(OPENEXR_FOUND 1) +endif() diff --git a/ports/openexr/add-missing-export.patch b/ports/openexr/add-missing-export.patch deleted file mode 100644 index c78842d18..000000000 --- a/ports/openexr/add-missing-export.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/IlmImf/ImfHeader.h b/IlmImf/ImfHeader.h -index 756a62e..dd71e0e 100644 ---- a/IlmImf/ImfHeader.h -+++ b/IlmImf/ImfHeader.h -@@ -493,7 +493,7 @@ class Header::ConstIterator - // - //------------------------------------------------------------------------ - --void staticInitialize (); -+IMF_EXPORT void staticInitialize (); - - - //----------------- diff --git a/ports/openexr/fix-static-linking.patch b/ports/openexr/fix-static-linking.patch deleted file mode 100644 index af2f067f1..000000000 --- a/ports/openexr/fix-static-linking.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/IlmImf/CMakeLists.txt b/IlmImf/CMakeLists.txt -index 18d90edc..21bbaa27 100644 ---- a/IlmImf/CMakeLists.txt -+++ b/IlmImf/CMakeLists.txt -@@ -25,8 +25,8 @@ ADD_EXECUTABLE ( dwaLookups - - TARGET_LINK_LIBRARIES ( dwaLookups - Half -- Iex${ILMBASE_LIBSUFFIX} - IlmThread${ILMBASE_LIBSUFFIX} -+ Iex${ILMBASE_LIBSUFFIX} - ${PTHREAD_LIB} - ) - diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index b02a487a9..c32d07123 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -1,63 +1,71 @@ -set(OPENEXR_VERSION 2.2.1) -set(OPENEXR_HASH 192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480) - include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openexr-${OPENEXR_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "http://download.savannah.nongnu.org/releases/openexr/openexr-${OPENEXR_VERSION}.tar.gz" - FILENAME "openexr-${OPENEXR_VERSION}.tar.gz" - SHA512 ${OPENEXR_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/add-missing-export.patch" - "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-static-linking.patch" -) -# Ensure helper executables can run during build -set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin") +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "UWP build not supported") +endif() + +set(OPENEXR_VERSION 2.3.0) +set(OPENEXR_HASH 268ae64b40d21d662f405fba97c307dad1456b7d996a447aadafd41b640ca736d4851d9544b4741a94e7b7c335fe6e9d3b16180e710671abfc0c8b2740b147b2) -# In debug build buildsystem cannot locate IlmBase headers -set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}") -set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -I\"${CURRENT_INSTALLED_DIR}/include/OpenEXR\"") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openexr/openexr + REF v${OPENEXR_VERSION} + SHA512 ${OPENEXR_HASH} + HEAD_REF master +) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}/debug - OPTIONS_RELEASE - -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}) + PREFER_NINJA + OPTIONS + -DOPENEXR_BUILD_PYTHON_LIBS:BOOL=FALSE + OPTIONS_DEBUG + -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}/debug + OPTIONS_RELEASE + -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}) vcpkg_install_cmake() -# if you need to have OpenEXR tools, edit CMakeLists.txt.patch and remove the part that disables building executables, -# then remove the following line which deletes them and finally use vcpkg_copy_tool_dependencies() to save them -# (may require additional patching to the OpenEXR toolchain which is really broken) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - foreach(SUBDIR "" "/debug") - file(GLOB DLLS ${CURRENT_PACKAGES_DIR}${SUBDIR}/lib/*.dll) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}${SUBDIR}/bin) - file(REMOVE ${DLLS}) - endforeach() +# NOTE: Only use ".exe" extension on Windows executables. +# Is there a cleaner way to do this? +if(WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") endif() +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${EXECUTABLE_SUFFIX}) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${EXECUTABLE_SUFFIX}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr) vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/include/OpenEXR/ImfExport.h HEADER_FILE) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - string(REPLACE "defined(OPENEXR_DLL)" "1" HEADER_FILE "${HEADER_FILE}") +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(OPENEXR_PORT_DIR "openexr") else() - string(REPLACE "defined(OPENEXR_DLL)" "0" HEADER_FILE "${HEADER_FILE}") + set(OPENEXR_PORT_DIR "OpenEXR") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/OpenEXR/ImfExport.h "${HEADER_FILE}") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openexr) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/openexr/LICENSE ${CURRENT_PACKAGES_DIR}/share/openexr/copyright) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openexr) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}) diff --git a/ports/openvdb/0001-fix-cmake-modules.patch b/ports/openvdb/0001-fix-cmake-modules.patch new file mode 100644 index 000000000..1e613e602 --- /dev/null +++ b/ports/openvdb/0001-fix-cmake-modules.patch @@ -0,0 +1,198 @@ +diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake +index 2d9d9d3..e9b4abc 100644 +--- a/cmake/FindBlosc.cmake ++++ b/cmake/FindBlosc.cmake +@@ -37,11 +37,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( BLOSC_LOCATION include/blosc.h +- "$ENV{BLOSC_ROOT}" +- NO_DEFAULT_PATH +- NO_SYSTEM_ENVIRONMENT_PATH +- ) ++FIND_PATH( BLOSC_LOCATION include/blosc.h) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc + REQUIRED_VARS BLOSC_LOCATION +@@ -53,7 +49,7 @@ IF ( BLOSC_FOUND ) + CACHE STRING "Blosc library directories") + + SET ( _blosc_library_name "blosc" ) +- ++ + # Static library setup + IF (Blosc_USE_STATIC_LIBS) + SET(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES}) +@@ -69,7 +65,7 @@ IF ( BLOSC_FOUND ) + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +- ++ + # Static library tear down + IF (Blosc_USE_STATIC_LIBS) + SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} ) +diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake +index 0b72457..75951a6 100644 +--- a/cmake/FindGLEW.cmake ++++ b/cmake/FindGLEW.cmake +@@ -39,11 +39,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( GLEW_LOCATION include/GL/glew.h +- "$ENV{GLEW_ROOT}" +- NO_DEFAULT_PATH +- NO_SYSTEM_ENVIRONMENT_PATH +- ) ++FIND_PATH( GLEW_LOCATION include/GL/glew.h) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLEW + REQUIRED_VARS GLEW_LOCATION +diff --git a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake +index cea0b86..07ea09e 100644 +--- a/cmake/FindGLFW3.cmake ++++ b/cmake/FindGLFW3.cmake +@@ -39,11 +39,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h +- "$ENV{GLFW3_ROOT}" +- NO_DEFAULT_PATH +- NO_SYSTEM_ENVIRONMENT_PATH +-) ++FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLFW3 + REQUIRED_VARS GLFW3_LOCATION +diff --git a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake +index 664affd..5197110 100644 +--- a/cmake/FindILMBase.cmake ++++ b/cmake/FindILMBase.cmake +@@ -43,11 +43,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h +- "$ENV{ILMBASE_ROOT}" +- NO_DEFAULT_PATH +- NO_SYSTEM_ENVIRONMENT_PATH +- ) ++FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS ( ILMBase + REQUIRED_VARS ILMBASE_LOCATION +@@ -70,11 +66,13 @@ IF ( ILMBASE_FOUND ) + SET ( IEXMATH_LIBRARY_NAME IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) + SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) + SET ( IMATH_LIBRARY_NAME Imath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) ++ SET ( HALF_LIBRARY_NAME Half-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) + ELSE ( ILMBASE_NAMESPACE_VERSIONING ) + SET ( IEX_LIBRARY_NAME Iex ) + SET ( IEXMATH_LIBRARY_NAME IexMath ) + SET ( ILMTHREAD_LIBRARY_NAME IlmThread ) + SET ( IMATH_LIBRARY_NAME Imath ) ++ SET ( HALF_LIBRARY_NAME Half ) + ENDIF ( ILMBASE_NAMESPACE_VERSIONING ) + + SET ( ILMBASE_INCLUDE_DIRS +@@ -84,7 +82,7 @@ IF ( ILMBASE_FOUND ) + SET ( ILMBASE_LIBRARYDIR ${ILMBASE_LOCATION}/lib + CACHE STRING "ILMBase library directories") + SET ( ILMBASE_FOUND TRUE ) +- ++ + SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + IF (Ilmbase_USE_STATIC_LIBS) + IF (APPLE) +@@ -129,14 +127,14 @@ IF ( ILMBASE_FOUND ) + ELSEIF (WIN32) + # Link library + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") +- FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} ) ++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) + FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) + FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) + FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) + FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) + # Load library + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") +- FIND_LIBRARY ( Ilmbase_HALF_DLL Half PATHS ${ILMBASE_LOCATION}/bin ++ FIND_LIBRARY ( Ilmbase_HALF_DLL ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LOCATION}/bin + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +@@ -157,7 +155,7 @@ IF ( ILMBASE_FOUND ) + NO_SYSTEM_ENVIRONMENT_PATH + ) + ELSE (APPLE) +- FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} ++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake +index 6d69c03..5ecf8fa 100644 +--- a/cmake/FindOpenEXR.cmake ++++ b/cmake/FindOpenEXR.cmake +@@ -38,11 +38,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH ( OPENEXR_LOCATION include/OpenEXR/OpenEXRConfig.h +- ENV OPENEXR_ROOT +- NO_DEFAULT_PATH +- NO_SYSTEM_ENVIRONMENT_PATH +- ) ++FIND_PATH ( OPENEXR_LOCATION include/OpenEXR/OpenEXRConfig.h) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS ( OpenEXR + REQUIRED_VARS OPENEXR_LOCATION +@@ -59,7 +55,7 @@ IF ( OPENEXR_FOUND ) + FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ") + STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}") + STRING ( STRIP "${_openexr_version_minor_unstrip}" OPENEXR_VERSION_MINOR ) +- ++ + MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" ) + + IF ( OPENEXR_NAMESPACE_VERSIONING ) +@@ -67,7 +63,7 @@ IF ( OPENEXR_FOUND ) + ELSE ( OPENEXR_NAMESPACE_VERSIONING ) + SET ( ILMIMF_LIBRARY_NAME IlmImf ) + ENDIF ( OPENEXR_NAMESPACE_VERSIONING ) +- ++ + SET ( OPENEXR_INCLUDE_DIRS + ${OPENEXR_LOCATION}/include + ${OPENEXR_LOCATION}/include/OpenEXR +@@ -120,6 +116,5 @@ IF ( OPENEXR_FOUND ) + ENDIF () + + # SET( Openexr_ILMIMF_LIBRARY ${OPENEXR_ILMIMF_LIBRARY_PATH} CACHE STRING "Openexr's IlmImf library") +- +-ENDIF ( OPENEXR_FOUND ) + ++ENDIF ( OPENEXR_FOUND ) +diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake +index 8a56ec0..9f5a7b4 100644 +--- a/cmake/FindTBB.cmake ++++ b/cmake/FindTBB.cmake +@@ -42,14 +42,7 @@ FIND_PACKAGE ( PackageHandleStandardArgs ) + + # SET ( TBB_FOUND FALSE ) + +-FIND_PATH( TBB_LOCATION include/tbb/tbb.h +- "$ENV{TBB_ROOT}" +- NO_DEFAULT_PATH +- NO_CMAKE_ENVIRONMENT_PATH +- NO_CMAKE_PATH +- NO_SYSTEM_ENVIRONMENT_PATH +- NO_CMAKE_SYSTEM_PATH +- ) ++FIND_PATH( TBB_LOCATION include/tbb/tbb.h) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS ( TBB + REQUIRED_VARS TBB_LOCATION diff --git a/ports/openvdb/0002-add-custom-options.patch b/ports/openvdb/0002-add-custom-options.patch new file mode 100644 index 000000000..5e8d49091 --- /dev/null +++ b/ports/openvdb/0002-add-custom-options.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b35ec70..801e7df 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,6 +38,9 @@ if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) + endif(CCACHE_FOUND) + ++OPTION ( OPENVDB_BUILD_TOOLS "Build OpenVDB utilities" OFF ) ++OPTION ( OPENVDB_STATIC "Build statically linked library" OFF ) ++OPTION ( OPENVDB_SHARED "Build dynamically linked library" ON ) + OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON ) + OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF ) + OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON ) diff --git a/ports/openvdb/0003-build-only-necessary-targets.patch b/ports/openvdb/0003-build-only-necessary-targets.patch new file mode 100644 index 000000000..55b480ce4 --- /dev/null +++ b/ports/openvdb/0003-build-only-necessary-targets.patch @@ -0,0 +1,230 @@ +diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt +index 9404dbc..b4129e3 100644 +--- a/openvdb/CMakeLists.txt ++++ b/openvdb/CMakeLists.txt +@@ -29,12 +29,13 @@ PROJECT ( OpenVDBCore ) + + set(CMAKE_CXX_STANDARD 11) + ++IF ( OPENVDB_BUILD_TOOLS ) + IF ( USE_GLFW3 ) + FIND_PACKAGE ( GLFW3 REQUIRED ) + SET ( OPENVDB_USE_GLFW_FLAG "-DOPENVDB_USE_GLFW_3" ) + IF ( UNIX AND NOT APPLE ) + SET ( GLFW_DEPENDENT_LIBRARIES "X11;Xi;Xrandr;Xinerama;Xcursor;Xxf86vm" ) +- ENDIF ( UNIX AND NOT APPLE ) ++ ENDIF () + SET ( GLFW_LINK_LIBRARY ${GLFW3_glfw_LIBRARY} ) + SET ( GLFW_INCLUDE_DIRECTORY ${GLFW3_INCLUDE_DIR} CACHE STRING "GLFW3 include directory") + ELSE () +@@ -45,12 +46,14 @@ ELSE () + SET ( GLFW_LINK_LIBRARY ${GLFW_glfw_LIBRARY} ) + SET ( GLFW_INCLUDE_DIRECTORY ${GLFW_INCLUDE_DIR} CACHE STRING "GLFW include directory") + ENDIF () ++ENDIF () + +-IF (WIN32) ++IF ( OPENVDB_BUILD_TOOLS ) ++IF ( WIN32 ) + FIND_PACKAGE ( GLEW REQUIRED ) +-ELSE () +- FIND_PACKAGE ( Threads REQUIRED ) +-ENDIF() ++ENDIF () ++ENDIF () ++FIND_PACKAGE ( Threads REQUIRED ) + + # Determine OpenVDB version + #define OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER 4 +@@ -130,7 +133,12 @@ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} ) + INCLUDE_DIRECTORIES ( SYSTEM ${CPPUNIT_INCLUDE_DIR} ) + + IF (WIN32) +- ADD_DEFINITIONS ( -D_WIN32 -DNOMINMAX -DHALF_EXPORTS -DOPENVDB_DLL ) ++ ADD_DEFINITIONS ( -D__TBB_NO_IMPLICIT_LINKAGE ) ++ ADD_DEFINITIONS ( -D__TBBMALLOC_NO_IMPLICIT_LINKAGE ) ++ ADD_DEFINITIONS ( -D_WIN32 -DNOMINMAX ) ++ IF ( OPENVDB_SHARED ) ++ ADD_DEFINITIONS ( -DOPENEXR_DLL -DOPENVDB_DLL ) ++ ENDIF () + ELSE () + ADD_DEFINITIONS ( -pthread -fPIC ) + ENDIF () +@@ -170,16 +178,21 @@ SET ( OPENVDB_LIBRARY_SOURCE_FILES + + SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES} + PROPERTIES +- COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" ++ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" + ) + ++IF ( OPENVDB_STATIC ) + ADD_LIBRARY ( openvdb_static STATIC + ${OPENVDB_LIBRARY_SOURCE_FILES} + ) ++ENDIF () ++IF ( OPENVDB_SHARED ) + ADD_LIBRARY ( openvdb_shared SHARED + ${OPENVDB_LIBRARY_SOURCE_FILES} + ) ++ENDIF () + ++IF ( OPENVDB_STATIC ) + TARGET_LINK_LIBRARIES ( openvdb_static + ${Boost_IOSTREAMS_LIBRARY} + ${Boost_SYSTEM_LIBRARY} +@@ -188,6 +201,8 @@ TARGET_LINK_LIBRARIES ( openvdb_static + ${ZLIB_LIBRARY} + ${BLOSC_blosc_LIBRARY} + ) ++ENDIF () ++IF ( OPENVDB_SHARED ) + TARGET_LINK_LIBRARIES ( openvdb_shared + ${Boost_IOSTREAMS_LIBRARY} + ${Boost_SYSTEM_LIBRARY} +@@ -196,7 +211,9 @@ TARGET_LINK_LIBRARIES ( openvdb_shared + ${ZLIB_LIBRARY} + ${BLOSC_blosc_LIBRARY} + ) ++ENDIF () + ++IF ( OPENVDB_STATIC ) + IF (WIN32) + SET_TARGET_PROPERTIES ( openvdb_static + PROPERTIES OUTPUT_NAME libopenvdb +@@ -205,8 +222,10 @@ ELSE() + SET_TARGET_PROPERTIES ( openvdb_static + PROPERTIES OUTPUT_NAME openvdb + ) +-ENDIF() ++ENDIF () ++ENDIF () + ++IF ( OPENVDB_SHARED ) + SET_TARGET_PROPERTIES( + openvdb_shared + PROPERTIES +@@ -214,13 +233,15 @@ SET_TARGET_PROPERTIES( + SOVERSION ${OPENVDB_MAJOR_VERSION_NUMBER}.${OPENVDB_MINOR_VERSION_NUMBER} + VERSION ${OPENVDB_MAJOR_VERSION_NUMBER}.${OPENVDB_MINOR_VERSION_NUMBER}.${OPENVDB_PATCH_VERSION_NUMBER} + ) ++ENDIF () + + SET ( VDB_PRINT_SOURCE_FILES cmd/openvdb_print/main.cc ) + SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES} + PROPERTIES +- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" + ) + ++IF ( OPENVDB_BUILD_TOOLS ) + ADD_EXECUTABLE ( vdb_print + ${VDB_PRINT_SOURCE_FILES} + ) +@@ -236,7 +257,7 @@ TARGET_LINK_LIBRARIES ( vdb_print + SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc ) + SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES} + PROPERTIES +- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" + ) + ADD_EXECUTABLE ( vdb_render + ${VDB_RENDER_SOURCE_FILES} +@@ -263,31 +284,40 @@ SET ( VDB_VIEW_SOURCE_FILES + ) + SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES} + PROPERTIES +- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$:/bigobj>" + ) +-IF (NOT WIN32) ++ + ADD_EXECUTABLE ( vdb_view + ${VDB_VIEW_SOURCE_FILES} + ) +- ++ + target_include_directories ( vdb_view SYSTEM PRIVATE ${Boost_INCLUDE_DIR} ) + + TARGET_LINK_LIBRARIES ( vdb_view + openvdb_shared +- ${Boost_THREAD_LIBRARY} ++ ${Boost_LIBRARIES} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +- ${COCOA_LIBRARY} +- ${IOKIT_LIBRARY} +- ${COREVIDEO_LIBRARY} + ${GLFW_LINK_LIBRARY} + ${GLFW_DEPENDENT_LIBRARIES} + ${GLEW_GLEW_LIBRARY} ++ ) ++ IF (APPLE) ++ TARGET_LINK_LIBRARIES ( vdb_view ++ ${COCOA_LIBRARY} ++ ${IOKIT_LIBRARY} ++ ${COREVIDEO_LIBRARY} ++ ) ++ ENDIF () ++ IF (NOT WIN32) ++ TARGET_LINK_LIBRARIES ( vdb_view + m + stdc++ +- ) ++ ) ++ ENDIF () + ENDIF () + ++ + SET ( UNITTEST_SOURCE_FILES + unittest/main.cc + unittest/TestAttributeArray.cc +@@ -398,7 +428,7 @@ IF ( OPENVDB_BUILD_UNITTESTS ) + + ADD_TEST ( vdb_unit_test vdb_test ) + +-ENDIF (OPENVDB_BUILD_UNITTESTS) ++ENDIF () + + # Doxygen docmentation + IF (OPENVDB_BUILD_DOCS) +@@ -419,26 +449,29 @@ IF (OPENVDB_BUILD_DOCS) + ENDIF () + + # Installation +-IF ( NOT WIN32 ) ++IF ( OPENVDB_BUILD_TOOLS ) + INSTALL ( TARGETS + vdb_view + DESTINATION + bin + ) +-ENDIF () + INSTALL ( TARGETS + vdb_print + vdb_render + DESTINATION + bin + ) ++ENDIF () + ++IF ( OPENVDB_STATIC) + INSTALL ( TARGETS + openvdb_static + DESTINATION + lib + ) ++ENDIF () + ++IF ( OPENVDB_SHARED ) + IF (WIN32) + INSTALL ( TARGETS + openvdb_shared +@@ -452,6 +485,7 @@ ELSE() + lib + ) + ENDIF () ++ENDIF () + + INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include + FILES_MATCHING PATTERN "*.h" diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/AddLinkageAndToolsChoice.patch deleted file mode 100644 index 57078be15..000000000 --- a/ports/openvdb/AddLinkageAndToolsChoice.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 712fb1d..440a63a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,6 +32,9 @@ PROJECT ( OpenVDB ) - - ENABLE_TESTING() - -+OPTION ( OPENVDB_BUILD_TOOLS "Build OpenVDB utilities" ON ) -+OPTION ( OPENVDB_STATIC "Build statically linked library" ON ) -+OPTION ( OPENVDB_SHARED "Build dynamically linked library" ON ) - OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON ) - OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF ) - OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON ) -diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt -index 5703eb9..6ff3c6a 100644 ---- a/openvdb/CMakeLists.txt -+++ b/openvdb/CMakeLists.txt -@@ -26,6 +26,7 @@ - # - PROJECT ( OpenVDBCore ) - -+IF ( OPENVDB_BUILD_TOOLS ) - IF ( USE_GLFW3 ) - FIND_PACKAGE ( GLFW3 REQUIRED ) - SET ( OPENVDB_USE_GLFW_FLAG "-DOPENVDB_USE_GLFW_3" ) -@@ -42,9 +43,12 @@ ELSE () - SET ( GLFW_LINK_LIBRARY ${GLFW_glfw_LIBRARY} ) - SET ( GLFW_INCLUDE_DIRECTORY ${GLFW_INCLUDE_DIR} CACHE STRING "GLFW include directory") - ENDIF () -+ENDIF ( OPENVDB_BUILD_TOOLS ) - - IF (WIN32) -+ IF ( OPENVDB_BUILD_TOOLS ) - FIND_PACKAGE ( GLEW REQUIRED ) -+ ENDIF ( OPENVDB_BUILD_TOOLS ) - ELSE () - FIND_PACKAGE ( Threads REQUIRED ) - ENDIF() -@@ -75,7 +79,7 @@ SET ( OPENVDB_PATCH_VERSION_NUMBER ${_openvdb_patch_version_number} CACHE STRING - # MESSAGE ( "OPENVDB_MINOR_VERSION_NUMBER = ${OPENVDB_MINOR_VERSION_NUMBER}" ) - # MESSAGE ( "OPENVDB_PATCH_VERSION_NUMBER = ${OPENVDB_PATCH_VERSION_NUMBER}" ) - --FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system thread ${OPENVDB_BOOST_PYTHON_LIBRARY_COMPONENT_NAME} ) -+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system thread date_time ${OPENVDB_BOOST_PYTHON_LIBRARY_COMPONENT_NAME} ) - IF (WIN32 AND OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING) - ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB ) - ENDIF () -@@ -85,7 +89,9 @@ FIND_PACKAGE ( TBB REQUIRED ) - FIND_PACKAGE ( ZLIB REQUIRED ) - FIND_PACKAGE ( ILMBase REQUIRED ) - FIND_PACKAGE ( OpenEXR REQUIRED ) -+IF ( OPENVDB_BUILD_TOOLS ) - FIND_PACKAGE ( OpenGL REQUIRED ) -+ENDIF () - IF (OPENVDB_BUILD_DOCS) - FIND_PACKAGE ( Doxygen REQUIRED ) - ENDIF () -@@ -127,7 +133,10 @@ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} ) - INCLUDE_DIRECTORIES ( SYSTEM ${CPPUNIT_INCLUDE_DIR} ) - - IF (WIN32) -- ADD_DEFINITIONS ( -D_WIN32 -DNOMINMAX -DHALF_EXPORTS -DOPENVDB_DLL ) -+ ADD_DEFINITIONS ( -D_WIN32 -DNOMINMAX ) -+ IF ( OPENVDB_SHARED ) -+ ADD_DEFINITIONS ( -DOPENVDB_DLL ) -+ ENDIF () - ELSE () - ADD_DEFINITIONS ( -pthread -fPIC ) - ENDIF () -@@ -167,16 +176,20 @@ SET ( OPENVDB_LIBRARY_SOURCE_FILES - - SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES} - PROPERTIES -- COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" - ) -- -+IF ( OPENVDB_STATIC ) - ADD_LIBRARY ( openvdb_static STATIC - ${OPENVDB_LIBRARY_SOURCE_FILES} - ) -+ENDIF () -+IF ( OPENVDB_SHARED ) - ADD_LIBRARY ( openvdb_shared SHARED - ${OPENVDB_LIBRARY_SOURCE_FILES} - ) -+ENDIF () - -+IF ( OPENVDB_STATIC ) - TARGET_LINK_LIBRARIES ( openvdb_static - ${Boost_IOSTREAMS_LIBRARY} - ${Boost_SYSTEM_LIBRARY} -@@ -185,6 +198,8 @@ TARGET_LINK_LIBRARIES ( openvdb_static - ${ZLIB_LIBRARY} - ${BLOSC_blosc_LIBRARY} - ) -+ENDIF () -+IF ( OPENVDB_SHARED ) - TARGET_LINK_LIBRARIES ( openvdb_shared - ${Boost_IOSTREAMS_LIBRARY} - ${Boost_SYSTEM_LIBRARY} -@@ -193,7 +208,9 @@ TARGET_LINK_LIBRARIES ( openvdb_shared - ${ZLIB_LIBRARY} - ${BLOSC_blosc_LIBRARY} - ) -+ENDIF () - -+IF ( OPENVDB_STATIC ) - IF (WIN32) - SET_TARGET_PROPERTIES ( openvdb_static - PROPERTIES OUTPUT_NAME libopenvdb -@@ -203,7 +220,9 @@ ELSE() - PROPERTIES OUTPUT_NAME openvdb - ) - ENDIF() -+ENDIF () - -+IF ( OPENVDB_SHARED ) - SET_TARGET_PROPERTIES( - openvdb_shared - PROPERTIES -@@ -211,13 +230,15 @@ SET_TARGET_PROPERTIES( - SOVERSION ${OPENVDB_MAJOR_VERSION_NUMBER}.${OPENVDB_MINOR_VERSION_NUMBER} - VERSION ${OPENVDB_MAJOR_VERSION_NUMBER}.${OPENVDB_MINOR_VERSION_NUMBER}.${OPENVDB_PATCH_VERSION_NUMBER} - ) -+ENDIF () - - SET ( VDB_PRINT_SOURCE_FILES cmd/openvdb_print/main.cc ) - SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES} - PROPERTIES -- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" - ) - -+IF ( OPENVDB_BUILD_TOOLS ) - ADD_EXECUTABLE ( vdb_print - ${VDB_PRINT_SOURCE_FILES} - ) -@@ -231,7 +252,7 @@ TARGET_LINK_LIBRARIES ( vdb_print - SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc ) - SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES} - PROPERTIES -- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" - ) - ADD_EXECUTABLE ( vdb_render - ${VDB_RENDER_SOURCE_FILES} -@@ -256,26 +277,26 @@ SET ( VDB_VIEW_SOURCE_FILES - ) - SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES} - PROPERTIES -- COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$:/bigobj>" - ) --IF (NOT WIN32) - ADD_EXECUTABLE ( vdb_view - ${VDB_VIEW_SOURCE_FILES} - ) - - TARGET_LINK_LIBRARIES ( vdb_view - openvdb_shared -- ${Boost_THREAD_LIBRARY} -+ ${Boost_LIBRARIES} - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} -- ${COCOA_LIBRARY} -- ${IOKIT_LIBRARY} -- ${COREVIDEO_LIBRARY} -+ #${COCOA_LIBRARY} -+ #${IOKIT_LIBRARY} -+ #${COREVIDEO_LIBRARY} - ${GLFW_LINK_LIBRARY} - ${GLFW_DEPENDENT_LIBRARIES} - ${GLEW_GLEW_LIBRARY} - ) --ENDIF () -+ -+ENDIF ( OPENVDB_BUILD_TOOLS ) - - SET ( UNITTEST_SOURCE_FILES - unittest/main.cc -@@ -405,27 +426,32 @@ IF (OPENVDB_BUILD_DOCS) - - ENDIF () - -+IF ( OPENVDB_BUILD_TOOLS ) - # Installation --IF ( NOT WIN32 ) -+#IF ( NOT WIN32 ) - INSTALL ( TARGETS - vdb_view - DESTINATION - bin - ) --ENDIF () -+#ENDIF () - INSTALL ( TARGETS - vdb_print - vdb_render - DESTINATION - bin - ) -+ENDIF ( OPENVDB_BUILD_TOOLS ) - -+IF ( OPENVDB_STATIC) - INSTALL ( TARGETS - openvdb_static - DESTINATION - lib - ) -+ENDIF () - -+IF ( OPENVDB_SHARED ) - IF (WIN32) - INSTALL ( TARGETS - openvdb_shared -@@ -439,6 +465,7 @@ ELSE() - lib - ) - ENDIF () -+ENDIF ( OPENVDB_SHARED ) - - INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include - FILES_MATCHING PATTERN "*.h" diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index e822bf04c..acf11cd00 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,8 +1,8 @@ Source: openvdb -Version: 5.0.0-2 -Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess +Version: 6.0.0 +Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess Description: Sparse volume data structure and tools Feature: tools Description: OpenVDB utilities: view, print and render -Build-Depends: glew, glfw3, boost-ptr-container +Build-Depends: glew, glfw3 diff --git a/ports/openvdb/UseGLEWOnWindowsForViewer.patch b/ports/openvdb/UseGLEWOnWindowsForViewer.patch deleted file mode 100644 index bfa29c46c..000000000 --- a/ports/openvdb/UseGLEWOnWindowsForViewer.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/openvdb/viewer/ClipBox.h b/openvdb/viewer/ClipBox.h -index b792491..d2f50cc 100644 ---- a/openvdb/viewer/ClipBox.h -+++ b/openvdb/viewer/ClipBox.h -@@ -36,6 +36,8 @@ - #if defined(__APPLE__) || defined(MACOSX) - #include - #include -+#elif defined(WIN32) -+#include - #else - #include - #include -diff --git a/openvdb/viewer/Font.h b/openvdb/viewer/Font.h -index 6e79704..566cfbd 100644 ---- a/openvdb/viewer/Font.h -+++ b/openvdb/viewer/Font.h -@@ -36,6 +36,8 @@ - #if defined(__APPLE__) || defined(MACOSX) - #include - #include -+#elif defined(WIN32) -+#include - #else - #include - #include -diff --git a/openvdb/viewer/RenderModules.h b/openvdb/viewer/RenderModules.h -index f4745d9..339dfc3 100644 ---- a/openvdb/viewer/RenderModules.h -+++ b/openvdb/viewer/RenderModules.h -@@ -43,6 +43,8 @@ - #if defined(__APPLE__) || defined(MACOSX) - #include - #include -+#elif defined(WIN32) -+#include - #else - #include - #include -diff --git a/openvdb/viewer/Viewer.cc b/openvdb/viewer/Viewer.cc -index 307aa2b..8b79358 100644 ---- a/openvdb/viewer/Viewer.cc -+++ b/openvdb/viewer/Viewer.cc -@@ -540,7 +540,15 @@ ViewerImpl::open(int width, int height) - std::shared_ptr curWindow( - glfwGetCurrentContext(), glfwMakeContextCurrent); - glfwMakeContextCurrent(mWindow); -- BitmapFont13::initialize(); -+ BitmapFont13::initialize(); -+#ifdef WIN32 -+ if (glewInit() == GLEW_OK) { -+ OPENVDB_LOG_DEBUG_RUNTIME("initialized GLEW from thread " -+ << boost::this_thread::get_id()); -+ } else { -+ OPENVDB_LOG_ERROR("GLEW initialization failed"); -+ } -+#endif - } - } - mCamera->setWindow(mWindow); diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index a21e82240..7f2fa6c29 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -2,17 +2,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO dreamworksanimation/openvdb - REF v5.0.0 - SHA512 8916d54683d81144114e57f8332be43b7547e6da5d194f6147bcefd4ee9e8e7ec817f27b65adb129dfd149e6b308f4bab30591ee953ee2c319636491bf051a2b + REPO AcademySoftwareFoundation/openvdb + REF v6.0.0 + SHA512 6b9e267fff46647b39e1e6faa12059442196c1858df1fda1515cfc375e25bc3033e2828c80e63a652509cfba386376e022cebf81ec85aaccece421b0c721529b HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/UseGLEWOnWindowsForViewer.patch - ${CMAKE_CURRENT_LIST_DIR}/AddLinkageAndToolsChoice.patch + ${CMAKE_CURRENT_LIST_DIR}/0001-fix-cmake-modules.patch + ${CMAKE_CURRENT_LIST_DIR}/0002-add-custom-options.patch + ${CMAKE_CURRENT_LIST_DIR}/0003-build-only-necessary-targets.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -24,74 +21,24 @@ else() endif() if ("tools" IN_LIST FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(OPENVDB_BUILD_TOOLS ON) - set(OPENVDB_SHARED ON) # tools require shared version of the library -else() - set(OPENVDB_BUILD_TOOLS OFF) -endif() - -file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}" INSTALL_LOCATION) - -file(TO_NATIVE_PATH "${INSTALL_LOCATION}/include" INCLUDE_LOCATION) -file(TO_NATIVE_PATH "${INSTALL_LOCATION}/lib/" LIB_LOCATION) -file(TO_NATIVE_PATH "${INSTALL_LOCATION}/debug/lib/" LIB_LOCATION_DEBUG) - -file(TO_NATIVE_PATH "${LIB_LOCATION}/zlib.lib" ZLIB_LIBRARY) -file(TO_NATIVE_PATH "${LIB_LOCATION}/tbb.lib" Tbb_TBB_LIBRARY) -file(TO_NATIVE_PATH "${LIB_LOCATION}/tbbmalloc.lib" Tbb_TBBMALLOC_LIBRARY) -file(TO_NATIVE_PATH "${LIB_LOCATION_DEBUG}/tbb_debug.lib" Tbb_TBB_LIBRARY_DEBUG) -file(TO_NATIVE_PATH "${LIB_LOCATION_DEBUG}/tbbmalloc_debug.lib" Tbb_TBBMALLOC_LIBRARY_DEBUG) - -file(TO_NATIVE_PATH "${LIB_LOCATION}/Half.lib" Ilmbase_HALF_LIBRARY) -file(TO_NATIVE_PATH "${LIB_LOCATION}/Iex-2_2.lib" Ilmbase_IEX_LIBRARY) -file(TO_NATIVE_PATH "${LIB_LOCATION}/IlmThread-2_2.lib" Ilmbase_ILMTHREAD_LIBRARY) - -if (OPENVDB_STATIC) - file(TO_NATIVE_PATH "${LIB_LOCATION}/glfw3.lib" GLFW3_LIBRARY) -else() - file(TO_NATIVE_PATH "${LIB_LOCATION}/glfw3dll.lib" GLFW3_LIBRARY) + else() + message(ERROR "Unable to build tools if static libraries are required") + endif() endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DOPENVDB_BUILD_UNITTESTS=OFF - -DOPENVDB_BUILD_PYTHON_MODULE=OFF - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF - -DUSE_GLFW3=ON - -DGLFW3_USE_STATIC_LIBS=${OPENVDB_STATIC} - -DBlosc_USE_STATIC_LIBS=${OPENVDB_STATIC} - -DOpenexr_USE_STATIC_LIBS=${OPENVDB_STATIC} - -DIlmbase_USE_STATIC_LIBS=${OPENVDB_STATIC} - -DGLFW3_glfw_LIBRARY=${GLFW3_LIBRARY} - - -DIlmbase_HALF_LIBRARY=${Ilmbase_HALF_LIBRARY} - -DIlmbase_IEX_LIBRARY=${Ilmbase_IEX_LIBRARY} - -DIlmbase_ILMTHREAD_LIBRARY=${Ilmbase_ILMTHREAD_LIBRARY} - - -DOPENVDB_STATIC=${OPENVDB_STATIC} - -DOPENVDB_SHARED=${OPENVDB_SHARED} - -DOPENVDB_BUILD_TOOLS=${OPENVDB_BUILD_TOOLS} - - -DZLIB_INCLUDE_DIR=${INCLUDE_LOCATION} - -DTBB_INCLUDE_DIR=${INCLUDE_LOCATION} - -DZLIB_LIBRARY=${ZLIB_LIBRARY} - - -DGLFW3_LOCATION=${INSTALL_LOCATION} - -DGLEW_LOCATION=${INSTALL_LOCATION} - -DILMBASE_LOCATION=${INSTALL_LOCATION} - -DOPENEXR_LOCATION=${INSTALL_LOCATION} - -DTBB_LOCATION=${INSTALL_LOCATION} - -DBLOSC_LOCATION=${INSTALL_LOCATION} - OPTIONS_RELEASE - -DTBB_LIBRARY_PATH=${LIB_LOCATION} - -DTbb_TBB_LIBRARY=${Tbb_TBB_LIBRARY} - -DTbb_TBBMALLOC_LIBRARY=${Tbb_TBBMALLOC_LIBRARY} - OPTIONS_DEBUG - -DTBB_LIBRARY_PATH=${LIB_LOCATION_DEBUG} - -DTbb_TBB_LIBRARY=${Tbb_TBB_LIBRARY_DEBUG} - -DTbb_TBBMALLOC_LIBRARY=${Tbb_TBBMALLOC_LIBRARY_DEBUG} + OPTIONS + -DOPENVDB_BUILD_UNITTESTS=OFF + -DOPENVDB_BUILD_PYTHON_MODULE=OFF + -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF + -DUSE_GLFW3=ON + -DOPENVDB_STATIC=${OPENVDB_STATIC} + -DOPENVDB_SHARED=${OPENVDB_SHARED} + -DOPENVDB_BUILD_TOOLS=${OPENVDB_BUILD_TOOLS} ) vcpkg_install_cmake() -- cgit v1.2.3 From 674ce6ad6558d6a5d95bf0ef7b20712cfdcb52cf Mon Sep 17 00:00:00 2001 From: evpobr Date: Tue, 26 Feb 2019 21:44:48 +0500 Subject: [libogg] Add package config module (#5384) --- .../0001-Install-CMake-package-config-module.patch | 97 ++++++++++++++++++++++ ports/libogg/CONTROL | 2 +- ports/libogg/portfile.cmake | 3 + 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 ports/libogg/0001-Install-CMake-package-config-module.patch diff --git a/ports/libogg/0001-Install-CMake-package-config-module.patch b/ports/libogg/0001-Install-CMake-package-config-module.patch new file mode 100644 index 000000000..2a33a641e --- /dev/null +++ b/ports/libogg/0001-Install-CMake-package-config-module.patch @@ -0,0 +1,97 @@ +From 0d3c307cee6e8135c84f3f7755bbc10dfd26e02b Mon Sep 17 00:00:00 2001 +From: evpobr +Date: Sat, 16 Feb 2019 11:50:16 +0500 +Subject: [PATCH] Install CMake package config module + +--- + CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ab14a2..9f5ee5a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,10 @@ +-cmake_minimum_required(VERSION 2.8.7) ++cmake_minimum_required(VERSION 2.8.12) + project(libogg) + + # Required modules + include(GNUInstallDirs) + include(CheckIncludeFiles) ++include(CMakePackageConfigHelpers) + + # Build options + option(BUILD_SHARED_LIBS "Build shared library" OFF) +@@ -80,18 +81,24 @@ if(BUILD_FRAMEWORK) + set(BUILD_SHARED_LIBS TRUE) + endif() + +-include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include) +-add_library(ogg ${OGG_HEADERS} ${OGG_SOURCES}) ++add_library(Ogg ${OGG_HEADERS} ${OGG_SOURCES}) ++ ++target_include_directories(Ogg ++ PUBLIC ++ $ ++ $ ++ $ ++) + + get_version_info(OGG_VERSION_INFO "LIB_CURRENT" "LIB_AGE" "LIB_REVISION") + set_target_properties( +- ogg PROPERTIES ++ Ogg PROPERTIES + SOVERSION ${OGG_VERSION_INFO} + PUBLIC_HEADER "${OGG_HEADERS}" + ) + + if(BUILD_FRAMEWORK) +- set_target_properties(ogg PROPERTIES ++ set_target_properties(Ogg PROPERTIES + FRAMEWORK TRUE + FRAMEWORK_VERSION ${PROJECT_VERSION} + MACOSX_FRAMEWORK_IDENTIFIER org.xiph.ogg +@@ -100,17 +107,38 @@ if(BUILD_FRAMEWORK) + XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" + OUTPUT_NAME Ogg + ) ++else() ++ set_target_properties(Ogg PROPERTIES OUTPUT_NAME ogg) + endif() + + configure_pkg_config_file(ogg.pc.in) + +-install(TARGETS ogg ++set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Ogg) ++ ++install(TARGETS Ogg ++ EXPORT OggConfig + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ogg + ) ++install(EXPORT OggConfig ++ NAMESPACE Ogg:: ++ DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} ++) ++ ++if(CMAKE_VERSION VERSION_LESS 3.11) ++ write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMajorVersion) ++else() ++ write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMinorVersion) ++endif() ++ ++install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/OggConfigVersion.cmake ++ DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} ++) ++ + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ogg.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + ) +-- +2.20.1.windows.1 + diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL index 459cdaf95..87169b6ef 100644 --- a/ports/libogg/CONTROL +++ b/ports/libogg/CONTROL @@ -1,3 +1,3 @@ Source: libogg -Version: 1.3.3 +Version: 1.3.3-1 Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index d0efac69a..ad8955fa8 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( REF v1.3.3 SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b HEAD_REF master + PATCHES 0001-Install-CMake-package-config-module.patch ) vcpkg_configure_cmake( @@ -16,6 +17,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Ogg TARGET_PATH share/Ogg) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -- cgit v1.2.3 From aa909090ace63e19ff738f3062e32c3b275a3da3 Mon Sep 17 00:00:00 2001 From: Claudio Fantacci Date: Tue, 26 Feb 2019 18:55:48 +0100 Subject: Fix Qt5 hardcoded absolute paths within DLLs (#5456) --- ports/qt5-base/CONTROL | 8 ++++---- ports/qt5-base/configure_qt.cmake | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 28df38b4f..c17ac83c2 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ -Source: qt5-base -Version: 5.12.1 -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl +Source: qt5-base +Version: 5.12.1-1 +Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake index aa3fe4aff..b66f6d22e 100644 --- a/ports/qt5-base/configure_qt.cmake +++ b/ports/qt5-base/configure_qt.cmake @@ -32,11 +32,11 @@ function(configure_qt) -debug -prefix ${CURRENT_INSTALLED_DIR}/debug -extprefix ${CURRENT_PACKAGES_DIR}/debug - -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 - -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug - -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug - -plugindir ${CURRENT_PACKAGES_DIR}/debug/plugins - -qmldir ${CURRENT_PACKAGES_DIR}/debug/qml + -hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5 + -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins + -qmldir ${CURRENT_INSTALLED_DIR}/debug/qml -headerdir ${CURRENT_PACKAGES_DIR}/include -I ${CURRENT_INSTALLED_DIR}/include -L ${CURRENT_INSTALLED_DIR}/debug/lib @@ -53,11 +53,11 @@ function(configure_qt) -release -prefix ${CURRENT_INSTALLED_DIR} -extprefix ${CURRENT_PACKAGES_DIR} - -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5 - -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5 - -datadir ${CURRENT_PACKAGES_DIR}/share/qt5 - -plugindir ${CURRENT_PACKAGES_DIR}/plugins - -qmldir ${CURRENT_PACKAGES_DIR}/qml + -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5 + -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5 + -datadir ${CURRENT_INSTALLED_DIR}/share/qt5 + -plugindir ${CURRENT_INSTALLED_DIR}/plugins + -qmldir ${CURRENT_INSTALLED_DIR}/qml -I ${CURRENT_INSTALLED_DIR}/include -L ${CURRENT_INSTALLED_DIR}/lib -platform ${_csc_PLATFORM} -- cgit v1.2.3 From 7b54d8ec11125d8cdeb48d1431808c1d908d59c4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 26 Feb 2019 18:56:59 +0100 Subject: [ace] Select correct Visual Studio solution based on platform toolset (#5458) * [ace] 6.5.4 * Added logic to select the correct solution for Visual Studio 2015 and 2017 --- ports/ace/portfile.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 95fc09dce..f3dcbc6bf 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -23,11 +23,17 @@ else () set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) endif() +if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(SOLUTION_TYPE vs2017) +else() + set(SOLUTION_TYPE vc14) +endif() + # Add ace/config.h file # see http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#win32 file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/ace_vc14.sln + PROJECT_PATH ${SOURCE_PATH}/ace_${SOLUTION_TYPE}.sln PLATFORM ${MSBUILD_PLATFORM} ) -- cgit v1.2.3 From 5251a51ab0b67176755542e6e85a5cb96e2f3524 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 27 Feb 2019 03:34:15 +0900 Subject: [coroutine] add new port (#5433) [coroutine] new package --- ports/coroutine/CONTROL | 4 +++ ports/coroutine/portfile.cmake | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 ports/coroutine/CONTROL create mode 100644 ports/coroutine/portfile.cmake diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL new file mode 100644 index 000000000..4b193d5bd --- /dev/null +++ b/ports/coroutine/CONTROL @@ -0,0 +1,4 @@ +Source: coroutine +Version: 1.4.0 +Build-Depends: ms-gsl +Description: C++ coroutine helper/example library diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake new file mode 100644 index 000000000..17e7596af --- /dev/null +++ b/ports/coroutine/portfile.cmake @@ -0,0 +1,58 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO luncliff/coroutine + REF 1.4 + SHA512 981c9c728c7888995880a97e8533fa31f41085ef57e1c61e53e555f329d20d4a882d9de724d9e93e3d009dc3fe0669fe4d1af403654a9373e4aab44c933628a3 + HEAD_REF master +) + +if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86) + message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead or contact maintainer") +endif() + +# package: 'ms-gsl' +message(STATUS "Using Guideline Support Library at ${CURRENT_INSTALLED_DIR}/include") + +set(DLL_LINKAGE false) +if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic) + message(STATUS "Using DLL linkage") + set(DLL_LINKAGE true) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + # package: 'ms-gsl' + -DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DTEST_DISABLED=True + -DBUILD_SHARED_LIBS=${DLL_LINKAGE} +) + +vcpkg_install_cmake() + +file( + INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/coroutine + RENAME copyright +) + +if(WIN32 AND DLL_LINKAGE) + file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/lib/coroutine.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + ) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/coroutine.dll) + + file(INSTALL ${CURRENT_PACKAGES_DIR}/lib/coroutine.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + ) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/coroutine.dll) +endif() +# removed duplicates in debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# unset used variables +unset(DLL_LINKAGE) -- cgit v1.2.3 From d96b4628238e6df39e7c30985e0fa85844d667df Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Tue, 26 Feb 2019 12:45:45 -0600 Subject: [tbb] Build dll for static dependency on Windows (#5430) * [tbb] Build dll for static dependency on Windows --- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 94126c5e7..22956077e 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2019_U3 +Version: 2019_U3-1 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 09398ae92..14d70deb5 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,7 +1,10 @@ include(vcpkg_common_functions) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message("tbb only supports dynamic library linkage") + set(VCPKG_LIBRARY_LINKAGE "dynamic") + endif() endif() vcpkg_from_github( -- cgit v1.2.3 From b6eec4ad64ca11112d364c3fab751bcd9dea1c1e Mon Sep 17 00:00:00 2001 From: Jon Spencer Date: Tue, 26 Feb 2019 11:08:53 -0800 Subject: [sdl2] allow sdl2 vulkan support (#5374) * [sdl2] allow sdl2 vulkan support * turn sdl2 vulkan support into a feature --- ports/sdl2/CONTROL | 4 ++++ ports/sdl2/portfile.cmake | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL index 18e867b7c..05e9d6363 100644 --- a/ports/sdl2/CONTROL +++ b/ports/sdl2/CONTROL @@ -1,3 +1,7 @@ Source: sdl2 Version: 2.0.9-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. + +Feature: vulkan +Description: Vulkan functionality for SDL +Build-Depends: vulkan diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 4bcfa5a9a..294d37449 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -16,13 +16,18 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL_SHARED) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) +set(VULKAN_VIDEO OFF) +if("vulkan" IN_LIST FEATURES) + set(VULKAN_VIDEO ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} - -DVIDEO_VULKAN=OFF + -DVIDEO_VULKAN=${VULKAN_VIDEO} -DFORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} -DLIBC=ON ) -- cgit v1.2.3 From 108afe53965be6a7a7555a9676f14993da95238d Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 27 Feb 2019 03:18:26 +0800 Subject: [gsoap]Add new port (#5295) * [gsoap]Add new port * Change to use existing binary files to generate binary files. * fix patch. --- ports/gsoap/CONTROL | 4 + ports/gsoap/fix-build-in-windows.patch | 307 +++++++++++++++++++++++++++++++++ ports/gsoap/portfile.cmake | 61 +++++++ 3 files changed, 372 insertions(+) create mode 100644 ports/gsoap/CONTROL create mode 100644 ports/gsoap/fix-build-in-windows.patch create mode 100644 ports/gsoap/portfile.cmake diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL new file mode 100644 index 000000000..2da6f0409 --- /dev/null +++ b/ports/gsoap/CONTROL @@ -0,0 +1,4 @@ +Source: gsoap +Version: 2.8.78-1 +Build-Depends: curl +Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings. \ No newline at end of file diff --git a/ports/gsoap/fix-build-in-windows.patch b/ports/gsoap/fix-build-in-windows.patch new file mode 100644 index 000000000..e661fb7c7 --- /dev/null +++ b/ports/gsoap/fix-build-in-windows.patch @@ -0,0 +1,307 @@ + gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln | 8 +- + .../soapcpp2/soapcpp2/soapcpp2.vcxproj | 114 +++++++++++++++++ + gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln | 8 +- + .../VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj | 139 +++++++++++++++++++++ + 4 files changed, 263 insertions(+), 6 deletions(-) + +diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln +index 68bacf1..5d74e6b 100644 +--- a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln ++++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln +@@ -1,7 +1,9 @@ +  +-Microsoft Visual Studio Solution File, Format Version 9.00 +-# Visual C++ Express 2005 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}" ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio 14 ++VisualStudioVersion = 14.0.25420.1 ++MinimumVisualStudioVersion = 10.0.40219.1 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcxproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj +new file mode 100644 +index 0000000..17f1d75 +--- /dev/null ++++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj +@@ -0,0 +1,114 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ {BDD1B293-CE39-4BEC-8E63-8B1621F3EB56} ++ soapcpp2 ++ Win32Proj ++ 8.1 ++ ++ ++ ++ Application ++ v140 ++ Unicode ++ true ++ ++ ++ Application ++ v140 ++ Unicode ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>14.0.25431.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ EditAndContinue ++ ++ ++ kernel32.lib ++ true ++ Console ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ kernel32.lib ++ true ++ Console ++ true ++ true ++ MachineX86 ++ ++ ++ ++ ++ ++ ++ ++ $(IntDir)%(Filename)1.obj ++ $(IntDir)%(Filename)1.xdc ++ $(IntDir)%(Filename)1.obj ++ $(IntDir)%(Filename)1.xdc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln +index ffa3fa4..3f23607 100644 +--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln ++++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln +@@ -1,7 +1,9 @@ +  +-Microsoft Visual Studio Solution File, Format Version 9.00 +-# Visual C++ Express 2005 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}" ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio 14 ++VisualStudioVersion = 14.0.25420.1 ++MinimumVisualStudioVersion = 10.0.40219.1 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcxproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj +new file mode 100644 +index 0000000..abf3ea6 +--- /dev/null ++++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj +@@ -0,0 +1,139 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ {6CBC554A-4FFB-461F-91D4-11B358802815} ++ wsdl2h ++ Win32Proj ++ 8.1 ++ ++ ++ ++ Application ++ v140 ++ Unicode ++ true ++ ++ ++ Application ++ v140 ++ Unicode ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>14.0.25431.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ EditAndContinue ++ ++ ++ kernel32.lib ++ true ++ Console ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ kernel32.lib ++ true ++ Console ++ true ++ true ++ MachineX86 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Parsing WSDL and Schema definitions ++ soapcpp2.exe -SC -pwsdl %(Filename)%(Extension) ++ ++ wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs) ++ Parsing WSDL and Schema definitions ++ soapcpp2.exe -SC -pwsdl %(Filename)%(Extension) ++ ++ wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake new file mode 100644 index 000000000..8162d6780 --- /dev/null +++ b/ports/gsoap/portfile.cmake @@ -0,0 +1,61 @@ +include(vcpkg_common_functions) +set(GSOAP_VERSION 2.8) +set(GSOAP_SUB_VERSION .78) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsoap-${GSOAP_VERSION}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ayera.dl.sourceforge.net/project/gsoap2/gsoap-${GSOAP_VERSION}/gsoap_${GSOAP_VERSION}${GSOAP_SUB_VERSION}.zip" + FILENAME "gsoap_${GSOAP_VERSION}${GSOAP_SUB_VERSION}.zip" + SHA512 c115044d2662c2dd355c4756a974a0013b7213dd28c536aba179e53c19466279bfa34ce16b4426db5aa7a24d94c18e0ed7e7cdf05e799bf89f7b54031aa0874e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/fix-build-in-windows.patch" +) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(BUILD_ARCH "Win32") +else() + message("gsoap only supported Win32") + set(BUILD_ARCH "Win32") +endif() + +# Handle binary files and includes +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools) + +if (WIN32) + vcpkg_build_msbuild( + USE_VCPKG_INTEGRATION + PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln + PLATFORM ${BUILD_ARCH} + TARGET Build + ) + vcpkg_build_msbuild( + USE_VCPKG_INTEGRATION + PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln + PLATFORM ${BUILD_ARCH} + TARGET Build + ) + + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/release/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/release/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/debug/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/debug/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) +else() + message(FATAL_ERROR "Sorry but gsoap only can be build in Windows temporary") +endif() + + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt ${SOURCE_PATH}/INSTALL.txt ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/copyright) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/INSTALL.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/install) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/README.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/readme) + +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3 From 4a582b4d1dda94f1342a1ab281c06b9617841532 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Tue, 26 Feb 2019 17:20:07 -0500 Subject: [miniz] Add new port (#5452) * [miniz] Add new port * [miniz] Fix Windows Build Conflict * [miniz] Miniz cannot be built as a shared library * [miniz] Force miniz to be static library * [miniz] Fix CRT deprecation error on uwp * [miniz] Fix CRT deprecation error within tests * [miniz] Disable tests entirely --- ports/miniz/CMakeLists-targets.patch | 54 ++++++++++++++++++++++++++++++++++++ ports/miniz/CONTROL | 3 ++ ports/miniz/portfile.cmake | 25 +++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 ports/miniz/CMakeLists-targets.patch create mode 100644 ports/miniz/CONTROL create mode 100644 ports/miniz/portfile.cmake diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch new file mode 100644 index 000000000..3b4c70468 --- /dev/null +++ b/ports/miniz/CMakeLists-targets.patch @@ -0,0 +1,54 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7dd6309..eaf160f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,12 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "") + CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif () + +-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) +- + set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c) + +-add_library(miniz ${miniz_SOURCE}) ++add_library(miniz STATIC ${miniz_SOURCE}) ++target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS) + ++if(FALSE) + set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") + set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") + set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") +@@ -41,12 +41,28 @@ if(${UNIX}) + target_link_libraries(example6 m) + endif() + ++target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS) ++ + # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) + # target_link_libraries(miniz_tester miniz) ++endif() + +-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++export(TARGETS ${PROJECT_NAME} ++ NAMESPACE miniz:: ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" ++) ++install(EXPORT ${PROJECT_NAME}Config ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz" ++ NAMESPACE miniz:: ++) + file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) +\ No newline at end of file ++install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL new file mode 100644 index 000000000..51a370a80 --- /dev/null +++ b/ports/miniz/CONTROL @@ -0,0 +1,3 @@ +Source: miniz +Version: 2.0.8 +Description: Single C source file zlib-replacement library diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake new file mode 100644 index 000000000..9c67ea8c9 --- /dev/null +++ b/ports/miniz/portfile.cmake @@ -0,0 +1,25 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO richgel999/miniz + REF 2.0.8 + SHA512 84b480df8bff63422d8c36cef3741f9b9f3dce13babf4de6cb4d575209978ad849357cc72bcf31ee8b6c5da6853ed2e5eddbbe16fecd689afd7028e834abf7e9 + HEAD_REF master + PATCHES + CMakeLists-targets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/miniz RENAME copyright) + +vcpkg_test_cmake(PACKAGE_NAME miniz) -- cgit v1.2.3 From c05014eb91f15043c8a68e35c93e45ab34188255 Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 27 Feb 2019 00:18:43 +0100 Subject: [ensmallen] Add new port (#5421) * [ensmallen] Add new port * [ensmallen] disable tests --- ports/ensmallen/CONTROL | 5 +++++ ports/ensmallen/disable_tests.patch | 15 +++++++++++++++ ports/ensmallen/portfile.cmake | 21 +++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 ports/ensmallen/CONTROL create mode 100644 ports/ensmallen/disable_tests.patch create mode 100644 ports/ensmallen/portfile.cmake diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL new file mode 100644 index 000000000..9676b708b --- /dev/null +++ b/ports/ensmallen/CONTROL @@ -0,0 +1,5 @@ +Source: ensmallen +Version: 1.14.0 +Description: A header-only C++ library for mathematical optimization. +Build-Depends: openblas, clapack, armadillo + diff --git a/ports/ensmallen/disable_tests.patch b/ports/ensmallen/disable_tests.patch new file mode 100644 index 000000000..80dd7e869 --- /dev/null +++ b/ports/ensmallen/disable_tests.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1577be5..b0171b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,7 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/ensmallen_bits" + install(FILES ${CMAKE_SOURCE_DIR}/include/ensmallen.hpp + DESTINATION "${CMAKE_INSTALL_PREFIX}/include") + +-enable_testing() +- +-add_subdirectory(tests) ++# Disable tests ++#enable_testing() ++# ++#add_subdirectory(tests) diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake new file mode 100644 index 000000000..dd03620f5 --- /dev/null +++ b/ports/ensmallen/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mlpack/ensmallen + REF ensmallen-1.14.0 + SHA512 a0b3660a0d01f5bc79fe302f08161a0b4d16fa006cc1d95cf24e046d2a4ab48de49b7644023837ed93426b982fbd0861d6c2774c0a80f4d2392ce494291ff70a + HEAD_REF master + PATCHES + disable_tests.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ensmallen RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -- cgit v1.2.3 From ca52a245d13a593bfe1c9c55440b2992198aaa3e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 26 Feb 2019 17:38:44 -0800 Subject: [cli11] Update to v1.7.1 (#5424) --- ports/cli11/CONTROL | 2 +- ports/cli11/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index 74f611944..d15d64155 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,3 @@ Source: cli11 -Version: 1.7.0 +Version: 1.7.1 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 4752f5973..e00158d70 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.7.0 - SHA512 e8a1fa8c09c2c2e4d805c5faa119f5d3d2bd3d18ca6bbc28be8890adbc53ea8c53a5b73ee2911fff7dadef6b0d4b870b1b574367ed520a790ee6ce34cbfe9c59 + REF v1.7.1 + SHA512 774ba3828c89ca8f0857a14d9823c11f116667f2fc305e6b2c73ccf3b194b50947821ec14073c618fc644bf6b597f6802cc2337d8a7425de4f42ba5b46e8370f HEAD_REF master ) -- cgit v1.2.3 From a5e030f446624354269bfadd8420e621b73bb76b Mon Sep 17 00:00:00 2001 From: Ahmad Jarjis Hasan Date: Tue, 26 Feb 2019 22:07:22 -0500 Subject: [opencv] enabling cublas (#3635) * [opencv] enabling cublas * [opencv] Enable CUBLAS when instaling with cuda feature --- ports/opencv/CONTROL | 2 +- ports/opencv/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 4727d4370..03328915d 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-5 +Version: 3.4.3-6 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 42ac28183..49e42466a 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -287,7 +287,7 @@ vcpkg_configure_cmake( ${BUILD_WITH_CONTRIB_FLAG} -DOPENCV_OTHER_INSTALL_PATH=share/opencv # WITH - -DWITH_CUBLAS=OFF + -DWITH_CUBLAS=${WITH_CUDA} -DWITH_CUDA=${WITH_CUDA} -DWITH_EIGEN=${WITH_EIGEN} -DWITH_FFMPEG=${WITH_FFMPEG} -- cgit v1.2.3 From 3a7c94a19eb4fc50b67682fc9e0d5bda89652983 Mon Sep 17 00:00:00 2001 From: igl42 <31173856+igl42@users.noreply.github.com> Date: Wed, 27 Feb 2019 18:46:43 +0100 Subject: [blaze] Update to Blaze 3.5 (#5470) --- ports/blaze/CONTROL | 2 +- ports/blaze/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL index dc80b4c41..89af7e7d3 100644 --- a/ports/blaze/CONTROL +++ b/ports/blaze/CONTROL @@ -1,4 +1,4 @@ Source: blaze -Version: 3.4-1 +Version: 3.5 Build-Depends: clapack, boost-exception Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index a44808249..216a90109 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3 - SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25 + REF cac64f2b35002f74a8ad2410ce6fb562b2cd2371 + SHA512 89381d77e518cdea40b0aa5013b8c74cbd737a2ce8d2d6869df1789a8154d2170c692ce04cae907704808fcff4a52fe0860d3fa2ee898780ce650a294b10894f HEAD_REF master PATCHES avoid-src-dir-generation.patch -- cgit v1.2.3 From 68039e4572bb161592809bbb1f01c359ff34ae99 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Thu, 28 Feb 2019 05:14:29 +1100 Subject: [gettext] Set includes correctly in target (#5463) --- ports/gettext/CMakeLists.txt | 70 +++++++++++++++++++++++++------------------- ports/gettext/CONTROL | 2 +- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt index edf46624d..cfd460e20 100644 --- a/ports/gettext/CMakeLists.txt +++ b/ports/gettext/CMakeLists.txt @@ -3,8 +3,6 @@ project(libintl C) find_package(unofficial-iconv REQUIRED) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/config .) - set(CMAKE_STATIC_LIBRARY_PREFIX) set(CMAKE_SHARED_LIBRARY_PREFIX) @@ -23,27 +21,28 @@ else() set(HAVE_ASPRINTF 1) set(HAVE_WPRINTF 1) set(HAVE_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) + 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) @@ -106,13 +105,19 @@ add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIB add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -D_CRT_SECURE_NO_WARNINGS") add_library(libintl ${SOURCES}) -target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) -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) +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() install(TARGETS libintl @@ -135,3 +140,8 @@ 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 +) \ No newline at end of file diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 1f96ff735..386fbd09c 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,4 +1,4 @@ Source: gettext -Version: 0.19-7 +Version: 0.19-8 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 -- cgit v1.2.3 From 2dfa568d186e4f0d199040929f9b3e44f27c8943 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 28 Feb 2019 03:49:56 +0800 Subject: [oniguruma] Add new port (#5432) * [oniguruma] Add new port * [oniguruma] Fix ONIG_EXTERN * [oniguruma] Disable vcpkg_test_cmake (failed on x64-windows) * [oniguruma] Update to 2019-02-26 to fix UWP sdl compile error --- ports/oniguruma/CONTROL | 6 +++++ ports/oniguruma/portfile.cmake | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 ports/oniguruma/CONTROL create mode 100644 ports/oniguruma/portfile.cmake diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL new file mode 100644 index 000000000..bf7a481ab --- /dev/null +++ b/ports/oniguruma/CONTROL @@ -0,0 +1,6 @@ +Source: oniguruma +Version: 2019-02-26 +Description: Modern and flexible regular expressions library + +Feature: non-posix +Description: Disable POSIX API diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake new file mode 100644 index 000000000..40652b590 --- /dev/null +++ b/ports/oniguruma/portfile.cmake @@ -0,0 +1,50 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kkos/oniguruma + REF 502b1f416746ed8700498229bbfceb180e400fbc + SHA512 0faf12f415de59716d8faa4d3dc026874c3bd6a3624f75f2a184843025294eb885d57164ae6dcb916cba5c7d1a4da4bcb0dc23fce3ceae5b34b7320e8f0e2c02 + HEAD_REF master +) + +if("non-posix" IN_LIST FEATURES) + set(ENABLE_POSIX_API OFF) +else() + set(ENABLE_POSIX_API ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_POSIX_API=${ENABLE_POSIX_API} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h + "#if defined(ONIGURUMA_EXPORT)" + "#if 0 // defined(ONIGURUMA_EXPORT)" + ) +else() + # oniguruma.h uses `\n` as line break. + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h + "#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)" + "#if 0\n#if defined(_WIN32) && !defined(__GNUC__)" + ) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +#vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From b8188cbc4ef81fd5f41f4c7601f49930322af941 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 27 Feb 2019 11:59:54 -0800 Subject: [stxxl] commented patch --- ports/stxxl/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index ec3c5531b..14d39d38e 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( SHA512 800a8fb95b52b21256cecb848f95645c54851f4dc070e0cd64fb5009f7663c0c962a24ca3f246e54d6d45e81a5c734309268d7ea6f0b0987336a50a3dcb99616 HEAD_REF master PATCHES + # This patch can be removed when stxxl/stxxl/#95 is accepted fix-include-dir.patch ) -- cgit v1.2.3 From 47950cabae132e1fc5c874b69665538762caa0f2 Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 28 Feb 2019 01:02:09 +0500 Subject: [opus] Fix version "unknown" returned by version API (#5134) Related issues: * erikd/libsndfile#406 * xiph/opus#110 * xiph/opus#111 --- ports/opus/CONTROL | 2 +- ports/opus/package_version.in | 1 + ports/opus/portfile.cmake | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ports/opus/package_version.in diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL index dd92faea5..a40b11c64 100644 --- a/ports/opus/CONTROL +++ b/ports/opus/CONTROL @@ -1,3 +1,3 @@ Source: opus -Version: 1.3 +Version: 1.3-1 Description: Totally open, royalty-free, highly versatile audio codec diff --git a/ports/opus/package_version.in b/ports/opus/package_version.in new file mode 100644 index 000000000..4bc971b33 --- /dev/null +++ b/ports/opus/package_version.in @@ -0,0 +1 @@ +PACKAGE_VERSION="@OPUS_VERSION@" diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index d15be61f1..ae257690c 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -3,6 +3,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) endif() include(vcpkg_common_functions) + +set(OPUS_VERSION "1.3") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opus @@ -12,6 +15,11 @@ vcpkg_from_github( PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-main.patch" ) +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/package_version.in + ${SOURCE_PATH}/package_version +) + # Ensure proper crt linkage file(READ ${SOURCE_PATH}/win32/VS2015/common.props OPUS_PROPS) if(VCPKG_CRT_LINKAGE STREQUAL dynamic) -- cgit v1.2.3 From 423c9a2e3a49c5af879482dda2f425ff20769236 Mon Sep 17 00:00:00 2001 From: Vitaliy Didik Date: Wed, 27 Feb 2019 23:04:50 +0300 Subject: Updated gmime to version 3.2.3. (#5060) --- ports/gmime/CMakeLists.txt | 99 +++++++--------------------------------------- ports/gmime/CONTROL | 2 +- ports/gmime/gmime.def | 7 +++- ports/gmime/idna.h | 3 -- ports/gmime/portfile.cmake | 8 ++-- 5 files changed, 25 insertions(+), 94 deletions(-) delete mode 100644 ports/gmime/idna.h diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt index 20c788f7e..b6bead6da 100644 --- a/ports/gmime/CMakeLists.txt +++ b/ports/gmime/CMakeLists.txt @@ -2,24 +2,14 @@ cmake_minimum_required(VERSION 3.8) project(gmime C) -set(GLIB_LIB_SUFFIX 2.0) set(GMIME_DLL_SUFFIX 3) set(GMIME_LIB_SUFFIX 3.0) -# Find glib -find_path(GLIB_INCLUDE_DIR glib.h) -find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GIO_LIBRARY gio-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_SUFFIX}) -set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GIO_LIBRARY} ${GLIB_GOBJECT_LIBRARY}) - -# Find other deps -find_path(ICONV_INCLUDE_DIR iconv.h) -find_library(ICONV_LIBRARY NAMES iconv libiconv) - -find_library(IDN_LIBRARY NAMES libidn2 libidn) - find_package(zlib REQUIRED) +find_package(unofficial-glib CONFIG REQUIRED) +find_package(unofficial-iconv REQUIRED) + +find_library(IDN_LIBRARY NAMES libidn2) if(MSVC) add_definitions(-D_CRT_SECURE_NO_DEPRECATE) @@ -29,75 +19,15 @@ endif() add_definitions(-DHAVE_CONFIG_H) add_definitions(-DG_LOG_DOMAIN="GMime") -# List the source files -set(LIB_SRC gmime/gmime.c - gmime/gmime-application-pkcs7-mime.c - gmime/gmime-autocrypt.c - gmime/gmime-certificate.c - gmime/gmime-charset.c - gmime/gmime-common.c - gmime/gmime-content-type.c - gmime/gmime-crypto-context.c - gmime/gmime-data-wrapper.c - gmime/gmime-disposition.c - gmime/gmime-encodings.c - gmime/gmime-events.c - gmime/gmime-filter.c - gmime/gmime-filter-basic.c - gmime/gmime-filter-best.c - gmime/gmime-filter-charset.c - gmime/gmime-filter-checksum.c - gmime/gmime-filter-dos2unix.c - gmime/gmime-filter-enriched.c - gmime/gmime-filter-from.c - gmime/gmime-filter-gzip.c - gmime/gmime-filter-html.c - gmime/gmime-filter-smtp-data.c - gmime/gmime-filter-strip.c - gmime/gmime-filter-unix2dos.c - gmime/gmime-filter-windows.c - gmime/gmime-filter-yenc.c - gmime/gmime-format-options.c - gmime/gmime-gpg-context.c - gmime/gmime-gpgme-utils.c - gmime/gmime-header.c - gmime/gmime-iconv.c - gmime/gmime-iconv-utils.c - gmime/gmime-message.c - gmime/gmime-message-part.c - gmime/gmime-message-partial.c - gmime/gmime-multipart.c - gmime/gmime-multipart-encrypted.c - gmime/gmime-multipart-signed.c - gmime/gmime-object.c - gmime/gmime-param.c - gmime/gmime-parse-utils.c - gmime/gmime-parser.c - gmime/gmime-parser-options.c - gmime/gmime-part.c - gmime/gmime-part-iter.c - gmime/gmime-pkcs7-context.c - gmime/gmime-references.c - gmime/gmime-signature.c - gmime/gmime-stream.c - gmime/gmime-stream-buffer.c - gmime/gmime-stream-cat.c - gmime/gmime-stream-file.c - gmime/gmime-stream-filter.c - gmime/gmime-stream-fs.c - gmime/gmime-stream-gio.c - gmime/gmime-stream-mem.c - gmime/gmime-stream-mmap.c - gmime/gmime-stream-null.c - gmime/gmime-stream-pipe.c - gmime/gmime-text-part.c - gmime/gmime-utils.c - gmime/internet-address.c - util/packed.c - util/url-scanner.c - util/gtrie.c -) +# Source files +file(GLOB LIB_SRC gmime/gmime-*.c) +list(APPEND LIB_SRC gmime/gmime.c + gmime/internet-address.c + util/packed.c + util/url-scanner.c + util/gtrie.c) +# Headers file(GLOB LIB_HEADERS gmime/gmime-*.h) list(APPEND LIB_HEADERS gmime/gmime.h) list(APPEND LIB_HEADERS gmime/internet-address.h) @@ -113,8 +43,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_NAME ${PROJECT_NAME}-${GMIME_LIB_SUFFIX} ) -target_include_directories(${PROJECT_NAME} PRIVATE . ./util ${GLIB_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${GLIB_LIBRARIES} ${ICONV_LIBRARY} ${ZLIB_LIBRARIES} ${IDN_LIBRARY}) +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 unofficial::glib::gobject unofficial::glib::gio unofficial::glib::glib) target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib) install(TARGETS ${PROJECT_NAME} diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL index febce0ebe..21cedc5e6 100644 --- a/ports/gmime/CONTROL +++ b/ports/gmime/CONTROL @@ -1,4 +1,4 @@ Source: gmime -Version: 3.0.5 +Version: 3.2.3 Build-Depends: zlib, glib, libiconv, libidn2 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/gmime/gmime.def b/ports/gmime/gmime.def index b072e0d65..e73d0fa01 100644 --- a/ports/gmime/gmime.def +++ b/ports/gmime/gmime.def @@ -160,6 +160,11 @@ g_mime_filter_gzip_get_type g_mime_filter_gzip_new g_mime_filter_html_get_type g_mime_filter_html_new +g_mime_filter_openpgp_new +g_mime_filter_openpgp_get_data_type +g_mime_filter_openpgp_get_begin_offset +g_mime_filter_openpgp_get_end_offset +g_mime_filter_openpgp_get_type g_mime_filter_reset g_mime_filter_set_size g_mime_filter_smtp_data_get_type @@ -502,7 +507,7 @@ g_mime_stream_mem_set_owner g_mime_stream_mmap_get_type g_mime_stream_mmap_new g_mime_stream_mmap_new_with_bounds -g_mime_stream_null_count_newlines +g_mime_stream_null_set_count_newlines g_mime_stream_null_get_count_newlines g_mime_stream_null_get_type g_mime_stream_null_new diff --git a/ports/gmime/idna.h b/ports/gmime/idna.h deleted file mode 100644 index 3313cdbc7..000000000 --- a/ports/gmime/idna.h +++ /dev/null @@ -1,3 +0,0 @@ -// Redirects header from libidn to libidn2 -// Created to avoid sources patching -#include diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index ddfeeb74c..dbe678834 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -1,15 +1,15 @@ include(vcpkg_common_functions) set(LIB_NAME gmime) -set(LIB_VERSION 3.0.5) +set(LIB_VERSION 3.2.3) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/gmime/3.0/${LIB_FILENAME}" + URLS "https://download.gnome.org/sources/gmime/3.2/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 658b9008ffdf8055ffa9dfe8a5a6036a487309b0419572a9376397f68a8fc17d36ba6a05d2dfcb2ad23e634dc9e2aedd2479df1bfa0b7f8944d4c294650cb6c8 + SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -19,8 +19,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) configure_file(${SOURCE_PATH}/build/vs2010/unistd.h ${SOURCE_PATH} COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) - -configure_file(${CMAKE_CURRENT_LIST_DIR}/idna.h ${SOURCE_PATH} COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/gmime.def ${SOURCE_PATH} COPYONLY) vcpkg_configure_cmake( -- cgit v1.2.3 From a2216f4b0aae4f1bf25c97662e18c78f7b7f24bd Mon Sep 17 00:00:00 2001 From: Cyriuz Date: Wed, 27 Feb 2019 21:24:17 +0100 Subject: [qt5-base] Also deploy style dlls when deloying Qt. (#5044) * Also deploy style dlls when deloying Qt. This fixes broken styling of apps on Windows. * [qt5-base] bump controll version --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index c17ac83c2..b9f669186 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.12.1-1 +Version: 5.12.1-2 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl -- cgit v1.2.3 From 8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 Mon Sep 17 00:00:00 2001 From: Cyriuz Date: Wed, 27 Feb 2019 21:31:04 +0100 Subject: Fixed DevIL build with OpenEXR. (#5043) [devil] Fixed DevIL build with OpenEXR. --- ports/devil/0003_fix-openexr.patch | 109 +++++++++++++++++++++++++++++++++++++ ports/devil/portfile.cmake | 1 + 2 files changed, 110 insertions(+) create mode 100644 ports/devil/0003_fix-openexr.patch diff --git a/ports/devil/0003_fix-openexr.patch b/ports/devil/0003_fix-openexr.patch new file mode 100644 index 000000000..d8038e4cf --- /dev/null +++ b/ports/devil/0003_fix-openexr.patch @@ -0,0 +1,109 @@ +--- a/DevIL/src-IL/cmake/FindOpenEXR.cmake ++++ b/DevIL/src-IL/cmake/FindOpenEXR.cmake +@@ -1,64 +1,13 @@ +-# Locate OpenEXR +-# This module defines +-# OPENEXR_LIBRARIES +-# OPENEXR_FOUND, if false, do not try to link to OpenEXR +-# OPENEXR_INCLUDE_DIR, where to find the headers +-# +-# $OPENEXR_DIR is an environment variable that would +-# correspond to the ./configure --prefix=$OPENEXR_DIR +-# +-# Created by Robert Osfield. ++include(FindPackageHandleStandardArgs) + ++find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR) + +-FIND_PATH(OPENEXR_INCLUDE_DIR ImfIO.h +- $ENV{OPENEXR_DIR}/include +- $ENV{OPENEXR_DIR} +- ~/Library/Frameworks +- /Library/Frameworks +- /usr/local/include +- /usr/include +- /sw/include # Fink +- /opt/local/include # DarwinPorts +- /opt/csw/include # Blastwave +- /opt/include +- /usr/freeware/include +-) ++find_library(OPENEXR_HALF_LIBRARY NAMES Half) ++find_library(OPENEXR_IEX_LIBRARY NAMES Iex-2_2) ++find_library(OPENEXR_IMATH_LIBRARY NAMES Imath-2_2) ++find_library(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf-2_2) ++find_library(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread-2_2) + +-# Macro to find exr libraries (deduplicating search paths) +-# example: OPENEXR_FIND_VAR(OPENEXR_IlmImf_LIBRARY IlmImf) +-MACRO(OPENEXR_FIND_VAR varname libname) +- FIND_LIBRARY( ${varname} +- NAMES ${libname} +- PATHS +- $ENV{OPENEXR_DIR}/lib +- $ENV{OPENEXR_DIR} +- ~/Library/Frameworks +- /Library/Frameworks +- /usr/local/lib +- /usr/lib +- /sw/lib +- /opt/local/lib +- /opt/csw/lib +- /opt/lib +- /usr/freeware/lib64 +- ) +-ENDMACRO(OPENEXR_FIND_VAR) ++set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY}) + +-# Macro to find exr libraries (and debug versions) +-# example: OPENEXR_FIND(IlmImf) +-MACRO(OPENEXR_FIND libname) +- OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY ${libname}) +- OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) +-ENDMACRO(OPENEXR_FIND) +- +-OPENEXR_FIND(IlmImf) +-OPENEXR_FIND(IlmThread) +-OPENEXR_FIND(Iex) +-OPENEXR_FIND(Half) +- +-SET(OPENEXR_FOUND "NO") +-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) +- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) +- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY ) +- SET(OPENEXR_FOUND "YES") +-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) ++find_package_handle_standard_args(OPENEXR REQUIRED_VARS OPENEXR_LIBRARIES OPENEXR_INCLUDE_PATHS) +--- a/DevIL/src-IL/src/il_exr.cpp ++++ b/DevIL/src-IL/src/il_exr.cpp +@@ -15,14 +15,14 @@ + #ifndef IL_NO_EXR + + #ifndef HAVE_CONFIG_H // We are probably on a Windows box . +-//#define OPENEXR_DLL +-#define HALF_EXPORTS ++#define OPENEXR_DLL ++//#define HALF_EXPORTS + #endif //HAVE_CONFIG_H + + #include "il_exr.h" +-#include +-#include +-#include ++#include ++#include ++#include + //#include + //#include + //#include +--- a/DevIL/src-IL/include/il_exr.h ++++ b/DevIL/src-IL/include/il_exr.h +@@ -15,7 +15,7 @@ + #define EXR_H + + #include "il_internal.h" +-#include ++#include + + + //using namespace Imf; // Using this leads to errors with Microsoft's IStream. diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index ff4e7ee0c..7ab5a6c06 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES 0001_fix-encoding.patch 0002_fix-missing-mfc-includes.patch + 0003_fix-openexr.patch enable-static.patch ) -- cgit v1.2.3 From 1d442a0b5aae9a6ad644156247346abae72509df Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Wed, 27 Feb 2019 23:44:03 -0800 Subject: [libraw] Fix build release only issue (#5484) --- ports/libraw/CONTROL | 2 +- ports/libraw/portfile.cmake | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index 431ba1dc7..ba378b8ff 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,4 +1,4 @@ Source: libraw -Version: 0.19.0-1 +Version: 0.19.0-2 Build-Depends: lcms, jasper Description: raw image decoder library diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 7badade25..1ed02eab4 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -52,13 +52,17 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore # because otherwise libraries that build on top of libraw have to choose. file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/raw.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/raw_r.lib ${CURRENT_PACKAGES_DIR}/lib/raw.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) + if(NOT VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) + endif() # Cleanup file(GLOB RELEASE_EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(REMOVE ${RELEASE_EXECUTABLES}) - file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${DEBUG_EXECUTABLES}) + if(NOT VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${DEBUG_EXECUTABLES}) + endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) -- cgit v1.2.3 From 91bb4183e17420f7acae5cf380a5c34eb7dec322 Mon Sep 17 00:00:00 2001 From: badfish69 Date: Thu, 28 Feb 2019 18:45:08 +1100 Subject: Update log4cplus to 2.0.3 (#5483) --- ports/log4cplus/CONTROL | 2 +- ports/log4cplus/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL index 712a78730..dcdae01a5 100644 --- a/ports/log4cplus/CONTROL +++ b/ports/log4cplus/CONTROL @@ -1,4 +1,4 @@ Source: log4cplus -Version: REL_2_0_1 +Version: REL_2_0_3 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration Build-Depends: catch diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 97a17a4f7..672d855de 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -2,16 +2,16 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF REL_2_0_1 - SHA512 7a84bf237bb5db3eccd90196c0f97adb75d0dd247d73852150078b9458f169d883f3ae92908217ea668bcf25c64766c86380bbcc64b432eb1bae6427c9268b18 + REF REL_2_0_3 + SHA512 c4c8887137214a9c66545ffa7f13cbede3db1536916681081f53c0a272cfb17d5e42cdc54c2c1bdd6eb5f86c3c3ce0840cbf827f792848ecb8f97636f1fcddf2 HEAD_REF master ) -set(THREADPOOL_REF dda9e3d40502e85ce082c05d2c05c1bc94348b6a) +set(THREADPOOL_REF cc0b6371d3963f7028c2da5fc007733f9f3bf205) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/log4cplus/ThreadPool/archive/${THREADPOOL_REF}.tar.gz" FILENAME "log4cplus-threadpool-${THREADPOOL_REF}.tar.gz" - SHA512 225adb11f447495a00e401d32f63d9a7eb3a8191d477a21bfa3c39f1ff5cbe8bfb7770a740e840c5748f816137cdef1a5915b17d16b3dd4c3399d1a67ab0f381 + SHA512 ad4d287c1f83acac4c127136bc92489c43bb5293613dc54b878b8e75a8583f7eefda6434d09789dad47b87a5d38f10a07a746d42d299410c11f2dbcce8af3012 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From 1073c3bf2b36ff8cade24034e137a7e6ce841b33 Mon Sep 17 00:00:00 2001 From: Hans L Date: Thu, 28 Feb 2019 01:47:59 -0600 Subject: [opencsg] Add new port (#5481) * Add opencsg package * Make opencsg static only * Add patch for illegal character, fix line endings --- ports/opencsg/CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++++++++ ports/opencsg/CONTROL | 4 ++++ ports/opencsg/illegal_char.patch | 13 ++++++++++++ ports/opencsg/portfile.cmake | 39 ++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 ports/opencsg/CMakeLists.txt create mode 100644 ports/opencsg/CONTROL create mode 100644 ports/opencsg/illegal_char.patch create mode 100644 ports/opencsg/portfile.cmake diff --git a/ports/opencsg/CMakeLists.txt b/ports/opencsg/CMakeLists.txt new file mode 100644 index 000000000..683529ddc --- /dev/null +++ b/ports/opencsg/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required (VERSION 3.4) +project (opencsg) + +set(HEADERS + include/opencsg.h +) + +set(SRCS + src/area.cpp + src/batch.cpp + src/context.cpp + src/channelManager.cpp + src/frameBufferObject.cpp + src/frameBufferObjectExt.cpp + src/occlusionQuery.cpp + src/opencsgRender.cpp + src/openglHelper.cpp + src/primitive.cpp + src/primitiveHelper.cpp + src/renderGoldfeather.cpp + src/renderSCS.cpp + src/scissorMemo.cpp + src/settings.cpp + src/stencilManager.cpp + src/pBufferTexture.cpp + RenderTexture/RenderTexture.cpp +) + + +add_library(opencsg ${SRCS} ${HEADERS}) + +include_directories(src include RenderTexture ".") +find_package(GLEW REQUIRED) +include_directories(${GLEW_INCLUDE_DIRS}) +target_link_libraries(opencsg PRIVATE GLEW::GLEW) + +install( + TARGETS opencsg + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/opencsg) +endif() diff --git a/ports/opencsg/CONTROL b/ports/opencsg/CONTROL new file mode 100644 index 000000000..a2b5b0d7f --- /dev/null +++ b/ports/opencsg/CONTROL @@ -0,0 +1,4 @@ +Source: opencsg +Version: 1.4.2 +Build-Depends: glew +Description: OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system. diff --git a/ports/opencsg/illegal_char.patch b/ports/opencsg/illegal_char.patch new file mode 100644 index 000000000..5c700fd19 --- /dev/null +++ b/ports/opencsg/illegal_char.patch @@ -0,0 +1,13 @@ +diff --git a/include/opencsg.h b/include/opencsg.h +index d753a0e..b482c40 100644 +--- a/include/opencsg.h ++++ b/include/opencsg.h +@@ -156,7 +156,7 @@ namespace OpenCSG { + /// The DepthComplexityAlgorithm specifies the strategy for profiting + /// from depth complexity when performing the CSG rendering. + /// - NoDepthComplexitySampling: Does not employ the depth complexity. +- /// This essentially makes the algorithm O(n²), but with ++ /// This essentially makes the algorithm O(n²), but with + /// low constant costs. + /// - DepthComplexitySampling: Calculates the depth complexity k using + /// the stencil buffer. This makes algorithm O(n*k), but diff --git a/ports/opencsg/portfile.cmake b/ports/opencsg/portfile.cmake new file mode 100644 index 000000000..e43a89ec5 --- /dev/null +++ b/ports/opencsg/portfile.cmake @@ -0,0 +1,39 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO floriankirsch/OpenCSG + REF "opencsg-1-4-2-release" + SHA512 df117a1b7153a95332d236918d1547b0afe6f3ead46af2733c5feee6e25cec984b21affc41fd8320a45be9292bd3b32e21ed8bb3d08371ddd657f659b9bb932a + HEAD_REF master + PATCHES illegal_char.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DUNICODE=1 -D_UNICODE=1 + # OPTIONS_RELEASE -DOPTIMIZE=1 + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencsg RENAME copyright) -- cgit v1.2.3 From 3881ade1591e78742ac3609cbb415cf6c6570178 Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 28 Feb 2019 15:50:52 +0800 Subject: [winpcap]fix build in x86-windows-static and x64-windows-static: use correct library. (#5478) --- ports/winpcap/Packet.vcxproj | 768 +++++++++++++++++++++++++++++++ ports/winpcap/fix-create-lib-batch.patch | 23 + ports/winpcap/portfile.cmake | 15 +- ports/winpcap/wpcap.vcxproj | 396 ++++++++++++++++ 4 files changed, 1200 insertions(+), 2 deletions(-) create mode 100644 ports/winpcap/Packet.vcxproj create mode 100644 ports/winpcap/fix-create-lib-batch.patch create mode 100644 ports/winpcap/wpcap.vcxproj diff --git a/ports/winpcap/Packet.vcxproj b/ports/winpcap/Packet.vcxproj new file mode 100644 index 000000000..71e190caa --- /dev/null +++ b/ports/winpcap/Packet.vcxproj @@ -0,0 +1,768 @@ + + + + + Debug No NetMon + Win32 + + + Debug No NetMon + x64 + + + Debug NT4 + Win32 + + + Debug NT4 + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release LOG_TO_FILE + Win32 + + + Release LOG_TO_FILE + x64 + + + Release No NetMon LOG_TO_FILE + Win32 + + + Release No NetMon LOG_TO_FILE + x64 + + + Release No NetMon + Win32 + + + Release No NetMon + x64 + + + Release NT4 LOG_TO_FILE + Win32 + + + Release NT4 LOG_TO_FILE + x64 + + + Release NT4 + Win32 + + + Release NT4 + x64 + + + Release + Win32 + + + Release + x64 + + + + {17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52} + Packet + Win32Proj + + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS; _WINNT4;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; _WINNT4;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; _WINNT4;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + true + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ports/winpcap/fix-create-lib-batch.patch b/ports/winpcap/fix-create-lib-batch.patch new file mode 100644 index 000000000..0a1d9017d --- /dev/null +++ b/ports/winpcap/fix-create-lib-batch.patch @@ -0,0 +1,23 @@ +diff --git a/create_lib.bat b/create_lib.bat +index c70a179..4690d9e 100644 +--- a/create_lib.bat ++++ b/create_lib.bat +@@ -7,10 +7,16 @@ IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) + echo Creating \Lib folder + mkdir %WPDPACKDESTDIR% >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul ++mkdir %WPDPACKDESTDIR%\Lib\debug\ >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul ++mkdir %WPDPACKDESTDIR%\Lib\x64\debug >nul 2>nul + +-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul +-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\debug\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64\debug\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x86\packet.lib %WPDPACKDESTDIR%\Lib\debug\ >nul ++xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64\debug\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul + diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 613a5733e..964122d17 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_extract_source_archive_ex( "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch" ) file( @@ -63,8 +64,14 @@ vcpkg_execute_required_process( LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY ${CURRENT_PORT_DIR}/Packet.vcxproj DESTINATION ${SOURCE_PATH}/packetNtx/Dll/Project/) +endif() + vcpkg_build_msbuild( PROJECT_PATH "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.sln" + RELEASE_CONFIGURATION "Release" + DEBUG_CONFIGURATION "Debug" PLATFORM ${PLATFORM} ) @@ -85,6 +92,10 @@ vcpkg_execute_required_process( LOGNAME upgrade-wpcap-${TARGET_TRIPLET} ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY ${CURRENT_PORT_DIR}/wpcap.vcxproj DESTINATION ${SOURCE_PATH}/wpcap/PRJ/) +endif() + vcpkg_build_msbuild( PROJECT_PATH "${SOURCE_PATH}/wpcap/PRJ/wpcap.sln" RELEASE_CONFIGURATION "Release - No AirPcap" @@ -147,8 +158,8 @@ file( file( INSTALL - "${PCAP_LIBRARY_PATH}/Packet.lib" - "${PCAP_LIBRARY_PATH}/wpcap.lib" + "${PCAP_LIBRARY_PATH}/debug/Packet.lib" + "${PCAP_LIBRARY_PATH}/debug/wpcap.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) diff --git a/ports/winpcap/wpcap.vcxproj b/ports/winpcap/wpcap.vcxproj new file mode 100644 index 000000000..5740dec40 --- /dev/null +++ b/ports/winpcap/wpcap.vcxproj @@ -0,0 +1,396 @@ + + + + + Debug No AirPcap + Win32 + + + Debug No AirPcap + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release No AirPcap + Win32 + + + Release No AirPcap + x64 + + + Release + Win32 + + + Release + x64 + + + + {20B438DA-CBEC-4AFF-B11C-67B301D14AD5} + wpcap + Win32Proj + + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX64 + + + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX86 + + + MachineX86 + + + + + X64 + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX64 + + + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX86 + + + MachineX86 + + + + + X64 + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From ddf0043e94395c4cfdb633a5ceaa07d2016500fe Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Thu, 28 Feb 2019 18:52:31 +1100 Subject: [dlib] fix mac, windows-static build (#5477) --- ports/dlib/CONTROL | 2 +- ports/dlib/fix-mac-jpeg.patch | 12 +++++++ ports/dlib/fix-sqlite3-fftw-linkage.patch | 57 +++++++++++++++++++++++++++++++ ports/dlib/portfile.cmake | 4 +++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 ports/dlib/fix-mac-jpeg.patch create mode 100644 ports/dlib/fix-sqlite3-fftw-linkage.patch diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index 4e726c662..ab2e80e87 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,5 +1,5 @@ Source: dlib -Version: 19.16 +Version: 19.16-1 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ diff --git a/ports/dlib/fix-mac-jpeg.patch b/ports/dlib/fix-mac-jpeg.patch new file mode 100644 index 000000000..5f961264b --- /dev/null +++ b/ports/dlib/fix-mac-jpeg.patch @@ -0,0 +1,12 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -480,7 +480,7 @@ + set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY}) + CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD) + endif() +- if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE) ++ if (JPEG_FOUND AND LIBJPEG_IS_GOOD) + include_directories(${JPEG_INCLUDE_DIR}) + set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY}) + else() diff --git a/ports/dlib/fix-sqlite3-fftw-linkage.patch b/ports/dlib/fix-sqlite3-fftw-linkage.patch new file mode 100644 index 000000000..84ab0c265 --- /dev/null +++ b/ports/dlib/fix-sqlite3-fftw-linkage.patch @@ -0,0 +1,57 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -747,32 +750,15 @@ + + + if (DLIB_LINK_WITH_SQLITE3) +- find_library(sqlite sqlite3) +- # make sure sqlite3.h is in the include path +- find_path(sqlite_path sqlite3.h) +- if (sqlite AND sqlite_path) +- set(dlib_needed_includes ${dlib_needed_includes} ${sqlite_path}) +- set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} ) +- else() +- set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) +- endif() +- mark_as_advanced(sqlite sqlite_path) ++ find_package(sqlite3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} sqlite3 ) + endif() + + + + if (DLIB_USE_FFTW) +- find_library(fftw fftw3) +- # make sure fftw3.h is in the include path +- find_path(fftw_path fftw3.h) +- if (fftw AND fftw_path) +- set(dlib_needed_includes ${dlib_needed_includes} ${fftw_path}) +- set(dlib_needed_libraries ${dlib_needed_libraries} ${fftw} ) +- else() +- set(DLIB_USE_FFTW OFF CACHE STRING ${DLIB_USE_FFTW_STR} FORCE ) +- toggle_preprocessor_switch(DLIB_USE_FFTW) +- endif() +- mark_as_advanced(fftw fftw_path) ++ find_package(FFTW3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} FFTW3::fftw3) + endif() + + +--- a/dlib/cmake_utils/dlibConfig.cmake.in ++++ b/dlib/cmake_utils/dlibConfig.cmake.in +@@ -28,6 +28,14 @@ + include("${dlib_CMAKE_DIR}/dlib.cmake") + endif() + ++include(CMakeFindDependencyMacro) ++if("@DLIB_USE_FFTW@") ++ find_dependency(FFTW3 CONFIG) ++endif() ++if("@DLIB_LINK_WITH_SQLITE3@") ++ find_dependency(sqlite3 CONFIG) ++endif() ++ + set(dlib_LIBRARIES dlib::dlib) + set(dlib_LIBS dlib::dlib) + set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index f6cdf4eeb..427de4a8d 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -11,6 +11,9 @@ vcpkg_from_github( REF v19.16 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887 HEAD_REF master + PATCHES + fix-mac-jpeg.patch + fix-sqlite3-fftw-linkage.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg) @@ -40,6 +43,7 @@ vcpkg_configure_cmake( -DDLIB_USE_CUDA=${WITH_CUDA} -DDLIB_GIF_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF + -DCMAKE_DEBUG_POSTFIX=d OPTIONS_DEBUG -DDLIB_ENABLE_ASSERTS=ON #-DDLIB_ENABLE_STACK_TRACE=ON -- cgit v1.2.3 From 2684a5d1844febb1ee0b702292b16c4c222f4d35 Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 28 Feb 2019 15:24:14 +0300 Subject: RESTinio updated to v.0.4.8.6 (#5487) --- ports/restinio/CONTROL | 2 +- ports/restinio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL index 83752b6c4..311b9d581 100644 --- a/ports/restinio/CONTROL +++ b/ports/restinio/CONTROL @@ -1,4 +1,4 @@ Source: restinio -Version: 0.4.8.5 +Version: 0.4.8.6 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests. Build-Depends: asio, fmt, http-parser diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 8d5d07615..5e151cb9f 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO sobjectizerteam/restinio-0.4 - REF v.0.4.8.5 - SHA512 e689033360af9a50f9e8c22e0852fa1ce5a7199484d8fc629570c6511f49b480434ee51efe2ae0f768f3e351e401ba100fd794657c5340e5750b4c5c19e37d71 + REF v.0.4.8.6 + SHA512 9b2e7af3e00a27a32605c27b45c1015468ae3ad5810b51b194eef0038d530c819bf6b91ff166852637dc0f141476f4d58876e4370929e2f091c7d5c1b3c9c72a ) vcpkg_configure_cmake( -- cgit v1.2.3 From 5b0b4b6472fecfe90ce30e108ec56ec0c8bb995f Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Thu, 28 Feb 2019 07:40:38 -0500 Subject: [vulkan] fix include path on linux (#5486) The path used a capital `I` in include, whereas linux uses lower case. --- ports/vulkan/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index bf6c2d65e..4ccbac35f 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -5,7 +5,7 @@ include(vcpkg_common_functions) message(STATUS "Querying VULKAN_SDK Enviroment variable") file(TO_CMAKE_PATH "$ENV{VULKAN_SDK}" VULKAN_DIR) -set(VULKAN_INCLUDE "${VULKAN_DIR}/Include/vulkan/") +set(VULKAN_INCLUDE "${VULKAN_DIR}/include/vulkan/") set(VULKAN_ERROR_DL "Before continuing, please download and install Vulkan from:\n https://vulkan.lunarg.com/sdk/home\n") if(NOT DEFINED ENV{VULKAN_SDK}) @@ -41,4 +41,4 @@ else() message(FATAL_ERROR "Could not find LICENSE.TXT") endif() -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -- cgit v1.2.3 From 2cb2e4d718be303e502b04b759b2108c47aaca31 Mon Sep 17 00:00:00 2001 From: Peter Bright Date: Thu, 28 Feb 2019 14:32:08 -0500 Subject: Update 0002-Fix-z7-override.patch (#5490) The current patch doesn't apply any more. This makes the same change to the right location. --- ports/gtest/0002-Fix-z7-override.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch index c8de56d09..cf875084c 100644 --- a/ports/gtest/0002-Fix-z7-override.patch +++ b/ports/gtest/0002-Fix-z7-override.patch @@ -1,13 +1,13 @@ diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 777b91e..75a13c9 100644 +index 99725b7..3c25b0a 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake -@@ -55,7 +55,7 @@ macro(config_compiler_and_linker) +@@ -66,7 +66,7 @@ macro(config_compiler_and_linker) if (MSVC) # Newlines inside flags variables break CMake's NMake generator. # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. - set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi") + set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J") - if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005 - # Suppress spurious warnings MSVC 7.1 sometimes issues. - # Forcing value to bool. + set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") + set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") + set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") -- cgit v1.2.3 From 0a5c27a82324a33e7c37ddcf93b7b9d9513d5f03 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 28 Feb 2019 12:18:16 -0800 Subject: Revert "Update 0002-Fix-z7-override.patch (#5490)" (#5493) This reverts commit 2cb2e4d718be303e502b04b759b2108c47aaca31. --- ports/gtest/0002-Fix-z7-override.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch index cf875084c..c8de56d09 100644 --- a/ports/gtest/0002-Fix-z7-override.patch +++ b/ports/gtest/0002-Fix-z7-override.patch @@ -1,13 +1,13 @@ diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 99725b7..3c25b0a 100644 +index 777b91e..75a13c9 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake -@@ -66,7 +66,7 @@ macro(config_compiler_and_linker) +@@ -55,7 +55,7 @@ macro(config_compiler_and_linker) if (MSVC) # Newlines inside flags variables break CMake's NMake generator. # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. - set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi") + set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J") - set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") - set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") - set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") + if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005 + # Suppress spurious warnings MSVC 7.1 sometimes issues. + # Forcing value to bool. -- cgit v1.2.3 From a3a42ede13306284b0432b3cf2564638b02183f5 Mon Sep 17 00:00:00 2001 From: Andrei Lebedev Date: Thu, 28 Feb 2019 23:41:02 +0300 Subject: [soci] Add postgresql feature (#5029) Signed-off-by: Andrei Lebedev --- ports/soci/CONTROL | 18 ++++++++++++++++-- ports/soci/find-libpqd.patch | 30 ++++++++++++++++++++++++++++++ ports/soci/portfile.cmake | 23 ++++++++++++++++++----- 3 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 ports/soci/find-libpqd.patch diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL index 41b3d4190..3cb5c230d 100644 --- a/ports/soci/CONTROL +++ b/ports/soci/CONTROL @@ -1,4 +1,18 @@ Source: soci -Version: 3.2.3-1 -Build-Depends: sqlite3 +Version: 3.2.3-2 Description: SOCI database access library + +Feature: boost +Build-Depends: boost-date-time, boost-fusion, boost-optional, boost-preprocessor, boost-tuple +Description: Integration with Boost + +Feature: sqlite3 +Build-Depends: sqlite3 +Description: Build sqlite3 backend + +Feature: postgresql +Build-Depends: libpq +Description: Build postgresql backend + +Feature: odbc +Description: Build odbc backend diff --git a/ports/soci/find-libpqd.patch b/ports/soci/find-libpqd.patch new file mode 100644 index 000000000..950f74f25 --- /dev/null +++ b/ports/soci/find-libpqd.patch @@ -0,0 +1,30 @@ +diff --git a/src/cmake/modules/FindPostgreSQL.cmake b/src/cmake/modules/FindPostgreSQL.cmake +index 8178418..6e15d5b 100644 +--- a/src/cmake/modules/FindPostgreSQL.cmake ++++ b/src/cmake/modules/FindPostgreSQL.cmake +@@ -65,6 +65,25 @@ find_library(POSTGRESQL_LIBRARIES NAMES pq libpq + $ENV{ProgramFiles}/PostgreSQL/*/lib/ms + $ENV{SystemDrive}/PostgreSQL/*/lib/ms) + ++find_library(POSTGRESQL_LIBRARIES_DEBUG NAMES pqd libpqd ++ PATHS ++ ${PG_CONFIG_LIBDIR} ++ /usr/lib ++ /usr/local/lib ++ /usr/lib/postgresql ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/lib64/postgresql ++ $ENV{ProgramFiles}/PostgreSQL/*/lib ++ $ENV{SystemDrive}/PostgreSQL/*/lib ++ $ENV{ProgramFiles}/PostgreSQL/*/lib/ms ++ $ENV{SystemDrive}/PostgreSQL/*/lib/ms) ++ ++if(WIN32 AND POSTGRESQL_LIBRARIES AND POSTGRESQL_LIBRARIES_DEBUG) ++ set(POSTGRESQL_LIBRARIES optimized ${POSTGRESQL_LIBRARIES} ++ debug ${POSTGRESQL_LIBRARIES_DEBUG}) ++endif() ++ + if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + set(POSTGRESQL_FOUND TRUE) + else() diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index b26355293..6a4746414 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -6,11 +6,28 @@ vcpkg_from_github( SHA512 8c597b37efe82c85e6d951f66cb0f818d2c12cb673914bc7b322bc0a9da676e6c02f221c9104fb06d1b4b02fed4e5a4fb872dd3370b9117f248c3b948faf4fb3 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-define-snprintf.patch" + "${CMAKE_CURRENT_LIST_DIR}/find-libpqd.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOCI_STATIC) +# Handle features +set(_COMPONENT_FLAGS "") +foreach(_feature IN LISTS ALL_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Turn "-DWITH_*=" ON or OFF depending on whether the feature + # is in the list. + if(_feature IN_LIST FEATURES) + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") + else() + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") + endif() +endforeach() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/src PREFER_NINJA @@ -21,14 +38,10 @@ vcpkg_configure_cmake( -DLIBDIR:STRING=lib -DSOCI_STATIC=${SOCI_STATIC} -DSOCI_SHARED=${SOCI_DYNAMIC} + ${_COMPONENT_FLAGS} - -DWITH_SQLITE3=ON - - -DWITH_BOOST=OFF -DWITH_MYSQL=OFF - -DWITH_ODBC=OFF -DWITH_ORACLE=OFF - -DWITH_POSTGRESQL=OFF -DWITH_FIREBIRD=OFF -DWITH_DB2=OFF ) -- cgit v1.2.3 From d236aa6f0a919b146bafd429865c9f77002f221f Mon Sep 17 00:00:00 2001 From: Peter Bright Date: Thu, 28 Feb 2019 16:36:41 -0500 Subject: Fix debug format patch for gtest. (#5494) * Update 0002-Fix-z7-override.patch The current patch doesn't apply any more. This makes the same change to the right location. * Update CONTROL --- ports/gtest/0002-Fix-z7-override.patch | 10 +++++----- ports/gtest/CONTROL | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch index c8de56d09..cf875084c 100644 --- a/ports/gtest/0002-Fix-z7-override.patch +++ b/ports/gtest/0002-Fix-z7-override.patch @@ -1,13 +1,13 @@ diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 777b91e..75a13c9 100644 +index 99725b7..3c25b0a 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake -@@ -55,7 +55,7 @@ macro(config_compiler_and_linker) +@@ -66,7 +66,7 @@ macro(config_compiler_and_linker) if (MSVC) # Newlines inside flags variables break CMake's NMake generator. # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. - set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi") + set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J") - if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005 - # Suppress spurious warnings MSVC 7.1 sometimes issues. - # Forcing value to bool. + set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") + set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") + set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index 97e7f3f8c..2f93cea3e 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,3 +1,3 @@ Source: gtest -Version: 2019-01-04 +Version: 2019-01-04-1 Description: GoogleTest and GoogleMock testing frameworks. -- cgit v1.2.3 From 7859944528be28bee1fda9f325b78d6a7f02124e Mon Sep 17 00:00:00 2001 From: SvenPStarFinanz Date: Thu, 28 Feb 2019 22:52:51 +0100 Subject: =?UTF-8?q?Overwriting=20dlls=20in=20the=20destination=20output=20?= =?UTF-8?q?directory=20when=20the=20source=20=E2=80=A6=20(#4796)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Overwriting dlls in the destination output directory when the source is newer. * [vcpkg] cleanup whitespace --- scripts/buildsystems/msbuild/applocal.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 42bad4bcd..cf363f12e 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -15,7 +15,14 @@ if ($copiedFilesLog) # Note: this function signature is depended upon by the qtdeploy.ps1 script introduced in 5.7.1-7 function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$targetBinaryName) { if (Test-Path "$targetBinaryDir\$targetBinaryName") { - Write-Verbose " ${targetBinaryName}: already present" + $sourceModTime = (Get-Item $SourceDir\$targetBinaryName).LastWriteTime + $destModTime = (Get-Item $targetBinaryDir\$targetBinaryName).LastWriteTime + if ($destModTime -lt $sourceModTime) { + Write-Verbose " ${targetBinaryName}: Updating $SourceDir\$targetBinaryName" + Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir + } else { + Write-Verbose " ${targetBinaryName}: already present" + } } else { Write-Verbose " ${targetBinaryName}: Copying $SourceDir\$targetBinaryName" -- cgit v1.2.3