;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
-;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
+;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system ant)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages mp3)
#:use-module (gnu packages pkg-config)
(define-public libusb
(package
(name "libusb")
- (version "1.0.19")
+ (version "1.0.22")
(source
(origin
(method url-fetch)
"libusb-" version "/libusb-" version ".tar.bz2"))
(sha256
(base32
- "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"))))
+ "0mw1a5ss4alg37m6bd4k44v35xwrcwp5qm4s686q1nsgkbavkbkm"))))
(build-system gnu-build-system)
;; XXX: Enabling udev is now recommended, but eudev indirectly depends on
(arguments `(#:configure-flags '("--disable-udev")))
;; (inputs `(("eudev" ,eudev)))
- (home-page "http://www.libusb.org")
+ (home-page "http://libusb.info")
(synopsis "User-space USB library")
(description
"Libusb is a library that gives applications easy access to USB
`(("pkg-config" ,pkg-config)))
(inputs
`(("libusb" ,libusb)))
- (home-page "http://www.libusb.org")
+ (home-page "http://libusb.info")
(synopsis "Compatibility shim for libusb")
(description
"Libusb-compat provides a shim allowing applications based on older
version of libusb to run with newer libusb.")
(license lgpl2.1+)))
+;; required by 0xffff, which compiles with libusb-compat, but executes only
+;; with libusb-0.1
+(define-public libusb-0.1
+ (package (inherit libusb)
+ (version "0.1.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/libusb/libusb-0.1 (LEGACY)/"
+ version "/libusb-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"))
+ (patches (search-patches "libusb-0.1-disable-tests.patch"))))))
+
+(define-public libusb4java
+ ;; There is no public release so we take the latest version from git.
+ (let ((commit "396d642a57678a0d9663b062c980fe100cc0ea1e")
+ (revision "1"))
+ (package
+ (name "libusb4java")
+ (version (string-append "0-" revision "." (string-take commit 9)))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/usb4java/libusb4java.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0wqgapalhfh9v38ycbl6i2f5lh1wpr6fzwn5dwd0rdacypkd1gml"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; there are no tests
+ #:phases
+ (modify-phases %standard-phases
+ ;; FIXME: libusb 1.0.22 deprecated libusb_set_debug, so the build
+ ;; fails because libusb4java uses a deprecated procedure.
+ (add-after 'unpack 'disable-Werror
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("-Werror") ""))
+ #t))
+ (add-before 'configure 'set-JAVA_HOME
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
+ #t)))))
+ (inputs
+ `(("libusb" ,libusb)))
+ (native-inputs
+ `(("jdk" ,icedtea "jdk")))
+ (home-page "https://github.com/usb4java/libusb4java/")
+ (synopsis "JNI bindings to libusb")
+ (description
+ "This package provides Java JNI bindings to the libusb library for use
+with usb4java.")
+ (license expat))))
+
+(define-public java-usb4java
+ (package
+ (name "java-usb4java")
+ (version "1.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/usb4java/usb4java/"
+ "archive/usb4java-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0gzpsnzwgsdyra3smq288yvxnwrgvdwxr6g8jbknnsk56kv6wc34"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "usb4java.jar"
+ #:phases
+ (modify-phases %standard-phases
+ ;; Usually, native libusb4java libraries for all supported systems
+ ;; would be included in the jar and extracted at runtime. Since we
+ ;; build everything from source we cannot just bundle pre-built
+ ;; binaries for other systems. Instead, we patch the loader to
+ ;; directly return the appropriate library for this system. The
+ ;; downside is that the jar will only work on the same architecture
+ ;; that it was built on.
+ (add-after 'unpack 'copy-libusb4java
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/main/java/org/usb4java/Loader.java"
+ (("private static String extractLibrary" line)
+ (string-append
+ line "(final String a, final String b) {"
+ "return \""
+ (assoc-ref inputs "libusb4java") "/lib/libusb4java.so"
+ "\"; }\n"
+ "private static String _extractLibrary")))
+ #t))
+ (add-after 'unpack 'disable-broken-tests
+ (lambda _
+ (with-directory-excursion "src/test/java/org/usb4java"
+ ;; These tests should only be run when USB devices are present.
+ (substitute* '("LibUsbGlobalTest.java"
+ "TransferTest.java")
+ (("this.context = new Context\\(\\);")
+ "this.context = null;")
+ (("LibUsb.init") "//"))
+ (substitute* "DeviceListIteratorTest.java"
+ (("this.iterator.remove" line)
+ (string-append "assumeUsbTestsEnabled();" line))))
+ #t)))))
+ (inputs
+ `(("libusb4java" ,libusb4java)
+ ("java-commons-lang3" ,java-commons-lang3)
+ ("java-junit" ,java-junit)
+ ("java-hamcrest-core" ,java-hamcrest-core)))
+ (home-page "http://usb4java.org/")
+ (synopsis "USB library for Java")
+ (description
+ "This package provides a USB library for Java based on libusb and
+implementing @code{javax.usb} (JSR-80).")
+ (license expat)))
+
(define-public python-pyusb
(package
(name "python-pyusb")
(build-system python-build-system)
(arguments
`(#:tests? #f ;no tests
- #:modules ((srfi srfi-26)
+ #:modules ((srfi srfi-1)
+ (srfi srfi-26)
(guix build utils)
(guix build python-build-system))
#:phases
(("lib = locate_library\\(candidates, find_library\\)")
(string-append
"lib = \""
- (car (find-files (assoc-ref inputs "libusb")
- (lambda (file stat)
- (and ((file-name-predicate
- "^libusb-.*\\.so\\..*") file stat)
- (not (symbolic-link? file))))))
+ (find (negate symbolic-link?)
+ (find-files (assoc-ref inputs "libusb")
+ "^libusb-.*\\.so\\..*"))
"\"")))
#t)))))
(inputs
(define-public libmtp
(package
(name "libmtp")
- (version "1.1.11")
+ (version "1.1.15")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libmtp/libmtp/" version
"/libmtp-" version ".tar.gz"))
(sha256
(base32
- "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m"))))
+ "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(define-public gmtp
(package
(name "gmtp")
- (version "1.3.10")
+ (version "1.3.11")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gmtp/gMTP-" version
"/gmtp-" version ".tar.gz"))
(sha256
(base32
- "0fyi3pdl2g57vr0p46ip2wwzyap3l0by7iqaqygv0yxfcs79l6xj"))))
+ "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:configure-flags
(MTP), which allows media files to be transferred to and from many portable
devices.")
(license bsd-3)))
+
+(define-public hidapi
+ (package
+ (name "hidapi")
+ (version "0.8.0-rc1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/signal11/hidapi/archive/hidapi-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0qdgyj9rgb7n0nk3ghfswrhzzknxqn4ibn3wj8g4r828pw07451w"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'bootstrap
+ (lambda _
+ (zero? (system* "autoreconf" "-vfi")))))))
+ (inputs
+ `(("libusb" ,libusb)
+ ("udev" ,eudev)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (home-page "http://www.signal11.us/oss/hidapi/")
+ (synopsis "HID API library")
+ (description
+ "HIDAPI is a library which allows an application to interface with USB and Bluetooth
+HID-Class devices.")
+ ;; HIDAPI can be used under one of three licenses.
+ (license (list gpl3
+ bsd-3
+ (non-copyleft "file://LICENSE-orig.txt")))))
+
+(define-public python-hidapi
+ (package
+ (name "python-hidapi")
+ (version "0.7.99.post21")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "hidapi" version))
+ (sha256
+ (base32
+ "15ws59zdrxahf3k7z5rcrwc4jgv1307anif8ixm2cyb9ask1mgp0"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Remove bundled libraries.
+ '(begin
+ (delete-file-recursively "hidapi")
+ #t))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-configuration
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "setup.py"
+ (("'/usr/include/libusb-1.0'")
+ (string-append "'" (assoc-ref inputs "libusb")
+ "/include/libusb-1.0'"))
+ (("'/usr/include/hidapi'")
+ (string-append "'" (assoc-ref inputs "hidapi")
+ "/include/hidapi'")))
+ #t))
+ ;; XXX Necessary because python-build-system drops the arguments.
+ (replace 'build
+ (lambda _
+ (invoke "python" "setup.py" "build" "--with-system-hidapi")))
+ (replace 'check
+ (lambda _
+ (invoke "python" "setup.py" "test" "--with-system-hidapi")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "python" "setup.py" "install" "--with-system-hidapi"
+ (string-append "--prefix=" (assoc-ref outputs "out"))
+ "--single-version-externally-managed" "--root=/"))))))
+ (inputs
+ `(("hidapi" ,hidapi)
+ ("libusb" ,libusb)
+ ("eudev" ,eudev)))
+ (native-inputs
+ `(("python-cython" ,python-cython)))
+ (home-page "https://github.com/trezor/cython-hidapi")
+ (synopsis "Cython interface to hidapi")
+ (description "This package provides a Cython interface to @code{hidapi}.")
+ ;; The library can be used under either of these licenses.
+ (license (list gpl3 bsd-3
+ (non-copyleft
+ "https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt"
+ "You are free to use cython-hidapi code for any purpose.")))))
+
+(define-public python2-hidapi
+ (package-with-python2 python-hidapi))
HCoop / jackhill / guix / guix.git / blobdiff