From 45c7cfd2e666ddedf501b3356ed108f2f038d7e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 27 Feb 2017 12:30:17 +0200 Subject: [PATCH] vendor: update HID library for glibc < v2.17 build --- vendor/github.com/karalabe/hid/LICENSE.md | 4 +-- vendor/github.com/karalabe/hid/README.md | 14 ++++++--- vendor/github.com/karalabe/hid/appveyor.yml | 31 +++++++++++++++++++ .../github.com/karalabe/hid/hid_disabled.go | 4 +-- vendor/github.com/karalabe/hid/hid_enabled.go | 4 +-- vendor/vendor.json | 6 ++-- 6 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 vendor/github.com/karalabe/hid/appveyor.yml diff --git a/vendor/github.com/karalabe/hid/LICENSE.md b/vendor/github.com/karalabe/hid/LICENSE.md index 025ad35e9a..230d1daeb6 100644 --- a/vendor/github.com/karalabe/hid/LICENSE.md +++ b/vendor/github.com/karalabe/hid/LICENSE.md @@ -1,8 +1,8 @@ The components of `hid` are licensed as such: * `hidapi` is released under the [3-clause BSD](https://github.com/signal11/hidapi/blob/master/LICENSE-bsd.txt) license. - * `libusb` is released under the [GNU GPL 2.1](https://github.com/libusb/libusb/blob/master/COPYING)license. + * `libusb` is released under the [GNU LGPL 2.1](https://github.com/libusb/libusb/blob/master/COPYING)license. * `go.hid` is released under the [2-clause BSD](https://github.com/GeertJohan/go.hid/blob/master/LICENSE) license. * `gowchar` is released under the [3-clause BSD](https://github.com/orofarne/gowchar/blob/master/LICENSE) license. -Given the above, `hid` is licensed under GNU GPL 2.1 or later on Linux and 3-clause BSD on other platforms. +Given the above, `hid` is licensed under GNU LGPL 2.1 or later on Linux and 3-clause BSD on other platforms. diff --git a/vendor/github.com/karalabe/hid/README.md b/vendor/github.com/karalabe/hid/README.md index 2c3cbb8ae3..5c0213f3b2 100644 --- a/vendor/github.com/karalabe/hid/README.md +++ b/vendor/github.com/karalabe/hid/README.md @@ -1,7 +1,13 @@ +[![Travis][travisimg]][travisurl] +[![AppVeyor][appveyorimg]][appveyorurl] [![GoDoc][docimg]][docurl] -[docimg]: https://godoc.org/github.com/karalabe/hid?status.svg -[docurl]: https://godoc.org/github.com/karalabe/hid +[travisimg]: https://travis-ci.org/karalabe/hid.svg?branch=master +[travisurl]: https://travis-ci.org/karalabe/hid +[appveyorimg]: https://ci.appveyor.com/api/projects/status/plroy54odykb0ch3/branch/master?svg=true +[appveyorurl]: https://ci.appveyor.com/project/karalabe/hid +[docimg]: https://godoc.org/github.com/karalabe/hid?status.svg +[docurl]: https://godoc.org/github.com/karalabe/hid # Gopher Interface Devices (USB HID) @@ -34,8 +40,8 @@ such, `gowchar` was also vendored in inline (copyright headers and origins prese The components of `hid` are licensed as such: * `hidapi` is released under the [3-clause BSD](https://github.com/signal11/hidapi/blob/master/LICENSE-bsd.txt) license. - * `libusb` is released under the [GNU GPL 2.1](https://github.com/libusb/libusb/blob/master/COPYING)license. + * `libusb` is released under the [GNU LGPL 2.1](https://github.com/libusb/libusb/blob/master/COPYING)license. * `go.hid` is released under the [2-clause BSD](https://github.com/GeertJohan/go.hid/blob/master/LICENSE) license. * `gowchar` is released under the [3-clause BSD](https://github.com/orofarne/gowchar/blob/master/LICENSE) license. -Given the above, `hid` is licensed under GNU GPL 2.1 or later on Linux and 3-clause BSD on other platforms. +Given the above, `hid` is licensed under GNU LGPL 2.1 or later on Linux and 3-clause BSD on other platforms. diff --git a/vendor/github.com/karalabe/hid/appveyor.yml b/vendor/github.com/karalabe/hid/appveyor.yml new file mode 100644 index 0000000000..34623ddb01 --- /dev/null +++ b/vendor/github.com/karalabe/hid/appveyor.yml @@ -0,0 +1,31 @@ +os: Visual Studio 2015 + +# Clone directly into GOPATH. +clone_folder: C:\gopath\src\github.com\karalabe\hid +clone_depth: 1 +version: "{branch}.{build}" +environment: + global: + GOPATH: C:\gopath + CC: gcc.exe + matrix: + - GOARCH: amd64 + MSYS2_ARCH: x86_64 + MSYS2_BITS: 64 + MSYSTEM: MINGW64 + PATH: C:\msys64\mingw64\bin\;%PATH% + - GOARCH: 386 + MSYS2_ARCH: i686 + MSYS2_BITS: 32 + MSYSTEM: MINGW32 + PATH: C:\msys64\mingw32\bin\;%PATH% + +install: + - rmdir C:\go /s /q + - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.windows-%GOARCH%.zip + - 7z x go1.8.windows-%GOARCH%.zip -y -oC:\ > NUL + - go version + - gcc --version + +build_script: + - go install ./... diff --git a/vendor/github.com/karalabe/hid/hid_disabled.go b/vendor/github.com/karalabe/hid/hid_disabled.go index 0798bad1b8..d8ecc9d5a2 100644 --- a/vendor/github.com/karalabe/hid/hid_disabled.go +++ b/vendor/github.com/karalabe/hid/hid_disabled.go @@ -4,9 +4,7 @@ // This file is released under the 3-clause BSD license. Note however that Linux // support depends on libusb, released under GNU GPL 2.1 or later. -// +build !linux -// +build !darwin ios -// +build !windows +// +build !linux,!darwin,!windows ios !cgo package hid diff --git a/vendor/github.com/karalabe/hid/hid_enabled.go b/vendor/github.com/karalabe/hid/hid_enabled.go index 3bc0ff3819..3ceecce0d3 100644 --- a/vendor/github.com/karalabe/hid/hid_enabled.go +++ b/vendor/github.com/karalabe/hid/hid_enabled.go @@ -4,8 +4,7 @@ // This file is released under the 3-clause BSD license. Note however that Linux // support depends on libusb, released under GNU GPL 2.1 or later. -// +build !ios -// +build linux darwin windows +// +build linux,cgo darwin,!ios,cgo windows,cgo package hid @@ -13,6 +12,7 @@ package hid #cgo CFLAGS: -I./hidapi/hidapi #cgo linux CFLAGS: -I./libusb/libusb -DDEFAULT_VISIBILITY="" -DOS_LINUX -D_GNU_SOURCE -DPOLL_NFDS_TYPE=int +#cgo linux,!android LDFLAGS: -lrt #cgo darwin CFLAGS: -DOS_DARWIN #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit #cgo windows CFLAGS: -DOS_WINDOWS diff --git a/vendor/vendor.json b/vendor/vendor.json index eda0077454..e28ab243b9 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -125,10 +125,10 @@ "revisionTime": "2016-06-03T03:41:37Z" }, { - "checksumSHA1": "HKy8oSpuboe02Uqq+43zbIzD/AY=", + "checksumSHA1": "sGdhjz2N/DpfiZrMnHSzl2H/YX8=", "path": "github.com/karalabe/hid", - "revision": "40280bf4f6fc762010efeb066cbff7490d467f03", - "revisionTime": "2017-02-17T09:52:56Z", + "revision": "875879887cf0560a993b57e04615944e1dd02a73", + "revisionTime": "2017-02-27T10:57:12Z", "tree": true }, {