From d2a28c4c3f1d2d7814672e80d24ee053cee49b1d Mon Sep 17 00:00:00 2001 From: "mykola.salomatin" Date: Fri, 19 Feb 2021 15:13:37 +0200 Subject: [MTX-3853] Update libusb to 1.0.22 from openembedded-core --- .../0001-usb.h-Include-sys-types.h.patch | 30 ------------------- recipes-core/libusb/libusb1/no-dll.patch | 19 ------------ recipes-core/libusb/libusb1_1.0.21.bb | 35 ---------------------- 3 files changed, 84 deletions(-) delete mode 100644 recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch delete mode 100644 recipes-core/libusb/libusb1/no-dll.patch delete mode 100644 recipes-core/libusb/libusb1_1.0.21.bb (limited to 'recipes-core') diff --git a/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch deleted file mode 100644 index b88440d..0000000 --- a/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 2 Apr 2015 19:18:45 -0700 -Subject: [PATCH] usb.h: Include sys/types.h - -We need the definitions for things like u_intX_t - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - libusb/usb.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..caffae2 100644 ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -31,6 +31,8 @@ - - #include - -+#include -+ - /* - * USB spec information - * --- -2.1.4 - diff --git a/recipes-core/libusb/libusb1/no-dll.patch b/recipes-core/libusb/libusb1/no-dll.patch deleted file mode 100644 index 6e6bb83..0000000 --- a/recipes-core/libusb/libusb1/no-dll.patch +++ /dev/null @@ -1,19 +0,0 @@ -As all invokes all-recursive which uses sub-makes to invoke all-am, the -resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds -the second attempt is skipped as the target already exists, but in highly -parallel builds it's likely that two makes will be building libusb-1.0.la at the -same time. - -Solve this by removing the explicit all target, which as libusb-1.0.dll isn't -built under Linux is redundant anyway. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -diff --git a/libusb/Makefile.am b/libusb/Makefile.am -index 0cab0a0..c880213 100644 ---- a/libusb/Makefile.am -+++ b/libusb/Makefile.am -@@ -1,2 +0,0 @@ --all: libusb-1.0.la libusb-1.0.dll -- diff --git a/recipes-core/libusb/libusb1_1.0.21.bb b/recipes-core/libusb/libusb1_1.0.21.bb deleted file mode 100644 index 1fefd14..0000000 --- a/recipes-core/libusb/libusb1_1.0.21.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Userspace library to access USB (version 1.0)" -HOMEPAGE = "http://libusb.sf.net" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ - file://no-dll.patch \ - " - -SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" -SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b" - -S = "${WORKDIR}/libusb-${PV}" - -inherit autotools pkgconfig - -# Don't configure udev by default since it will cause a circular -# dependecy with udev package, which depends on libusb -EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev" - -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} - -FILES_${PN} += "${base_libdir}/*.so.*" - -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- cgit v1.2.3