diff options
Diffstat (limited to 'gnu/packages/libusb.scm')
| -rw-r--r-- | gnu/packages/libusb.scm | 103 |
1 files changed, 38 insertions, 65 deletions
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 5a5d867c60..01771dffca 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -6,10 +6,11 @@ ;;; 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, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com> +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,9 +93,9 @@ devices on various operating systems.") "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("libusb" ,libusb))) + (list libusb)) (home-page "https://libusb.info") (synopsis "Compatibility shim for libusb") (description @@ -151,7 +152,7 @@ version of libusb to run with newer libusb.") (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) #t))))) (inputs - `(("libusb" ,libusb))) + (list libusb)) (native-inputs `(("jdk" ,icedtea "jdk"))) (home-page "https://github.com/usb4java/libusb4java/") @@ -211,10 +212,7 @@ with usb4java.") (string-append "assumeUsbTestsEnabled();" line)))) #t))))) (inputs - `(("libusb4java" ,libusb4java) - ("java-commons-lang3" ,java-commons-lang3) - ("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) + (list libusb4java java-commons-lang3 java-junit java-hamcrest-core)) (home-page "http://usb4java.org/") (synopsis "USB library for Java") (description @@ -225,17 +223,17 @@ implementing @code{javax.usb} (JSR-80).") (define-public python-libusb1 (package (name "python-libusb1") - (version "1.9.3") + (version "2.0.1") (source (origin (method url-fetch) (uri (pypi-uri "libusb1" version)) (sha256 (base32 - "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0")))) + "0ikc7z7mdyr8pm0mk3ibab1hqrq4cpi9frmc3p94hsmbyzn85fnk")))) (build-system python-build-system) (arguments - `(#:modules ((srfi srfi-1) + '(#:modules ((srfi srfi-1) (guix build utils) (guix build python-build-system)) #:phases @@ -244,20 +242,18 @@ implementing @code{javax.usb} (JSR-80).") (lambda* (#:key out #:allow-other-keys) ;; Was relicensed to LGPL 2.1+, but old COPYING file still left ;; in source. Remove it so it does not get installed. - (delete-file "COPYING") - #t)) + (delete-file "COPYING"))) (add-after 'unpack 'fix-libusb-reference (lambda* (#:key inputs #:allow-other-keys) - (substitute* "usb1/libusb1.py" - (("libusb_path = ctypes.util.find_library\\(base_name\\)") + (substitute* "usb1/_libusb1.py" + (("libusb_path = ctypes\\.util\\.find_library\\(base_name\\)") (string-append "libusb_path = \"" (find (negate symbolic-link?) (find-files (assoc-ref inputs "libusb") "^libusb.*\\.so\\..*")) - "\""))) - #t))))) - (propagated-inputs `(("libusb" ,libusb))) + "\"")))))))) + (propagated-inputs (list libusb)) (home-page "https://github.com/vpelletier/python-libusb1") (synopsis "Pure-python wrapper for libusb-1.0") (description "Libusb is a library that gives applications easy access to @@ -297,7 +293,7 @@ wrapper for accessing libusb-1.0.") "\""))) #t))))) (inputs - `(("libusb" ,libusb))) + (list libusb)) (home-page "https://pyusb.github.io/pyusb/") (synopsis "Python bindings to the libusb library") (description @@ -332,10 +328,7 @@ wrapper for accessing libusb-1.0.") "50-capablerobot-usbhub.rules")) #t)))))) (propagated-inputs - `(("python-click" ,python-click) - ("python-construct" ,python-construct) - ("python-pyusb" ,python-pyusb) - ("python-pyyaml" ,python-pyyaml))) + (list python-click python-construct python-pyusb python-pyyaml)) (home-page "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") (synopsis @@ -367,13 +360,9 @@ I2C and SPI devices attached to the USB Hub.") ;; 'large.test' and 'largecmp.test'. #:parallel-tests? #f)) (inputs - `(("python" ,python))) + (list python)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("python-cython" ,python-cython))) ; to build Python bindings + (list autoconf automake libtool pkg-config python-cython)) ; to build Python bindings (home-page "https://libimobiledevice.org/") (synopsis "C library to handle Apple Property List files") (description "This package provides a small portable C library to handle @@ -394,8 +383,7 @@ Apple Property List files in binary or XML.") "084vg570g1qb506jd7axg6c080mfsmbf52v3lngzlknsaf2q0snc")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("libplist" ,libplist))) + (list pkg-config libplist)) (home-page "https://libimobiledevice.org/") (synopsis "Library to multiplex connections from and to iOS devices") (description "This package provides a client library to multiplex @@ -420,14 +408,11 @@ connections from and to iOS devices by connecting to a socket provided by a (arguments '(#:configure-flags '("PYTHON_VERSION=3"))) (propagated-inputs - `(("openssl" ,openssl) - ("libplist" ,libplist) - ("libusbmuxd" ,libusbmuxd))) + (list openssl libplist libusbmuxd)) (inputs - `(("python" ,python))) + (list python)) (native-inputs - `(("pkg-config" ,pkg-config) - ("python-cython" ,python-cython))) + (list pkg-config python-cython)) (home-page "https://libimobiledevice.org/") (synopsis "Protocol library and tools to communicate with Apple devices") (description "libimobiledevice is a software library that talks the @@ -451,10 +436,9 @@ music and video to the device.") (base32 "11wdv44qwia77sh38n36809ysaib52rwd4fvqwb5ybsbz4p70l1m")))) (inputs - `(("fuse" ,fuse) - ("libimobiledevice" ,libimobiledevice))) + (list fuse libimobiledevice)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (build-system gnu-build-system) (home-page "https://libimobiledevice.org/") (synopsis "Mount iOS devices") @@ -475,11 +459,9 @@ iOS devices and access their contents.") (base32 "17idzpxrvkbff0jpynf35df95lh7wsm8vndynp63bxib2w09gv60")))) (inputs - `(("libplist" ,libplist) - ("libusb" ,libusb) - ("libimobiledevice" ,libimobiledevice))) + (list libplist libusb libimobiledevice)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (build-system gnu-build-system) (home-page "https://libimobiledevice.org/") (synopsis "Multiplex connections over USB to an iOS device") @@ -492,22 +474,22 @@ over USB.") (define-public libmtp (package (name "libmtp") - (version "1.1.18") + (version "1.1.19") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j")))) + "0a1jlf5b2c2vylkvdd3cxjs20a96jlbrdyx7rwai5rzmcdpszd6y")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("libgcrypt" ,libgcrypt))) + (list libgcrypt)) (propagated-inputs ;; libmtp.pc refers to all these. - `(("libusb" ,libusb))) + (list libusb)) (arguments `(#:configure-flags (list "--disable-static" @@ -543,17 +525,14 @@ proposed for standardization.") '(#:configure-flags (let ((libid3tag (assoc-ref %build-inputs "libid3tag"))) (list + "CFLAGS=-fcommon" ;; libid3tag provides no .pc file, so pkg-config fails to find them. (string-append "ID3TAG_CFLAGS=-I" libid3tag "/include") (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz"))))) (inputs - `(("gtk+" ,gtk+) - ("flac" ,flac) - ("libvorbis" ,libvorbis) - ("libid3tag" ,libid3tag) - ("libmtp" ,libmtp))) + (list gtk+ flac libvorbis libid3tag libmtp)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (home-page "http://gmtp.sourceforge.net/") (synopsis "Simple graphical MTP client") (description "gMTP is a simple graphical client for the Media Transfer Protocol @@ -576,13 +555,9 @@ devices.") (base32 "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb")))) (build-system gnu-build-system) (inputs - `(("libusb" ,libusb) - ("udev" ,eudev))) + (list libusb eudev)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list autoconf automake libtool pkg-config)) (home-page "https://github.com/libusb/hidapi") (synopsis "HID API library") (description @@ -637,11 +612,9 @@ HID-Class devices.") (string-append "--prefix=" (assoc-ref outputs "out")) "--single-version-externally-managed" "--root=/")))))) (inputs - `(("hidapi" ,hidapi) - ("libusb" ,libusb) - ("eudev" ,eudev))) + (list hidapi libusb eudev)) (native-inputs - `(("python-cython" ,python-cython))) + (list 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}.") |