From 7229e0658624565b8fc5097d949b60e30691e638 Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Sat, 4 Feb 2023 06:00:28 +0800 Subject: [PATCH] [libusb] Fix undefined symbols on osx (#29393) * [libusb] Fix undefined symbols on osx * update version database * update license * update version database --------- Co-authored-by: MonicaLiu --- ports/libusb/vcpkg-cmake-wrapper.cmake | 6 ++++++ ports/libusb/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ports/libusb/vcpkg-cmake-wrapper.cmake b/ports/libusb/vcpkg-cmake-wrapper.cmake index 6689dc4bcc..8e8c28806c 100644 --- a/ports/libusb/vcpkg-cmake-wrapper.cmake +++ b/ports/libusb/vcpkg-cmake-wrapper.cmake @@ -11,3 +11,9 @@ set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}") if (@VCPKG_TARGET_IS_LINUX@) list(APPEND LIBUSB_LIBRARIES udev) endif() + +if (@VCPKG_TARGET_IS_OSX@) + list(APPEND LIBUSB_LIBRARIES "-framework Cocoa") + list(APPEND LIBUSB_LIBRARIES "-framework IOKit") + list(APPEND LIBUSB_LIBRARIES "-framework Security") +endif() diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 78afef0f56..d7df1073f8 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libusb", "version": "1.0.26", - "port-version": 2, + "port-version": 3, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", - "license": "LGPL-2.1", + "license": "LGPL-2.1-or-later", "supports": "!uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index a3bcf0198f..2a0ea85406 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4458,7 +4458,7 @@ }, "libusb": { "baseline": "1.0.26", - "port-version": 2 + "port-version": 3 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 534c1ba558..290251d6d4 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "540652cc1251aa3894206c20296f6119da1ccea4", + "version": "1.0.26", + "port-version": 3 + }, { "git-tree": "0fde9742f99465a4029efa4b552f3c2ed276ec6a", "version": "1.0.26",