[vcpkg baseline][libcaer] Fix and update (#30736)

* [libcaer] Explicitly pass pkgconf

* [libcaer] Update license

* [libcaer] Update to 3.3.15

* [libcaer] opencv is opt-in

* [libcaer] MSVC arm is unsupported

* Update versions/l-/libcaer.json

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

---------

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
Kai Pastor 2023-04-10 18:20:54 +02:00 коммит произвёл GitHub
Родитель 93e173a0d7
Коммит 45b0e4b585
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 36 добавлений и 14 удалений

Просмотреть файл

@ -2,20 +2,28 @@ vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com/inivation/
OUT_SOURCE_PATH SOURCE_PATH
REPO dv/libcaer
REF 933dfa60a138091afb03014f8c24183bab7bba4e
SHA512 f3ac74bb4cfc4077e5a226307f66a9b8b263201d2342d9e61ee98a23f95e7897895da9f148b4e910535779f779a26f5c192925386a99a70e9d22540a5421d646
REF "${VERSION}"
SHA512 29f8ac47f97a7640d8102eb5c693259da7506d918975be0f3e4e970ab7135dfff67f1c48dd17240462bf846bf31745d518a421229b8c453b29410ea26e489aa3
HEAD_REF master
PATCHES
fix-libusb.diff
)
find_program(PKGCONFIG NAMES pkgconf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" NO_DEFAULT_PATH REQUIRED)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
opencv ENABLE_OPENCV
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE # writes to include/libcaer/libcaer.h
OPTIONS
-DENABLE_OPENCV=ON
${FEATURE_OPTIONS}
-DEXAMPLES_INSTALL=OFF
-DBUILD_CONFIG_VCPKG=ON
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
)
vcpkg_cmake_install()
@ -25,4 +33,6 @@ vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
set(stdatomic_license "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/LICENSE for simple-stdatomic (x86,x64 MSVC)")
file(COPY_FILE "${SOURCE_PATH}/thirdparty/simple-stdatomic/LICENSE" "${stdatomic_license}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${stdatomic_license}")

Просмотреть файл

@ -1,16 +1,12 @@
{
"name": "libcaer",
"version-date": "2022-07-25",
"port-version": 4,
"version": "3.3.15",
"description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.",
"homepage": "https://gitlab.com/inivation/dv/libcaer",
"license": "BSD-2-Clause",
"license": "BSD-2-Clause AND Apache-2.0",
"supports": "!(arm & windows & !mingw)",
"dependencies": [
"libusb",
{
"name": "opencv4",
"default-features": false
},
{
"name": "pkgconf",
"host": true
@ -23,5 +19,16 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"features": {
"opencv": {
"description": "Enable support for frame enhancements using OpenCV",
"dependencies": [
{
"name": "opencv4",
"default-features": false
}
]
}
}
}

Просмотреть файл

@ -3809,8 +3809,8 @@
"port-version": 0
},
"libcaer": {
"baseline": "2022-07-25",
"port-version": 4
"baseline": "3.3.15",
"port-version": 0
},
"libcanberra": {
"baseline": "0.30",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f90f31425f85b3bb2544a34fc0b9247491ecbf2b",
"version": "3.3.15",
"port-version": 0
},
{
"git-tree": "52791fbed0e817d00944e3ad1f9ab76759f543f8",
"version-date": "2022-07-25",