mirror of https://github.com/microsoft/vcpkg.git
Merge branch 'master' into add-rdkit
This commit is contained in:
commit
cfd5ad53dc
|
|
@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
|
|||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
|
||||
FILENAME "ACE-TAO-src-${VERSION}.tar.gz"
|
||||
SHA512 955fa4de8df23fb0b91c3d7b3d6a23c2e16b15d16305efda874688bfa1cd3c9f6f7997d2cc19585daab1781bba7daca397179453d652edfc06b513f6028518c6
|
||||
SHA512 b2fa92611742a5752e36e9a7af6c8e44b4c7aa9dd5aa145cb08cf60f9bb7c2b04c52017c1b5870bc01d293afa8c33f8cf7ad21698178900cf22283ff25f052c4
|
||||
)
|
||||
else()
|
||||
# Don't change to vcpkg_from_github! This points to a release and not an archive
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
|
||||
FILENAME "ACE-src-${VERSION}.tar.gz"
|
||||
SHA512 eb7ac914438136cf98a3952bdd1d43543729019812b13509a6d805465f9016ec866dc6f07aed0a489555d3ac54c1ebe931ffd74a0687e29086bc5b063ab25cbc
|
||||
SHA512 82d248887280848f1839a9808f7015afa0c354ff096bfaa411e14de4ef657a0193a3f4be85a67a72e0b5b461eaddc8605d9953bbcd75bbbc564beafe0935a530
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ace",
|
||||
"version": "8.0.6",
|
||||
"version": "8.0.7",
|
||||
"maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
|
||||
"description": "The ADAPTIVE Communication Environment",
|
||||
"homepage": "https://github.com/DOCGroup/ACE_TAO",
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
diff --git a/MPC/config/zlib.mpb b/MPC/config/zlib.mpb
|
||||
index 731935a..af8ee02 100644
|
||||
index 8edc952e..af8ee020 100644
|
||||
--- a/MPC/config/zlib.mpb
|
||||
+++ b/MPC/config/zlib.mpb
|
||||
@@ -14,9 +14,16 @@ feature(zlib) {
|
||||
macros += ZLIB
|
||||
|
||||
specific(prop:windows) {
|
||||
- Debug::lit_libs += zlibd
|
||||
- Release::lit_libs += zlib
|
||||
+ Debug::lit_libs += zd
|
||||
+ Release::lit_libs += z
|
||||
@@ -17,6 +17,13 @@ feature(zlib) {
|
||||
Debug::lit_libs += zd
|
||||
Release::lit_libs += z
|
||||
} else {
|
||||
- lit_libs += z
|
||||
+ Debug::lit_libs += zd
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ vcpkg_configure_meson(
|
|||
-Dsvg-support=false
|
||||
-Dgir=false
|
||||
ADDITIONAL_BINARIES
|
||||
gperf='${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${HOST_EXECUTABLE_SUFFIX}'
|
||||
gperf='${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}'
|
||||
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
|
||||
glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "appstream",
|
||||
"version": "1.0.6",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Tools and libraries to work with AppStream metadata",
|
||||
"homepage": "https://www.freedesktop.org/software/appstream/docs",
|
||||
"license": "LGPL-2.1-or-later",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ endif()
|
|||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://archive.apache.org/dist/avro/avro-${VERSION}/avro-src-${VERSION}.tar.gz"
|
||||
FILENAME "avro-src-${VERSION}.tar.gz"
|
||||
SHA512 0d86bfece0f12f8bc424e27e71e3e6b828c4280fa1a6d7dc7e0d58bff2351f2c1fd3ccb98c1291dfc6c67d9cb5a0bdb7bb9f36ba5bd6b26fa9545f358db42663
|
||||
SHA512 a31ad410d75c0e7f58fc9d9b7e7989dae12f328524806f6d64fdae22ddb9112fe2adc5fb74ee83df2135b87bd6618e8765a823220b2a0a162d1684192b9926da
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
|
|
@ -43,4 +43,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_WINDOWS)
|
|||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lang/c/LICENSE")
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/lang/c/LICENSE"
|
||||
"${SOURCE_PATH}/lang/c/NOTICE"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{
|
||||
"name": "avro-c",
|
||||
"version": "1.12.1",
|
||||
"port-version": 1,
|
||||
"version": "1.12.2",
|
||||
"description": "Apache Avro is a data serialization system",
|
||||
"homepage": "https://github.com/apache/avro",
|
||||
"license": "Apache-2.0",
|
||||
"license": "Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"jansson",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
|
||||
index 6800d330f..c9ec221d9 100644
|
||||
index 6800d33..c9ec221 100644
|
||||
--- a/lang/c++/CMakeLists.txt
|
||||
+++ b/lang/c++/CMakeLists.txt
|
||||
@@ -70,12 +70,12 @@ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
|
||||
|
|
@ -18,3 +18,24 @@ index 6800d330f..c9ec221d9 100644
|
|||
endif ()
|
||||
|
||||
if (AVRO_BUILD_TESTS OR AVRO_USE_BOOST)
|
||||
diff --git a/lang/c++/cmake/avro-cpp-config.cmake.in b/lang/c++/cmake/avro-cpp-config.cmake.in
|
||||
index c943f33..7e7f150 100644
|
||||
--- a/lang/c++/cmake/avro-cpp-config.cmake.in
|
||||
+++ b/lang/c++/cmake/avro-cpp-config.cmake.in
|
||||
@@ -58,7 +58,14 @@ endif()
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/avro-cpp-targets.cmake")
|
||||
|
||||
-add_library(avro-cpp::avrocpp_static ALIAS avro-cpp::avrocpp_s)
|
||||
-add_library(avro-cpp::avrocpp_shared ALIAS avro-cpp::avrocpp)
|
||||
+if(TARGET avro-cpp::avrocpp)
|
||||
+ add_library(avro-cpp::avrocpp_shared ALIAS avro-cpp::avrocpp)
|
||||
+endif()
|
||||
+if(TARGET avro-cpp::avrocpp_s)
|
||||
+ add_library(avro-cpp::avrocpp_static ALIAS avro-cpp::avrocpp_s)
|
||||
+ if(NOT TARGET avro-cpp::avrocpp)
|
||||
+ add_library(avro-cpp::avrocpp ALIAS avro-cpp::avrocpp_s)
|
||||
+ endif()
|
||||
+endif()
|
||||
|
||||
check_required_components(avro-cpp)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://archive.apache.org/dist/avro/avro-${VERSION}/avro-src-${VERSION}.tar.gz"
|
||||
FILENAME "avro-src-${VERSION}.tar.gz"
|
||||
SHA512 0d86bfece0f12f8bc424e27e71e3e6b828c4280fa1a6d7dc7e0d58bff2351f2c1fd3ccb98c1291dfc6c67d9cb5a0bdb7bb9f36ba5bd6b26fa9545f358db42663
|
||||
SHA512 a31ad410d75c0e7f58fc9d9b7e7989dae12f328524806f6d64fdae22ddb9112fe2adc5fb74ee83df2135b87bd6618e8765a823220b2a0a162d1684192b9926da
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
|
|
@ -16,6 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
tools AVRO_BUILD_EXECUTABLES
|
||||
INVERTED_FEATURES
|
||||
snappy CMAKE_DISABLE_FIND_PACKAGE_Snappy
|
||||
zstd CMAKE_DISABLE_FIND_PACKAGE_zstd
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||
|
|
@ -39,5 +40,9 @@ endif()
|
|||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lang/c++/LICENSE")
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/lang/c++/LICENSE"
|
||||
"${SOURCE_PATH}/lang/c++/NOTICE"
|
||||
)
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "avro-cpp",
|
||||
"version": "1.12.1",
|
||||
"port-version": 1,
|
||||
"version": "1.12.2",
|
||||
"description": "Apache Avro is a data serialization system",
|
||||
"homepage": "https://github.com/apache/avro",
|
||||
"license": "Apache-2.0",
|
||||
|
|
@ -27,6 +26,12 @@
|
|||
},
|
||||
"tools": {
|
||||
"description": "Build extra executables"
|
||||
},
|
||||
"zstd": {
|
||||
"description": "Support zstd for compression",
|
||||
"dependencies": [
|
||||
"zstd"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-auth
|
||||
REF "v${VERSION}"
|
||||
SHA512 72893b7edb0c91ac7bce7bec42e7149d1f8274f27287b26207f4a91aefaac3da6c325a14ee3267755f8e2b096604a8570374d5d0707f85cf1840c435043e874b
|
||||
SHA512 6ff5e408a3c9d88eb4f0b6b711eb98acdba94f8677f15297e44636de1a2a3d352aaa8cd264693cf1d757a3b58d6bf05e5182cb7b80956c8531c53be34d9f8f73
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-auth",
|
||||
"version": "0.10.5",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.",
|
||||
"homepage": "https://github.com/awslabs/aws-c-auth",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-cal
|
||||
REF "v${VERSION}"
|
||||
SHA512 85083c06760d39525ebe0e88ed0719de62e4f2dc94c91361da12733a6112c0c9a4be6e7c6cbb8c65be00fd431b49e476fc47c7ec5213ebbbde14a88e862c90b7
|
||||
SHA512 dfe28df7ff859e73006214f2dcf96bd99cdddfcca3b185f887df82e3493f8beaaf19eda2bf16f7cf7b139bc0f776be426d802c960a7067ed3a315f535909ef2f
|
||||
HEAD_REF master
|
||||
PATCHES remove-libcrypto-messages.patch
|
||||
)
|
||||
|
||||
if (NOT (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX))
|
||||
|
|
@ -14,7 +13,7 @@ endif()
|
|||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
-DUSE_OPENSSL=${USE_OPENSSL}
|
||||
)
|
||||
|
|
@ -35,4 +34,8 @@ file(REMOVE_RECURSE
|
|||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/LICENSE"
|
||||
"${SOURCE_PATH}/NOTICE"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/cmake/modules/Findcrypto.cmake b/cmake/modules/Findcrypto.cmake
|
||||
index fed83bb..9c1ae28 100644
|
||||
--- a/cmake/modules/Findcrypto.cmake
|
||||
+++ b/cmake/modules/Findcrypto.cmake
|
||||
@@ -105,9 +105,6 @@ else()
|
||||
set(CRYPTO_FOUND true)
|
||||
set(crypto_FOUND true)
|
||||
|
||||
- message(STATUS "LibCrypto Include Dir: ${crypto_INCLUDE_DIR}")
|
||||
- message(STATUS "LibCrypto Shared Lib: ${crypto_SHARED_LIBRARY}")
|
||||
- message(STATUS "LibCrypto Static Lib: ${crypto_STATIC_LIBRARY}")
|
||||
if (NOT TARGET AWS::crypto AND
|
||||
(EXISTS "${crypto_LIBRARY}")
|
||||
)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-cal",
|
||||
"version": "0.9.15",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 wrapper for cryptography primitives.",
|
||||
"homepage": "https://github.com/awslabs/aws-c-cal",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-compression
|
||||
REF "v${VERSION}"
|
||||
SHA512 78e9aab97a95245e5d84b3fb7e3a7dcc392c1f8eb310892306f72a13382cf847c2a85304c52a5f4e19a63523a31020577dec8bea41e0e211712668fbfa77a38e
|
||||
SHA512 631773691b321f112df5413dc2366fb4e8c422b35912cc20b73a1a3857722fdbcf6b6ab59edd63b1244a3f8db08d0bbee2003ca1cd6d5576833c4145fbd40904
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-compression",
|
||||
"version": "0.3.3",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 implementation of huffman encoding/decoding",
|
||||
"homepage": "https://github.com/awslabs/aws-c-compression",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-event-stream
|
||||
REF "v${VERSION}"
|
||||
SHA512 38a8ac44e4cd6325e1ff75ccc57dd6aa792ce3ad81ba767a4dcd105723a59fa0fb4a109e67c0ae8511f2fdfafd337d7b00ebf48e70717e2a5c5a427c38532a45
|
||||
SHA512 994b6b5a7f5a154355d62d0c4b178e271e491c468971773421b2eb9845f70caba203671fce99a74526206e9ef83eefcc0ee735754abbcf1ea030679d282b3b3e
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-event-stream",
|
||||
"version": "0.7.2",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 implementation of the vnd.amazon.event-stream content-type.",
|
||||
"homepage": "https://github.com/awslabs/aws-c-event-stream",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-http
|
||||
REF "v${VERSION}"
|
||||
SHA512 311b778df5a2d5dea7c8933d8fa1cdd2c4f8b11ec5f022c14d2487ba1fe039b19ef3f77d8aaaf159721912ac6b434532535a9ad6dd30ab6183d74b8c38fde0ad
|
||||
SHA512 6236e6713f44d87446f4a521d5044d9c46b06bc5738bbf38c112aeff9a222427a52c8acb57eabff55c229de41dce8380b6cc04a8970a78cc378a63240e31ecc3
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-http",
|
||||
"version": "0.11.1",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications",
|
||||
"homepage": "https://github.com/awslabs/aws-c-http",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-io
|
||||
REF "v${VERSION}"
|
||||
SHA512 e812fd7168c0b71cc98a7f835dd3dd48174d0c14e5d92ed10b5ecf558fc29bed2b4adf32f55408ee3ed7f54dfaa50d9f12334f5c89b0d76cedb800fb08daf483
|
||||
SHA512 f0a16581dcb3f11d1c8b883f9eeffd2cfc029868683488da0193dce7dd619b5d17843baeaa944da122a0281ae0e58d78b5e50a2bcc10773d0059e3c50bd80500
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-io",
|
||||
"version": "0.27.7",
|
||||
"version": "1.0.0",
|
||||
"description": "Handles all IO and TLS work for application protocols.",
|
||||
"homepage": "https://github.com/awslabs/aws-c-io",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-mqtt
|
||||
REF "v${VERSION}"
|
||||
SHA512 6abe7c2aa2861334930ae2c604f66e9ca2c8a155b7b196469bb8b545cbabe0ee6f6895f13b170953a2016b484d6331b82542e96c784531bd9952c7ea1a068d4b
|
||||
SHA512 ad0d30e758455fa0b9a2b981cabb206279d45654a8c874319b65bc38b1d1087e7698d01892cae29a4438fe481c2ac81c2ff07e8760fd4fe6cb95ddc90f3621e6
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-mqtt",
|
||||
"version": "0.16.2",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 implementation of the MQTT 3.1.1 specification.",
|
||||
"homepage": "https://github.com/awslabs/aws-c-mqtt",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-s3
|
||||
REF "v${VERSION}"
|
||||
SHA512 0a28013378acab14e7dee20fe491492924525ab158fb9b0b5fafbee642493aef0d07253bac61be749c5efe8c902c44bb28ce0c3cda83417baf0f504723b9c6b5
|
||||
SHA512 9e4aa743f3ecb6fbc5e2375d9b95346ee4b9eef286d002ec762e27d63dc0cdee1316a3ca85bc80100431808d823ff289c7d757c0b7d6a6746bbad68d0ceb4f5b
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
${FEATURE_OPTIONS}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-s3",
|
||||
"version": "0.13.7",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
|
||||
"homepage": "https://github.com/awslabs/aws-c-s3",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-c-sdkutils
|
||||
REF "v${VERSION}"
|
||||
SHA512 d5ba088f6c9e25d59e397dbc534548ab2a270aaa451b949cf3a35d4bbd79aca3248171ab7446f869e7c660d0dbc1335f2a42dc801a340982a03b6b40a70e63d0
|
||||
SHA512 782f9002223ad2b31a86d3577eb9afbb0f3459cc13cc798d0e067bb258cfe029313b88df6206e6af8578eca8513312b14758d3d931b5dde9b5e94aaa86a18669
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aws-c-sdkutils",
|
||||
"version": "0.2.10",
|
||||
"version": "1.0.0",
|
||||
"description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...",
|
||||
"homepage": "https://github.com/awslabs/aws-c-sdkutils",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO awslabs/aws-checksums
|
||||
REF "v${VERSION}"
|
||||
SHA512 217e0f9d0a12f1640056c08e0e03b91802623fc4762c573cd2679d6cb32192d619d19a4c750ccd5b2127583d09b640f78a5bb314dd1c641a83d61e1b9cfbb550
|
||||
SHA512 c77c62aaad6932ca5fe8baf3c01562f3144198d1133ebc8d1c9e124d7b6a0bc69800362a6913967c87cea734e8ceb4b756f29349036477b19b7e50f6ef387376
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
fix-cmake-config.patch
|
||||
|
|
@ -18,7 +18,7 @@ vcpkg_cmake_configure(
|
|||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DSTATIC_CRT=${STATIC_CRT_LNK}
|
||||
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common/modules" # use extra cmake files
|
||||
-DBUILD_TESTING=FALSE
|
||||
)
|
||||
|
||||
|
|
@ -38,4 +38,8 @@ file(REMOVE_RECURSE
|
|||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/LICENSE"
|
||||
"${SOURCE_PATH}/source/external/xxhash.h"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "aws-checksums",
|
||||
"version": "0.2.11",
|
||||
"version": "1.0.0",
|
||||
"description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
|
||||
"homepage": "https://github.com/awslabs/aws-checksums",
|
||||
"license": "Apache-2.0",
|
||||
"license": "Apache-2.0 AND BSD-2-Clause",
|
||||
"dependencies": [
|
||||
"aws-c-common",
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9e5d902..185039c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required (VERSION 3.5)
|
||||
|
||||
-project(CRCpp VERSION 1.2.1.0)
|
||||
+project(CRCpp VERSION 1.2.2.0)
|
||||
|
||||
include(CMakePackageConfigHelpers)
|
||||
include(GNUInstallDirs)
|
||||
@@ -32,14 +32,15 @@ configure_file(
|
||||
configure_package_config_file(
|
||||
cmake/CRCppConfig.cmake.in
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/CRCppConfig.cmake"
|
||||
- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/crcpp")
|
||||
+ INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/crcpp"
|
||||
+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
|
||||
write_basic_package_version_file(CRCppConfigVersion.cmake
|
||||
VERSION ${PACKAGE_VERSION}
|
||||
COMPATIBILITY SameMajorVersion
|
||||
ARCH_INDEPENDENT)
|
||||
|
||||
# Installation
|
||||
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDE_DIR})
|
||||
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/CRCpp.pc
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
|
||||
diff --git a/cmake/CRCppConfig.cmake.in b/cmake/CRCppConfig.cmake.in
|
||||
index 67139f3..b06cc79 100644
|
||||
--- a/cmake/CRCppConfig.cmake.in
|
||||
+++ b/cmake/CRCppConfig.cmake.in
|
||||
@@ -1,3 +1,3 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
-set_and_check(CRCpp_INCLUDE_DIR "@PACKAGE_CRCpp_INCLUDE_INSTALL_DIR@")
|
||||
+set_and_check(CRCpp_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
|
||||
|
|
@ -4,21 +4,19 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO d-bahr/CRCpp
|
||||
REF "release-${VERSION}"
|
||||
SHA512 0e1338eb1f0f2a05d119ffae6071be06c24c39f20dcc846ea2c6248367ce600797af23b1f31dcd0f9e389efadc769bcc7129d8b741c30782571500c731c75451
|
||||
SHA512 0b338288b5ca3f92d334d9288f4589e1e9ec91613df7d21f52fbc739ce7d74df4558bcd4a7817151c65a9d0d3075f99aead5b26798496bc0f8971f3a4ccfe0e7
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
install_fixes.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_TEST=OFF
|
||||
-DBUILD_DOC=OFF
|
||||
-DBUILD_TESTING=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/crcpp)
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "crcpp",
|
||||
"version": "1.2.2.0",
|
||||
"version": "1.2.3.0",
|
||||
"description": "Easy to use and fast C++ CRC library.",
|
||||
"homepage": "https://github.com/d-bahr/CRCpp",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO enGits/enGitsDataLib
|
||||
REF v1.0.0
|
||||
SHA512 7dc9c240b45bb3a768ea910c1a29c5aa885debd636b2aff49211ee1f4cef6ce2bc4803775e8afe5fc16c4ae8276cbcd3a0a56325da1930a395db57b1fa37dccf
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
use-system-doctest.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EDL_BUILD_STATIC)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
"-DCREATE_STATIC_LIBRARY=${EDL_BUILD_STATIC}"
|
||||
-DBUILD_TESTING=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(
|
||||
PACKAGE_NAME enGitsDataLib
|
||||
CONFIG_PATH lib/cmake/enGitsDataLib
|
||||
)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
)
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e825e7b..86244d2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -17,6 +17,8 @@ include(CMakePackageConfigHelpers)
|
||||
include(CTest)
|
||||
include(TestBigEndian)
|
||||
|
||||
+find_package(doctest CONFIG REQUIRED)
|
||||
+
|
||||
# export build setup for development environment
|
||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
|
||||
@@ -66,7 +68,6 @@ edl/amr.h
|
||||
edl/bmap.h
|
||||
edl/containertricks.h
|
||||
edl/csvreader.h
|
||||
-edl/doctest.h
|
||||
edl/edlerror.h
|
||||
edl/edl.h
|
||||
edl/fastremovelist.h
|
||||
@@ -137,6 +138,7 @@ else(CREATE_STATIC_LIBRARY)
|
||||
endif(CREATE_STATIC_LIBRARY)
|
||||
|
||||
target_compile_features(engitsdatalib PUBLIC cxx_std_17)
|
||||
+target_link_libraries(engitsdatalib PUBLIC doctest::doctest)
|
||||
|
||||
target_compile_definitions(engitsdatalib
|
||||
PUBLIC
|
||||
diff --git a/cmake/enGitsDataLibConfig.cmake.in b/cmake/enGitsDataLibConfig.cmake.in
|
||||
index dbb9be4..ee92d55 100644
|
||||
--- a/cmake/enGitsDataLibConfig.cmake.in
|
||||
+++ b/cmake/enGitsDataLibConfig.cmake.in
|
||||
@@ -1,5 +1,8 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
+include(CMakeFindDependencyMacro)
|
||||
+find_dependency(doctest CONFIG)
|
||||
+
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/enGitsDataLibTargets.cmake")
|
||||
|
||||
if(TARGET enGitsDataLib::engitsdatalib)
|
||||
diff --git a/edl/edl.cpp b/edl/edl.cpp
|
||||
index d76d74c..22d530e 100644
|
||||
--- a/edl/edl.cpp
|
||||
+++ b/edl/edl.cpp
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "edl/edl.h"
|
||||
#define DOCTEST_CONFIG_IMPLEMENT
|
||||
-#include "edl/doctest.h"
|
||||
+#include <doctest/doctest.h>
|
||||
|
||||
namespace EDL_NAMESPACE
|
||||
{
|
||||
diff --git a/edl/edl.h b/edl/edl.h
|
||||
index 0dd2389..6618128 100644
|
||||
--- a/edl/edl.h
|
||||
+++ b/edl/edl.h
|
||||
@@ -32,7 +32,7 @@ template <class T, unsigned int DIM> class StaticVector;
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
-#include "edl/doctest.h"
|
||||
+#include <doctest/doctest.h>
|
||||
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
#include "engitsdatalib_export.h"
|
||||
diff --git a/edl/tools.h b/edl/tools.h
|
||||
index 7aa4f3e..8c6881e 100644
|
||||
--- a/edl/tools.h
|
||||
+++ b/edl/tools.h
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
|
||||
-#include "doctest.h"
|
||||
+#include <doctest/doctest.h>
|
||||
|
||||
namespace EDL_NAMESPACE
|
||||
{
|
||||
diff --git a/tests/doctest_test.cpp b/tests/doctest_test.cpp
|
||||
index 9b68586..769609d 100644
|
||||
--- a/tests/doctest_test.cpp
|
||||
+++ b/tests/doctest_test.cpp
|
||||
@@ -8,7 +8,7 @@
|
||||
// + +
|
||||
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
-#include "edl/doctest.h"
|
||||
+#include <doctest/doctest.h>
|
||||
|
||||
#define EDL_DOCTEST
|
||||
|
||||
diff --git a/tests/geometrytools_test.cpp b/tests/geometrytools_test.cpp
|
||||
index 6ad116c..ec37db0 100644
|
||||
--- a/tests/geometrytools_test.cpp
|
||||
+++ b/tests/geometrytools_test.cpp
|
||||
@@ -9,7 +9,7 @@
|
||||
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
|
||||
-#include "edl/doctest.h"
|
||||
+#include <doctest/doctest.h>
|
||||
|
||||
#include "edl/geometrytools.h"
|
||||
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"name": "engitsdatalib",
|
||||
"version": "1.0.0",
|
||||
"description": "C++ data structures, geometry, interpolation, and numerical utilities from enGits",
|
||||
"homepage": "https://github.com/enGits/enGitsDataLib",
|
||||
"license": "MIT",
|
||||
"dependencies": [
|
||||
"doctest",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
diff --git a/cmake/Findaom.cmake b/cmake/Findaom.cmake
|
||||
index 89a1b5d..4656f65 100644
|
||||
--- a/cmake/Findaom.cmake
|
||||
+++ b/cmake/Findaom.cmake
|
||||
@@ -38,10 +38,11 @@ else()
|
||||
if(NOT AOM_FIND_QUIETLY)
|
||||
message(STATUS "Found AOM: ${AOM_LIBRARIES}")
|
||||
endif(NOT AOM_FIND_QUIETLY)
|
||||
- add_library(aom INTERFACE IMPORTED GLOBAL)
|
||||
+ add_library(AOM::aom UNKNOWN IMPORTED GLOBAL)
|
||||
set_target_properties(
|
||||
- aom PROPERTIES IMPORTED_LOCATION "${AOM_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${AOM_INCLUDE_DIR}"
|
||||
+ AOM::aom PROPERTIES IMPORTED_LOCATION "${AOM_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${AOM_INCLUDE_DIR}"
|
||||
)
|
||||
+ add_library(aom ALIAS AOM::aom)
|
||||
else(AOM_FOUND)
|
||||
if(AOM_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "AOM was not found")
|
||||
diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in
|
||||
index e59bb1d..33e40aa 100644
|
||||
--- a/libfreerdp/FreeRDPConfig.cmake.in
|
||||
+++ b/libfreerdp/FreeRDPConfig.cmake.in
|
||||
@@ -1,6 +1,10 @@
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(WinPR @FREERDP_VERSION@)
|
||||
|
||||
+if("@WITH_AOM@" AND NOT "@BUILD_SHARED_LIBS@")
|
||||
+ find_dependency(AOM CONFIG)
|
||||
+endif()
|
||||
+
|
||||
if("@WITH_SMARTCARD_EMULATE@" AND NOT "@BUILD_SHARED_LIBS@")
|
||||
find_dependency(ZLIB)
|
||||
endif()
|
||||
|
|
@ -2,11 +2,12 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO FreeRDP/FreeRDP
|
||||
REF "${VERSION}"
|
||||
SHA512 5559616755c3050077589c1000ea451b195cfb450c74d2278c6a09e0c2bfff718293dbc0041428c0a8e8ca321131daa14c92483f70bb5bed4482bb7962f1ef92
|
||||
SHA512 6c331729259d4da657dbd4a475c894cde624fe92fb35821425f5d678f91868c492ab4b921581fbb7410c3c398a86b9af4516f323fb34c855af9743cd23cd654f
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
dependencies.patch
|
||||
ffmpeg.diff
|
||||
fix-aom-target.patch
|
||||
install-layout.patch
|
||||
windows-linkage.patch
|
||||
)
|
||||
|
|
@ -19,6 +20,7 @@ endif()
|
|||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
av1 WITH_AOM
|
||||
av1 WITH_GFX_AV1
|
||||
client WITH_CLIENT
|
||||
ffmpeg WITH_DSP_FFMPEG
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "freerdp",
|
||||
"version": "3.30.0",
|
||||
"version": "3.31.0",
|
||||
"description": "A free implementation of the Remote Desktop Protocol (RDP)",
|
||||
"homepage": "https://github.com/FreeRDP/FreeRDP",
|
||||
"license": "Apache-2.0 AND BSD-3-Clause",
|
||||
|
|
@ -24,7 +24,10 @@
|
|||
],
|
||||
"features": {
|
||||
"av1": {
|
||||
"description": "Enable AV1 support for GFX channel encoding/decoding"
|
||||
"description": "Enable AV1 support for GFX channel encoding/decoding",
|
||||
"dependencies": [
|
||||
"aom"
|
||||
]
|
||||
},
|
||||
"client": {
|
||||
"description": "Build client components"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index d7458e6..18fae46 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -122,7 +122,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_mtim, struct stat.st_mt
|
||||
AM_CONDITIONAL([COMPAT_OPT], [test "$want_compat" = yes])
|
||||
|
||||
# Check for Curses libs.
|
||||
-for lib in ncurses curses termcap
|
||||
+for lib in ncursesw ncurses curses termcap
|
||||
do
|
||||
AC_CHECK_LIB($lib, tputs, [CURSES_LIBS="-l$lib"; break])
|
||||
done
|
||||
|
|
@ -3,12 +3,14 @@ vcpkg_download_distfile(ARCHIVE
|
|||
"https://ftp.gnu.org/gnu/gdbm/gdbm-${VERSION}.tar.gz"
|
||||
"https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gdbm/gdbm-${VERSION}.tar.gz"
|
||||
FILENAME "gdbm-${VERSION}.tar.gz"
|
||||
SHA512 401ff8c707079f21da1ac1d6f4714a87f224b6f41943078487dc891be49f51fd1ac7a32fd599aae0fad185f2c6ba7432616d328fd6aaab068eb54db9562ff7fa
|
||||
SHA512 44aafe254f0950a8f5215d8f1337674f07b19f2a375f6eb19a7e39690028c80c3774b705c2b76b470ae74042b21f2ca77d02f6f57aa2ee50296db801220a3352
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
SOURCE_PATH
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
PATCHES
|
||||
fix-readline-linkage.patch
|
||||
)
|
||||
|
||||
vcpkg_list(SET options)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{
|
||||
"name": "gdbm",
|
||||
"version": "1.24",
|
||||
"port-version": 1,
|
||||
"version": "1.26",
|
||||
"description": "GDBM is a library of database functions that use extensible hashing and works similar to the standard UNIX dbm.",
|
||||
"homepage": "https://www.gnu.org.ua/software/gdbm/gdbm.html",
|
||||
"license": "GPL-3.0-only",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"supports": "linux",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "gettext",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-make",
|
||||
"host": true
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
diff --git a/hiredis.h b/hiredis.h
|
||||
--- a/hiredis.h
|
||||
+++ b/hiredis.h
|
||||
@@ -40,6 +40,7 @@
|
||||
#else
|
||||
struct timeval; /* forward declaration */
|
||||
typedef long long ssize_t;
|
||||
+#define _SSIZE_T_ /* for compatibility with libuv */
|
||||
#endif
|
||||
#include <stdint.h> /* uintXX_t, etc */
|
||||
#include "sds.h" /* for sds */
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/hiredis.h b/hiredis.h
|
||||
index 3211c20..9d655f8 100644
|
||||
--- a/hiredis.h
|
||||
+++ b/hiredis.h
|
||||
@@ -47,8 +47,8 @@ typedef intptr_t ssize_t;
|
||||
|
||||
#define HIREDIS_MAJOR 1
|
||||
#define HIREDIS_MINOR 4
|
||||
-#define HIREDIS_PATCH 0
|
||||
-#define HIREDIS_SONAME 1.4.0
|
||||
+#define HIREDIS_PATCH 1
|
||||
+#define HIREDIS_SONAME 1.4.1
|
||||
|
||||
/* Connection type can be blocking or non-blocking and is set in the
|
||||
* least significant bit of the flags field in redisContext. */
|
||||
|
|
@ -2,13 +2,13 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO redis/hiredis
|
||||
REF "v${VERSION}"
|
||||
SHA512 e6e9f7e617bf1d03bdf64a80e74ed24816b6c71607b976757a9962ae02a3b65be7006d84fd353dd5a63c8d0ef1ed385c3b73851b4a119c5ed48f3f86437cf250
|
||||
SHA512 2f7a826032bedb85473b06684e075d9e57105068c44f21b00217f94a7ebbefaa8700c7bf4675c382060a7b00aceb01c90023fdfbe4024a412e05432b852d6dc2
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-timeval.patch
|
||||
fix-ssize_t.patch
|
||||
support-static.patch
|
||||
fix-cmake-conf-install-dir.patch
|
||||
fix-version.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
|
@ -18,9 +18,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
-DDISABLE_TESTS=ON
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
OPTIONS
|
||||
-DDISABLE_TESTS=ON
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
${FEATURE_OPTIONS}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
@ -29,24 +30,43 @@ vcpkg_copy_pdbs()
|
|||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
vcpkg_replace_string(
|
||||
"${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hiredis.pc"
|
||||
" -lhiredis"
|
||||
" -lhiredisd"
|
||||
)
|
||||
if("ssl" IN_LIST FEATURES)
|
||||
vcpkg_replace_string(
|
||||
"${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hiredis_ssl.pc"
|
||||
" -lhiredis_ssl"
|
||||
" -lhiredis_ssld"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(APPEND
|
||||
"${CURRENT_PACKAGES_DIR}/lib/pkgconfig/hiredis.pc"
|
||||
"Libs.private: -lws2_32 -lcrypt32\n"
|
||||
)
|
||||
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
file(APPEND
|
||||
"${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hiredis.pc"
|
||||
"Libs.private: -lws2_32 -lcrypt32\n"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_config_fixup()
|
||||
if("ssl" IN_LIST FEATURES)
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME hiredis_ssl CONFIG_PATH share/hiredis_ssl)
|
||||
endif()
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/hiredis.h"
|
||||
[[typedef long long ssize_t;
|
||||
#define _SSIZE_T_ /* for compatibility with libuv */]]
|
||||
[[typedef intptr_t ssize_t;]]
|
||||
)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/sds.h"
|
||||
[[typedef long long ssize_t;
|
||||
#define SSIZE_MAX (LLONG_MAX >> 1)]]
|
||||
[[typedef intptr_t ssize_t;
|
||||
#define SSIZE_MAX INTPTR_MAX]]
|
||||
)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/COPYING"
|
||||
"${SOURCE_PATH}/ffc.h"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "hiredis",
|
||||
"version": "1.3.0",
|
||||
"version": "1.4.1",
|
||||
"description": "Hiredis is a minimalistic C client library for the Redis database.",
|
||||
"homepage": "https://github.com/redis/hiredis",
|
||||
"license": "BSD-3-Clause",
|
||||
"license": "BSD-3-Clause AND MIT",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
set(VCPKG_BUILD_TYPE release)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libfn/functional
|
||||
REF "v${VERSION}"
|
||||
SHA512 294f17fac30b6f2e13d636c2c53c3bd9535faead169c022abf19e91e88f4d6655ca99ce560d4f160252eabc2ef3090ffcd6006e0b5c2ee0d6c9ccd8e0a200077
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DLIBFN_TESTS=OFF
|
||||
-DDISABLE_CCACHE_DETECTION=ON
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libfn)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
libfn provides CMake targets:
|
||||
|
||||
find_package(libfn CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE libfn::pfn) # C++20 standard-library polyfills
|
||||
target_link_libraries(main PRIVATE libfn::fn) # the functional library (C++20)
|
||||
|
||||
# C++26 mode (std::type_order); use instead of libfn::fn, never both:
|
||||
target_link_libraries(main PRIVATE libfn::fn_cxx26)
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"name": "libfn",
|
||||
"version-semver": "0.1.0",
|
||||
"description": "Functional programming in C++",
|
||||
"homepage": "https://libfn.org",
|
||||
"license": "ISC",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO strukturag/libheif
|
||||
REF "v${VERSION}"
|
||||
SHA512 ebb0bf74d6d1ae2d39a7cefcec0f4a04006fee330e147c49c863f6d4febb45e82ccebf36cc4e30812bd3591918ee8964fbde9a3a4793c5f60eaf30a0e011add0
|
||||
SHA512 d34ccd40d7f7cc48ff8ceddafd8f7c7004ab0df2a657237fcc715c4bcc453a41946d7db542d32b781875868ee116c451b4b63daaf073530245ec7b117ae60e27
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
cxx-linkage-pkgconfig.diff
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "libheif",
|
||||
"version": "1.23.1",
|
||||
"version": "1.23.2",
|
||||
"description": "libheif is an HEIF and AVIF file format decoder and encoder.",
|
||||
"homepage": "http://www.libheif.org/",
|
||||
"license": "LGPL-3.0-only",
|
||||
|
|
|
|||
|
|
@ -1,20 +1,42 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9d830c6..214a82f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -24,6 +24,10 @@ set(CPACK_PACKAGE_VERSION_PATCH "3")
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g")
|
||||
|
||||
set(PKG_CONFIG_PRIVATELIBS "")
|
||||
+set(PKG_CONFIG_LIBNAME mysofa)
|
||||
+if(WIN32 AND BUILD_SHARED_LIBS)
|
||||
+ set(PKG_CONFIG_LIBNAME mysofa_shared)
|
||||
+endif()
|
||||
|
||||
set(PROJECT_VERSION
|
||||
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
|
||||
diff --git a/libmysofa.pc.cmake b/libmysofa.pc.cmake
|
||||
index 3c597fa..b09b0b7 100644
|
||||
index 3c597fa..091ce79 100644
|
||||
--- a/libmysofa.pc.cmake
|
||||
+++ b/libmysofa.pc.cmake
|
||||
@@ -8,4 +8,4 @@ Libs: -L${libdir} -lmysofa
|
||||
@@ -4,8 +4,8 @@ Version: @PROJECT_VERSION@
|
||||
Requires: @PKG_CONFIG_REQUIRES@
|
||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
-Libs: -L${libdir} -lmysofa
|
||||
+Libs: -L${libdir} -l@PKG_CONFIG_LIBNAME@
|
||||
Cflags: -I${includedir}
|
||||
|
||||
Libs.private: @PKG_CONFIG_PRIVATELIBS@
|
||||
-#Requires.private:
|
||||
+Requires.private: zlib
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index cc800b3..29e9b5d 100644
|
||||
index 37fe41f..3df874e 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -4,23 +4,19 @@ configure_file(config.h.in config.h)
|
||||
@@ -3,30 +3,16 @@ set(CMAKE_C_STANDARD 99)
|
||||
configure_file(config.h.in config.h)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
+set(MATH "")
|
||||
if(NOT MSVC)
|
||||
- if(NOT WIN32)
|
||||
- find_library(MATH m)
|
||||
|
|
@ -22,26 +44,29 @@ index cc800b3..29e9b5d 100644
|
|||
- set(MATH "")
|
||||
- endif()
|
||||
- include(FindZLIB)
|
||||
+ find_library(HAVE_MATH m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+endif()
|
||||
+if(HAVE_MATH)
|
||||
+ set(MATH m)
|
||||
+ string(APPEND PKG_CONFIG_PRIVATELIBS " -lm")
|
||||
else()
|
||||
set(MATH "")
|
||||
- include_directories(${ZLIB_INCLUDE_DIRS})
|
||||
- set(PKG_CONFIG_PRIVATELIBS "-lm ${PKG_CONFIG_PRIVATELIBS}")
|
||||
- set(PKG_CONFIG_PRIVATELIBS "-lz ${PKG_CONFIG_PRIVATELIBS}")
|
||||
-else()
|
||||
- set(MATH "")
|
||||
- find_program(NUGET nuget)
|
||||
- if(NUGET)
|
||||
- if(NOT NUGET)
|
||||
- message(
|
||||
- FATAL
|
||||
- "Cannot find nuget command line tool.\nInstall it with e.g. choco install nuget.commandline"
|
||||
- )
|
||||
- else()
|
||||
- execute_process(COMMAND ${NUGET} install zlib)
|
||||
- endif()
|
||||
+ find_library(HAVE_MATH m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+ if(HAVE_MATH)
|
||||
+ set(MATH m)
|
||||
+ string(APPEND PKG_CONFIG_PRIVATELIBS " -lm")
|
||||
endif()
|
||||
- include_directories(
|
||||
- ${PROJECT_SOURCE_DIR}/windows/third-party/zlib-1.2.11/include/)
|
||||
- ${PROJECT_SOURCE_DIR}/windows/third-party/zlib-1.3.1/include/)
|
||||
endif()
|
||||
+find_package(ZLIB REQUIRED)
|
||||
+set(ZLIB_LIBRARIES ZLIB::ZLIB)
|
||||
|
||||
-if(NOT MSVC)
|
||||
+if(1)
|
||||
+elseif(0) # redundant
|
||||
if(NOT WIN32)
|
||||
find_library(MATH m)
|
||||
else()
|
||||
set(libsrc
|
||||
hrtf/reader.c
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9d830c6..90bb680 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,7 +20,7 @@ set(CPACK_GENERATOR "DEB")
|
||||
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "IOhannes m zmölnig")
|
||||
set(CPACK_PACKAGE_VERSION_MAJOR "1")
|
||||
set(CPACK_PACKAGE_VERSION_MINOR "3")
|
||||
-set(CPACK_PACKAGE_VERSION_PATCH "3")
|
||||
+set(CPACK_PACKAGE_VERSION_PATCH "5")
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g")
|
||||
|
||||
set(PKG_CONFIG_PRIVATELIBS "")
|
||||
|
|
@ -2,10 +2,11 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO hoene/libmysofa
|
||||
REF "v${VERSION}"
|
||||
SHA512 58bd056678503491292a8a9b6b3f43451995a2c0a16735e4ae474d2d3e49bd7b3d6ef3dbfd0ce78e30d9f70887dd9cac60a8fae05ece0c167414f8ac4d3d5514
|
||||
SHA512 83f9b592b92984108ae1c43257d569320bf1b2c7b919563be2b92b0ec5396a4b2b9ad8dca579a2ad224c560c055fba8e77ca65d222e1944618a2819a0a8aa63c
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
dependencies.diff
|
||||
fix-package-version.diff
|
||||
)
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/windows/third-party")
|
||||
|
||||
|
|
@ -32,4 +33,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
|||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/LICENSE"
|
||||
"${SOURCE_PATH}/src/resampler/speex_resampler.c"
|
||||
"${SOURCE_PATH}/src/hrtf/kdtree.c"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "libmysofa",
|
||||
"version": "1.3.4",
|
||||
"port-version": 1,
|
||||
"version": "1.3.5",
|
||||
"description": "Reader for AES SOFA files to get better HRTFs (Head-Relative Transfer Functions)",
|
||||
"homepage": "https://github.com/hoene/libmysofa",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ vcpkg_from_sourceforge(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO liborigin
|
||||
REF liborigin/3.0
|
||||
FILENAME liborigin-${VERSION}.tar.gz
|
||||
SHA512 44157e1a5c71d7344e58c4702a43fd315978bff74992e1d7c568517c0685f617062777c791d6089872197d30f20cc06617aa4bd31d6a458df97b27eacf2f0f19
|
||||
FILENAME "liborigin-${VERSION}.tar.gz"
|
||||
SHA512 3b0d02c39bd4d0faa28808feb943c6dd696532b9391bc0a2fd55732931a18c8d1a66e38f520ad6cbdaecb0c33149a5e2b873403cc8a663b46e0f5a7db3d2b14f
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
|
|
@ -12,7 +12,9 @@ endif()
|
|||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${LIB_OPTION}
|
||||
OPTIONS
|
||||
${LIB_OPTION}
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
|
||||
)
|
||||
|
||||
vcpkg_cmake_build()
|
||||
|
|
@ -23,7 +25,9 @@ vcpkg_fixup_pkgconfig()
|
|||
|
||||
vcpkg_copy_tools(TOOL_NAMES opj2dat AUTO_CLEAN)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
)
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "liborigin",
|
||||
"version": "3.0.3",
|
||||
"version": "3.0.4",
|
||||
"description": "A library for reading OriginLab OPJ project files.",
|
||||
"homepage": "https://sourceforge.net/projects/liborigin/",
|
||||
"license": "GPL-2.0-or-later",
|
||||
"license": "GPL-3.0-only",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO LibRaw/LibRaw
|
||||
REF "${VERSION}"
|
||||
SHA512 123050ea30366ada37b40e0aee84453f71f10a5e5e39261a1d16b96dc395f85a9ecdfd043d51b4c347a67546affdfa7ca84c10fa84d73b9b4070c074f1d301e8
|
||||
SHA512 24313fbdc0f91432cf1de9fd1a7af56cc01c314760194a32fed8e7f5b991ff35e34fe04606e40ed86b3982f88e141c54b528d33631b420b71525abb06c95f5f4
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
|
@ -46,6 +46,11 @@ vcpkg_copy_pdbs()
|
|||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake")
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libraw.pc")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libraw.pc" "-lraw" "-lrawd")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libraw_r.pc" "-lraw_r" "-lraw_rd")
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h"
|
||||
"#ifdef LIBRAW_NODLL" "#if 1"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,15 @@
|
|||
libraw provides CMake targets:
|
||||
|
||||
find_package(libraw CONFIG REQUIRED)
|
||||
# non-thread-safe
|
||||
target_link_libraries(main PRIVATE libraw::raw)
|
||||
# thread-safe
|
||||
target_link_libraries(main PRIVATE libraw::raw_r)
|
||||
libraw provides CMake targets:
|
||||
|
||||
find_package(libraw CONFIG REQUIRED)
|
||||
# non-thread-safe
|
||||
target_link_libraries(main PRIVATE libraw::raw)
|
||||
# thread-safe
|
||||
target_link_libraries(main PRIVATE libraw::raw_r)
|
||||
|
||||
libraw provides pkg-config modules:
|
||||
|
||||
# Raw image decoder library (non-thread-safe)
|
||||
libraw
|
||||
|
||||
# Raw image decoder library (thread-safe)
|
||||
libraw_r
|
||||
|
|
|
|||
|
|
@ -1,40 +1,40 @@
|
|||
find_library(LibRaw_LIBRARY_RELEASE NAMES raw PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib/manual-link" NO_DEFAULT_PATH)
|
||||
find_library(LibRaw_LIBRARY_DEBUG NAMES rawd raw PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/manual-link" NO_DEFAULT_PATH)
|
||||
find_library(LibRaw_r_LIBRARY_RELEASE NAMES raw_r PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH)
|
||||
find_library(LibRaw_r_LIBRARY_DEBUG NAMES raw_rd raw_r PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH)
|
||||
|
||||
set(LIBRAW_PREV_MODULE_PATH "${CMAKE_MODULE_PATH}")
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
|
||||
_find_package(${ARGS})
|
||||
set(CMAKE_MODULE_PATH ${LIBRAW_PREV_MODULE_PATH})
|
||||
|
||||
if(NOT LibRaw_r_LIBRARIES STREQUAL "")
|
||||
if ("@ENABLE_OPENMP@")
|
||||
find_package(OpenMP REQUIRED)
|
||||
if (OpenMP_FOUND)
|
||||
list(APPEND LibRaw_LIBRARIES ${OpenMP_CXX_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${OpenMP_CXX_LIBRARIES})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
||||
find_package(Jasper REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES})
|
||||
find_package(lcms2 CONFIG REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES lcms2::lcms2)
|
||||
list(APPEND LibRaw_r_LIBRARIES lcms2::lcms2)
|
||||
find_package(ZLIB REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES ${ZLIB_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${ZLIB_LIBRARIES})
|
||||
if("@CMAKE_REQUIRE_FIND_PACKAGE_JPEG@")
|
||||
find_package(JPEG REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES ${JPEG_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${JPEG_LIBRARIES})
|
||||
endif()
|
||||
if("@MATH_LIBRARY@")
|
||||
list(APPEND LibRaw_LIBRARIES @MATH_LIBRARY@)
|
||||
list(APPEND LibRaw_r_LIBRARIES @MATH_LIBRARY@)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
find_library(LibRaw_LIBRARY_RELEASE NAMES raw PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib/manual-link" NO_DEFAULT_PATH)
|
||||
find_library(LibRaw_LIBRARY_DEBUG NAMES rawd raw PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/manual-link" NO_DEFAULT_PATH)
|
||||
find_library(LibRaw_r_LIBRARY_RELEASE NAMES raw_r PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH)
|
||||
find_library(LibRaw_r_LIBRARY_DEBUG NAMES raw_rd raw_r PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH)
|
||||
|
||||
set(LIBRAW_PREV_MODULE_PATH "${CMAKE_MODULE_PATH}")
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
|
||||
_find_package(${ARGS})
|
||||
set(CMAKE_MODULE_PATH ${LIBRAW_PREV_MODULE_PATH})
|
||||
|
||||
if(NOT LibRaw_r_LIBRARIES STREQUAL "")
|
||||
if ("@ENABLE_OPENMP@")
|
||||
find_package(OpenMP REQUIRED)
|
||||
if (OpenMP_FOUND)
|
||||
list(APPEND LibRaw_LIBRARIES ${OpenMP_CXX_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${OpenMP_CXX_LIBRARIES})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
||||
find_package(Jasper REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES})
|
||||
find_package(lcms2 CONFIG REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES lcms2::lcms2)
|
||||
list(APPEND LibRaw_r_LIBRARIES lcms2::lcms2)
|
||||
find_package(ZLIB REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES ${ZLIB_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${ZLIB_LIBRARIES})
|
||||
if("@CMAKE_REQUIRE_FIND_PACKAGE_JPEG@")
|
||||
find_package(JPEG REQUIRED)
|
||||
list(APPEND LibRaw_LIBRARIES ${JPEG_LIBRARIES})
|
||||
list(APPEND LibRaw_r_LIBRARIES ${JPEG_LIBRARIES})
|
||||
endif()
|
||||
if("@MATH_LIBRARY@")
|
||||
list(APPEND LibRaw_LIBRARIES @MATH_LIBRARY@)
|
||||
list(APPEND LibRaw_r_LIBRARIES @MATH_LIBRARY@)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "libraw",
|
||||
"version": "0.22.1",
|
||||
"version": "0.22.2",
|
||||
"description": "raw image decoder library",
|
||||
"homepage": "https://www.libraw.org",
|
||||
"license": "LGPL-2.1-only OR CDDL-1.0",
|
||||
"license": "(LGPL-2.1-only OR CDDL-1.0) AND BSD-3-Clause",
|
||||
"supports": "!uwp & !xbox",
|
||||
"dependencies": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ vcpkg_configure_meson(
|
|||
-Dxz=enabled
|
||||
-Dzstd=enabled
|
||||
ADDITIONAL_BINARIES
|
||||
"gperf = ['${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${HOST_EXECUTABLE_SUFFIX}']"
|
||||
"gperf = ['${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}']"
|
||||
)
|
||||
|
||||
vcpkg_install_meson()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "libsystemd",
|
||||
"version": "260.2",
|
||||
"port-version": 1,
|
||||
"description": "System and Service Manager",
|
||||
"homepage": "https://github.com/systemd/systemd",
|
||||
"license": null,
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO NVIDIA/MDL-SDK
|
||||
REF 2026.0.0
|
||||
SHA512 5248fb6797004ab7eeea23fdc09bff30fa3c5d3847f4698ee511f2bc419cd4324bf0fa4c901186047a9c89f64e9e6ea28e4eb1610b7961240def197e1f3937da
|
||||
REF 2026.0.2
|
||||
SHA512 d4bc3a22ecd699484dbdf309fccb6384265464b86baa122d1cd53da0afe7b55d7eca7e556328a5249f033c73df855caf12c0bc85fc536705e6d6537b42255835
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
|
@ -109,6 +109,7 @@ vcpkg_cmake_configure(
|
|||
OPTIONS
|
||||
-DMDL_LOG_DEPENDENCIES:BOOL=ON
|
||||
-DMDL_BUILD_SDK:BOOL=ON
|
||||
-DMDL_ENABLE_GPU_BAKER:BOOL=OFF
|
||||
-DMDL_BUILD_CORE_EXAMPLES:BOOL=OFF
|
||||
-DMDL_BUILD_DOCUMENTATION:BOOL=OFF
|
||||
-DMDL_BUILD_ARNOLD_PLUGIN:BOOL=OFF
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "mdl-sdk",
|
||||
"version": "2026.0.0",
|
||||
"version": "2026.0.2",
|
||||
"description": "NVIDIA Material Definition Language SDK",
|
||||
"homepage": "https://github.com/NVIDIA/MDL-SDK",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 610f968..d4a0854 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -460,7 +460,7 @@ if(PAGMO_WITH_NLOPT)
|
||||
set(_PAGMO_CONFIG_OPTIONAL_DEPS "${_PAGMO_CONFIG_OPTIONAL_DEPS}find_package(NLopt 2.6 REQUIRED NO_MODULE)\n")
|
||||
endif()
|
||||
if(PAGMO_WITH_IPOPT)
|
||||
- set(_PAGMO_CONFIG_OPTIONAL_DEPS "${_PAGMO_CONFIG_OPTIONAL_DEPS}find_package(pagmo_IPOPT REQUIRED COMPONENTS header)\n")
|
||||
+ set(_PAGMO_CONFIG_OPTIONAL_DEPS "${_PAGMO_CONFIG_OPTIONAL_DEPS}find_package(pagmo_IPOPT REQUIRED COMPONENTS header libipopt)\n")
|
||||
endif()
|
||||
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pagmo-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/pagmo-config.cmake" @ONLY)
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/cmake_modules/Findpagmo_IPOPT.cmake b/cmake_modules/Findpagmo_IPOPT.cmake
|
||||
index 626c33a..46136bd 100644
|
||||
--- a/cmake_modules/Findpagmo_IPOPT.cmake
|
||||
+++ b/cmake_modules/Findpagmo_IPOPT.cmake
|
||||
@@ -53,5 +53,8 @@ if ("libipopt" IN_LIST pagmo_IPOPT_FIND_COMPONENTS)
|
||||
message(STATUS "Path to libipopt: ${PAGMO_IPOPT_LIBRARY}")
|
||||
add_library(pagmo::IPOPT::libipopt UNKNOWN IMPORTED)
|
||||
set_target_properties(pagmo::IPOPT::libipopt PROPERTIES IMPORTED_LOCATION "${PAGMO_IPOPT_LIBRARY}")
|
||||
+ find_package(LAPACK REQUIRED)
|
||||
+ set_property(TARGET pagmo::IPOPT::libipopt APPEND PROPERTY
|
||||
+ INTERFACE_LINK_LIBRARIES LAPACK::LAPACK ${CMAKE_DL_LIBS})
|
||||
endif()
|
||||
endif()
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/include/pagmo/algorithms/ipopt.hpp b/include/pagmo/algorithms/ipopt.hpp
|
||||
index 5fea524..d275cb0 100644
|
||||
--- a/include/pagmo/algorithms/ipopt.hpp
|
||||
+++ b/include/pagmo/algorithms/ipopt.hpp
|
||||
@@ -38,8 +38,8 @@ see https://www.gnu.org/licenses/. */
|
||||
#include <tuple>
|
||||
#include <vector>
|
||||
|
||||
-#include <IpReturnCodes.hpp>
|
||||
-#include <IpTypes.hpp>
|
||||
+#include <coin-or/IpReturnCodes.hpp>
|
||||
+#include <coin-or/IpTypes.hpp>
|
||||
|
||||
#include <pagmo/algorithm.hpp>
|
||||
#include <pagmo/algorithms/not_population_based.hpp>
|
||||
|
|
@ -10,10 +10,14 @@ vcpkg_from_github(
|
|||
0003-disable-werror.patch
|
||||
0004-support-eigen3-5.patch
|
||||
0005-avoid-stdext-checked-array-iterator.diff # ~= https://github.com/esa/pagmo2/commit/d4daedc9f865bf9e926946c21e62c4a4eebf353e
|
||||
0006-config-find-libipopt.patch
|
||||
0007-ipopt-transitive-deps.patch # coin-or-ipopt provides no cmake config
|
||||
0008-ipopt-header-search.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
ipopt PAGMO_WITH_IPOPT
|
||||
nlopt PAGMO_WITH_NLOPT
|
||||
)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAGMO_BUILD_STATIC_LIBRARY)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "pagmo2",
|
||||
"version": "2.19.1",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "A C++ platform to perform parallel computations of optimization tasks (global and local) via the asynchronous generalized island model.",
|
||||
"homepage": "https://esa.github.io/pagmo2/",
|
||||
"license": "GPL-3.0-or-later OR LGPL-3.0-or-later",
|
||||
|
|
@ -23,6 +23,12 @@
|
|||
}
|
||||
],
|
||||
"features": {
|
||||
"ipopt": {
|
||||
"description": "Enable the Ipopt wrappers",
|
||||
"dependencies": [
|
||||
"coin-or-ipopt"
|
||||
]
|
||||
},
|
||||
"nlopt": {
|
||||
"description": "Enable the NLopt wrappers",
|
||||
"dependencies": [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO odygrd/quill
|
||||
REF "v${VERSION}"
|
||||
SHA512 b4d6cf5d8f5f87fe240ff99ec7fc70d7bcf80b67add8189c0773564c3c4f7590fcb2050ad61378a6a0378a7224e8ceca5913738a4bda19960a70d04ecacd3dc2
|
||||
SHA512 f32f99f6640e4887517da86648cba41403ad4eda59bc786f861172384506475e09d6ab10aff943f196c62940edab7896402d31e4085a550251ba42f803cf266c
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "quill",
|
||||
"version": "12.2.2",
|
||||
"version": "13.0.0",
|
||||
"description": "Asynchronous Low Latency C++ Logging Library",
|
||||
"homepage": "https://github.com/odygrd/quill/",
|
||||
"documentation": "https://quillcpp.readthedocs.io/en/latest/",
|
||||
|
|
|
|||
|
|
@ -1,30 +1,37 @@
|
|||
# Only the standalone tool
|
||||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
set(VCPKG_BUILD_TYPE release)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO introlab/rtabmap
|
||||
REF ${VERSION}
|
||||
SHA512 9bcd0f359e0ee8060cf7088761544a3f7d38aadb37df820958f0811aa7b8edbfaf00f00d9472a8bf46261d4e5d868f9c10785263aaabaf374b6e5aa5237d70b0
|
||||
HEAD_REF master
|
||||
)
|
||||
file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DINSTALL_INCLUDE_DIR=include
|
||||
-DINSTALL_CMAKE_DIR=lib/cmake
|
||||
-DRTABMAP_VERSION=${VERSION}
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
|
||||
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
# Only the standalone tool
|
||||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
set(VCPKG_BUILD_TYPE release)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO introlab/rtabmap
|
||||
REF "${VERSION}"
|
||||
SHA512 b18515a1215d76592f748c6d18c4c7cd6311739be411dfbc787d11d69729b1193265d5970816cef2b5b5dc9f4418547896d7749fd76137c0888e1dcb7de66fca
|
||||
HEAD_REF master
|
||||
)
|
||||
file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DINSTALL_INCLUDE_DIR=include
|
||||
-DINSTALL_CMAKE_DIR=lib/cmake
|
||||
-DRTABMAP_VERSION=${VERSION}
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/include"
|
||||
"${CURRENT_PACKAGES_DIR}/lib"
|
||||
)
|
||||
|
||||
# We don't use vcpkg_copy_tools here, as some platforms need rtabmap-res_tool-${UTILITE_VERSION}, aside from rtabmap-res_tool
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
|
||||
vcpkg_install_copyright(
|
||||
FILE_LIST
|
||||
"${SOURCE_PATH}/LICENSE"
|
||||
"${SOURCE_PATH}/utilite/resource_generator/main.cpp"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "rtabmap-res-tool",
|
||||
"version": "0.23.2",
|
||||
"version": "0.23.8",
|
||||
"description": "Real-Time Appearance-Based Mapping, resource generator",
|
||||
"homepage": "https://introlab.github.io/rtabmap/",
|
||||
"license": "BSD-3-Clause",
|
||||
"license": "BSD-3-Clause AND LGPL-3.0-or-later",
|
||||
"supports": "native",
|
||||
"dependencies": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
if(TARGET_TRIPLET MATCHES "(uwp|arm)")
|
||||
message(FATAL_ERROR "septag-sx doesn't support ${TARGET_TRIPLET} currently.")
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO septag/sx
|
||||
REF b70567a52636f9ecfdb904c586a957a806efc990
|
||||
SHA512 8945476b428418d3c7845afd831503f43fd44672a9b3506576c5baf50f55739327275a8be97a323f3ae146f84b76bbe266ac7b5df1b85cb05a826ed5e30b9547
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SX_SHARED_LIB)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DSX_BUILD_TESTS=OFF
|
||||
-DSX_SHARED_LIB=${SX_SHARED_LIB}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sx PACKAGE_NAME sx)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sx/config.h"
|
||||
"define SX_CONFIG_SHARED_LIB 0"
|
||||
"define SX_CONFIG_SHARED_LIB 1"
|
||||
)
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
# Handle copyright
|
||||
configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"name": "septag-sx",
|
||||
"version-date": "2019-05-07",
|
||||
"port-version": 5,
|
||||
"description": "Portable base library for C programmers, designed for performance and simplicity.",
|
||||
"supports": "!(uwp | arm)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO SlickQuant/slick-logger
|
||||
REF "v${VERSION}"
|
||||
SHA512 00159e819ac974fa568aab0475d539ac8949fe999ec280c21ace271e510204a2413edc298281dfc51c699e2eb8be8ace5003e3daa7e88e394cf13bc0f6da2bce
|
||||
SHA512 4b721d3c1fd130e1af0d5e327be4ef24e15556ba1c871124afd2db79f6a986057be02ab925137ed8c578cf16c4070b3d837d6d4b338bac4777b0dea6b9c801d0
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
slick-queue.patch
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e3c0913..efbb93b 100644
|
||||
index c47da23..03e2f1e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,9 +7,9 @@ project(slick-logger
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
@@ -9,9 +9,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
-find_package(slick-queue 1.2.2 CONFIG QUIET)
|
||||
# 1.5.0 or newer is required: multi-process logging relies on the slick-shm based
|
||||
# shared-memory implementation introduced in slick-queue 1.3.0.
|
||||
-find_package(slick-queue 1.5.0 CONFIG QUIET)
|
||||
+find_package(slick-queue CONFIG REQUIRED)
|
||||
|
||||
-if (NOT slick-queue_FOUND)
|
||||
|
|
@ -15,14 +15,14 @@ index e3c0913..efbb93b 100644
|
|||
include(FetchContent)
|
||||
|
||||
diff --git a/cmake/slick-loggerConfig.cmake.in b/cmake/slick-loggerConfig.cmake.in
|
||||
index 7ea75d1..4c30d13 100644
|
||||
index d7160a7..4c30d13 100644
|
||||
--- a/cmake/slick-loggerConfig.cmake.in
|
||||
+++ b/cmake/slick-loggerConfig.cmake.in
|
||||
@@ -3,7 +3,7 @@
|
||||
include(CMakeFindDependencyMacro)
|
||||
|
||||
# Find slick-queue dependency
|
||||
-find_dependency(slick-queue 1.2.2 CONFIG)
|
||||
-find_dependency(slick-queue 1.5.0 CONFIG)
|
||||
+find_dependency(slick-queue CONFIG)
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/slick-loggerTargets.cmake")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "slick-logger",
|
||||
"version": "1.1.4",
|
||||
"version": "1.2.0",
|
||||
"description": "A high-performance, cross-platform header-only logging library for C++20 using a multi-producer, multi-consumer ring buffer with multi-sink support and log rotation capabilities",
|
||||
"homepage": "https://github.com/SlickQuant/slick-logger",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO SlickQuant/slick-shm
|
||||
REF "v${VERSION}"
|
||||
SHA512 39504cf5552c84032046137fd91ae01c0545da93ecaae68aac39edcbe9d24a1ce2d8112167511807fa14144a145bbb57c1572f68121b27af2222a522999afa97
|
||||
SHA512 de5272d222885913d7bd4ea67baae36bcee4493815d9a23813e1eaec93cd79805203dc7fee5d6c934d87c7147e5a6a6f610dbf34b2c69b446a9d7ae1595852c6
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "slick-shm",
|
||||
"version-semver": "0.1.5",
|
||||
"version-semver": "0.1.6",
|
||||
"description": "A modern C++17 header-only, cross-platform shared memory library",
|
||||
"homepage": "https://github.com/SlickQuant/slick-shm",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ endif()
|
|||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}"
|
||||
FILENAME "microsoft.web.webview2.${VERSION}.zip"
|
||||
SHA512 10048ce88c166b7f29a563fcdb9487d71bac5723777cd0a98b5c5a0e71cff344551a0bc27410b0cb0f8482a9ecdec7454a45ad0d2a7ae998fc347ead15598889
|
||||
SHA512 adf91bda1a71d860c098cd0e426b5a238e187ea73c694832f8fde36809a9165fda8844fc9c2b9fc8a870b0da53cd9eb97ec140d9a2f104a228301ffae841db8c
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "webview2",
|
||||
"version": "1.0.3800.47",
|
||||
"version": "1.0.4191.47",
|
||||
"description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge",
|
||||
"homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2",
|
||||
"documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO wirestead/wirestead
|
||||
REF v${VERSION}
|
||||
SHA512 324e440b2665f791dcf849f6508eb40500f708de2135e5700f9110cc9e004f7c2823dab3048acd80ef6977619bf9523cc111f391410c27b791bb0b86b7a393fd
|
||||
SHA512 2ce7618dbabfed52a757ca2f855dfa233a688f68d7d504ea66f9f0bf8e691f859885a7435e87664b6199bffb40fb2b55619167f9f627154bcc51af3c90311f87
|
||||
HEAD_REF main
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "wirestead",
|
||||
"version": "0.9.5",
|
||||
"version": "0.9.6",
|
||||
"description": "Unified, cross-platform async C++ library for Serial, TCP, UDP, and UDS",
|
||||
"homepage": "https://github.com/wirestead/wirestead",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -1037,7 +1037,6 @@ salome-medcoupling:x64-linux=fail
|
|||
saucer:arm64-osx=fail # std::move_only_function is not supported
|
||||
saucer:x64-linux=fail # requires gcc14 or later
|
||||
sentry-native:arm64-linux=fail
|
||||
septag-sx:x64-android=fail
|
||||
sfgui:arm-neon-android=fail
|
||||
sfgui:arm64-android=fail
|
||||
sfgui:x64-android=fail
|
||||
|
|
|
|||
|
|
@ -347,7 +347,6 @@ gdal[arrow,parquet](!(arm64 | x64))=cascade
|
|||
gdal[aws-ec2-windows](!windows)=cascade
|
||||
gdal[iconv]:arm64-linux=feature-fails
|
||||
gdal[libxml2]:arm64-linux=feature-fails
|
||||
gdbm[readline]:arm64-linux=feature-fails
|
||||
gdk-pixbuf[introspection]:arm64-windows=skip # needs arm64 host
|
||||
gegl:arm64-osx=fail # meson bug on osx. See https://github.com/microsoft/vcpkg/issues/44411
|
||||
geogram:arm64-linux=fail # Could NOT find Threads (missing: Threads_FOUND)
|
||||
|
|
@ -995,6 +994,7 @@ osg[tools]:arm64-linux=combination-fails
|
|||
osg-qt:arm64-linux=cascade
|
||||
osgearth:arm64-linux=cascade
|
||||
osgearth[tools]:arm64-osx=feature-fails # Undefined _NSSearchPathForDirectoriesInDomains
|
||||
pagmo2[ipopt](android | uwp)=cascade # coin-or-ipopt -> lapack (!android), coinutils (!uwp)
|
||||
pango[introspection]:arm64-windows=skip # needs arm64 host
|
||||
pangolin:arm64-linux=cascade
|
||||
pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,openni2,png,realsense,tiff,tools,vars,video,zstd]:x64-windows-static-md=combination-fails
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "76aceafae21b4305fb499facc028b1269cee5b2c",
|
||||
"version": "8.0.7",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "7e3ab66fd54d2cb0695689595627cf0af27fea0f",
|
||||
"version": "8.0.6",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2182b86b07b1485610687ea2ba45a79a558ae8c8",
|
||||
"version": "1.0.6",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "ec534369136985b55e67821d956d3c8934ca9035",
|
||||
"version": "1.0.6",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "36c44c8159d1b3da50dfa24407a5b1741b6c0ae9",
|
||||
"version": "1.12.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "6d12f4efe5aee0efe4ff61710e6cbc3100cec7a4",
|
||||
"version": "1.12.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a733c4fc611e69bf4af6b12244d3007e38bb8736",
|
||||
"version": "1.12.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "2f85aad132aa9fd6a464be359fa7359b9633c780",
|
||||
"version": "1.12.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d7052ba597d808512c85ce0f811b25a99e4f91bb",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "1f256aa109bcaa353a15b8b33b75a574e0b0e658",
|
||||
"version": "0.10.5",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "055df4f4af8ab15325dab8f6079230a676dafb08",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "067f66b4b6db897a59491bb21f506e750f43ff2c",
|
||||
"version": "0.9.15",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7e7fc37feeca83c12d18ef7216c264189aa36ff5",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "76061ad61733758777f314b2b83f3e76de9a7ad0",
|
||||
"version": "0.3.3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "582ffd23bbcd6d7a032b09a741b5eaa75f81da6f",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b4f9c864189f308c6f3c0b73db2f2d2dd54134cf",
|
||||
"version": "0.7.2",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "613c90c3def9f796bc8910b07e54c870d8f721c5",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "172e893e8efff99979282a03764419d42f6ec1f3",
|
||||
"version": "0.11.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "45bcf5aaed7b67c8f3d3f3c79c23af5324ce2b41",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "425ee481cc6e0013079b6316228fb49d3a528679",
|
||||
"version": "0.27.7",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bf76ef64568fbf615c6ddf04cfdebac556557bd7",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "aacbbc403c2b7b557debe4d1073661df5997a7fc",
|
||||
"version": "0.16.2",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c7492c2dcf0f8e21cf0d63e8043f2e58b7f35846",
|
||||
"version": "1.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "02d2d70fed84926435f7b3847885ae70ecafc8a0",
|
||||
"version": "0.13.7",
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue