[hidapi] Add support linux and osx (#17231)

* [hidapi] Add support linux and osx

* Update versions

* Remove duplicate AC_CONFIG_MACRO_DIR

* Update versions/h-/hidapi.json
This commit is contained in:
NancyLi1013 2021-05-01 02:11:21 +08:00 committed by GitHub
parent d36f68e336
commit efddfbf13e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 9 deletions

View File

@ -1,4 +1,4 @@
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp")
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -6,6 +6,7 @@ vcpkg_from_github(
REF hidapi-0.10.1
SHA512 0479706c631775483378070ff7170542725678eabc202a5bd07436c951fd766e01743417999ac3fb2b5436c865f6ace2cfced1f210fa3a3e88c19ceb3bbe0534
HEAD_REF master
patch remove-duplicate-AC_CONFIG_MACRO_DIR.patch
)
if(VCPKG_TARGET_IS_WINDOWS)
@ -51,4 +52,19 @@ if(VCPKG_TARGET_IS_WINDOWS)
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/hidapi-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
else(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
)
vcpkg_install_make()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
endif()

View File

@ -0,0 +1,12 @@
diff --git a/configure.ac b/configure.ac
index 220909a..77da67a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT

View File

@ -1,7 +1,14 @@
{
"name": "hidapi",
"version-string": "0.10.1",
"version-semver": "0.10.1",
"port-version": 1,
"description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.",
"homepage": "https://github.com/libusb/hidapi",
"supports": "windows & !(arm | arm64 | uwp)"
"supports": "!(arm | uwp)",
"dependencies": [
{
"name": "libusb",
"platform": "!windows"
}
]
}

View File

@ -454,11 +454,6 @@ healpix:x64-uwp=fail
healpix:arm64-windows=fail
healpix:arm-uwp=fail
healpix:x64-osx=fail
hidapi:arm64-windows=fail
hidapi:arm-uwp=fail
hidapi:x64-linux=fail
hidapi:x64-osx=fail
hidapi:x64-uwp=fail
hiredis:arm-uwp=fail
hiredis:x64-uwp=fail
hpx:x64-windows-static=fail

View File

@ -2458,7 +2458,7 @@
},
"hidapi": {
"baseline": "0.10.1",
"port-version": 0
"port-version": 1
},
"highfive": {
"baseline": "2.2.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5322c7526edb02f08688e2831978b2be542755c9",
"version-semver": "0.10.1",
"port-version": 1
},
{
"git-tree": "e252d2cc9ecde0cdecdf424af08a4292440f9efd",
"version-string": "0.10.1",