diff options
| -rw-r--r-- | patches/libusb-1.0.21/0001-libusb-needs-librt-and-libpthread.patch | 34 | ||||
| -rw-r--r-- | patches/libusb-1.0.21/series | 1 | ||||
| -rw-r--r-- | rules/libusb.make | 5 |
3 files changed, 2 insertions, 38 deletions
diff --git a/patches/libusb-1.0.21/0001-libusb-needs-librt-and-libpthread.patch b/patches/libusb-1.0.21/0001-libusb-needs-librt-and-libpthread.patch deleted file mode 100644 index 2d0ebb560..000000000 --- a/patches/libusb-1.0.21/0001-libusb-needs-librt-and-libpthread.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 57ec2296445225a11706b1a1eaae56b37a06c9eb Mon Sep 17 00:00:00 2001 -From: Alexander Aring <alex.aring@gmail.com> -Date: Fri, 28 Mar 2014 12:04:23 +0100 -Subject: [PATCH] libusb: needs librt and libpthread - -Original commit msg from older libusb package: - -Add missing dependencies. - -20100603 rsc: The patch was closed upstream, and I don't - remember a use case any more :-( Let's keep it - here for the moment, until we have a user. -20100101 rsc: added as http://libusb.org/ticket/24 - -Signed-off-by: Alexander Aring <alex.aring@gmail.com> ---- - libusb-1.0.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libusb-1.0.pc.in b/libusb-1.0.pc.in -index aa023b3..eded053 100644 ---- a/libusb-1.0.pc.in -+++ b/libusb-1.0.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libusb-1.0 - Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace - Version: @VERSION@ --Libs: -L${libdir} -lusb-1.0 -+Libs: -L${libdir} -lusb-1.0 -lrt -lpthread - Libs.private: @LIBS@ - Cflags: -I${includedir}/libusb-1.0 --- -1.9.2 - diff --git a/patches/libusb-1.0.21/series b/patches/libusb-1.0.21/series deleted file mode 100644 index ea8d389a3..000000000 --- a/patches/libusb-1.0.21/series +++ /dev/null @@ -1 +0,0 @@ -0001-libusb-needs-librt-and-libpthread.patch diff --git a/rules/libusb.make b/rules/libusb.make index 909b0a468..e88506aa5 100644 --- a/rules/libusb.make +++ b/rules/libusb.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb # # Paths and names # -LIBUSB_VERSION := 1.0.21 -LIBUSB_MD5 := 1da9ea3c27b3858fa85c5f4466003e44 +LIBUSB_VERSION := 1.0.22 +LIBUSB_MD5 := 466267889daead47674df933cea9cacb LIBUSB := libusb-$(LIBUSB_VERSION) LIBUSB_SUFFIX := tar.bz2 LIBUSB_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX)) @@ -33,7 +33,6 @@ LIBUSB_AUTOCONF := \ --enable-shared \ --disable-static \ --disable-udev \ - --disable-usbdk \ --enable-timerfd \ --$(call ptx/endis, PTXCONF_LIBUSB_LOG)-log \ --$(call ptx/endis, PTXCONF_LIBUSB_DEBUG_LOG)-debug-log \ |