From d00223cbb9f984d5e633c756d898c19e21bbc6cc Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 12 Apr 2019 08:43:00 -0700 Subject: [PATCH] [cryptopp] Update the version to 8.1.0(Fix #3260) (#6010) * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows-static --recurse * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows --recurse * fix static build of ffmpeg-executables build ffplay.exe etc. failed because we tried to link ".a"-libraries * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows-static --recurse * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows --recurse * fix static build of ffmpeg-executables build ffplay.exe etc. failed because we tried to link ".a"-libraries * Remove duplicate feature entries * [clapack] Fix linux build * [openblas] Remove restriction of build static lib on Linux * Update ports/openblas/portfile.cmake Co-Authored-By: kafeg * [ffmpeg] bump control version number * [ffmpeg] switch to vcpkg_extract_source_archive_ex * add parallel-hashmap package * update version of package * Check scripts/cmake/* and buildsystems/vcpkg.cmake for changes when hashing * [cryptopp] Update the version to 8.1.0(Fix #3260) * [darknet] add compatibility with OpenCV 4 (#6018) * [curl] Bump CONTROL version (#6012) * [sdl1]Fix sdl1 conflict with sdl2 (#6011) * Use Opus CMake #4875 (#6007) * Print what port installed confliciting files * Revert "Print what port installed confliciting files" This reverts commit 79682317c9e087dc1d1ae450e3edd03b0fa0cc59. * Complete revert of accidental merge b1b7ec5c0be3a3b0 * [activemq-cpp] Add activemq-cpp library (#6017) * [fix][ffmpeg] changing $PATH separator for Linux (#6015) * [fix][ffmpeg] changing $PATH separator for Linux Using a semicolon in $PATH might break on some flavors of Linux, eg Docker based on Ubuntu 18.04. * Enable openssl:arm64-windows * Add missing dependency for static Qt builds * Enable pcre:arm64-windows Update sljitConfigInternal.h for ARM64, resolve error C2375: 'FlushInstructionCache': redefinition; different linkage * Enable pcre:arm64-windows Update format * Enable pcre2:arm64-windows Update sljitConfigInternal.h for ARM64 * partial update for testing * add git hash * Revert "add git hash" This reverts commit 1a3b388a911f844e6907cc9058728e2a3bdda419. * Revert "partial update for testing" This reverts commit 880181892e83b89657207777b1f2ce40fe3d31cb. * [openssl-windows] Bump version number * [pcre2] Bump version number * [openvdb] Fix openvdb[tools] build failures (#6028) * Update CONTROL Bump the version in CONTROL file * Update CONTROL Bump the version in CONTROL file * Update CONTROL Revert version number since @grdowns already bumps version number * Add --no-recurse switch to depend-info command. * Add -allowAppleClang option to bootstrap.sh. (fixes #4698) (#5915) * Add -allowAppleClang option to bootstrap.sh. (fixes #4698) * [vcpkg-bootstrap] Simplify appleclang changes and reformat * [vcpkg-bootstrap] Remove enviroment variable VCPKG_ALLOW_APPLE_CLANG * [distorm, scylla_wrapper, devicenameresolver] init (#4170) * distorm init * scylla wrapper init * devicenameresolver init * [devicenameresolver][distorm][scylla-wrapper] Cleanup and mark libraries as dll-only. * Bumb version number for qt5-base port * [devil/libcopp/spaceland] stable cmake config (#6046) * [darknet] sync with community expected version, add fixes for downstream projects (#6047) * Print what port installed confliciting files (#6037) * [PEGTL] Upgrade to 2.8.0 Migration guide: https://github.com/taocpp/PEGTL/blob/master/doc/Migration-Guide.md#version-280 * [docs] Add VCPKG_CMAKE_SYSTEM_VERSION (#6061) * Add help entry for depend-info * [jsoncons] add port * Bump version numbers, fix system name check * [libpqxx]Update to version 6.4.3 * Add missing compiler flags --- ports/cryptopp/CONTROL | 2 +- ports/cryptopp/missing-flags.patch | 20 ++++++++++++++++++++ ports/cryptopp/portfile.cmake | 5 +++-- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 ports/cryptopp/missing-flags.patch diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL index 7723d0fbf..e3a5d79de 100644 --- a/ports/cryptopp/CONTROL +++ b/ports/cryptopp/CONTROL @@ -1,3 +1,3 @@ Source: cryptopp -Version: 8.0.0 +Version: 8.1.0 Description: Crypto++ is a free C++ class library of cryptographic schemes. diff --git a/ports/cryptopp/missing-flags.patch b/ports/cryptopp/missing-flags.patch new file mode 100644 index 000000000..349219233 --- /dev/null +++ b/ports/cryptopp/missing-flags.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b49fff6..f753e75 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -639,6 +639,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU + set_source_files_properties(${SRC_DIR}/simeck_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3") + set_source_files_properties(${SRC_DIR}/simon128_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3") + set_source_files_properties(${SRC_DIR}/speck128_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3") ++ set_source_files_properties(${SRC_DIR}/keccak_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3") + if (CRYPTOPP_IA32_SSE41 AND NOT DISABLE_SSE4) + set_source_files_properties(${SRC_DIR}/blake2s_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1") + set_source_files_properties(${SRC_DIR}/blake2b_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1") +@@ -648,6 +649,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU + if (CRYPTOPP_IA32_SSE42 AND NOT DISABLE_SSE4) + set_source_files_properties(${SRC_DIR}/crc_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2") + if (CRYPTOPP_IA32_CLMUL AND NOT DISABLE_AES) ++ set_source_files_properties(${SRC_DIR}/gf2n_simd.cpp PROPERTIES COMPILE_FLAGS "-mpclmul") + set_source_files_properties(${SRC_DIR}/gcm_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3 -mpclmul") + endif () + if (CRYPTOPP_IA32_AES AND NOT DISABLE_AES) diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 37e89a39d..b4f35e7e6 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -11,13 +11,14 @@ vcpkg_from_github( PATCHES cmake.patch simon-speck.patch + missing-flags.patch ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF CRYPTOPP_8_0_0 - SHA512 e3240882748f5306442a3feca5b0718c6ee20a44596f522c6c3ae35e0c81d56412b5b223b2bcf2eb74a8ce4c08a73b4c25f4d005417bdc68f9309708cc5c5ddb + REF CRYPTOPP_8_1_0 + SHA512 2b09b30c53a8f95a9c3204a48867174c70a1e97171854122f4d8454b25d5af9b94cab2c210dd9857c7db66df881849183e82b6155b80bfef6e69dac8efd2ea9a HEAD_REF master PATCHES patch.patch )