From 5ce46719bc70860b744a1a4086d61416033111e0 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sat, 18 Feb 2023 14:39:02 +0800 Subject: libusb-compat: upgrade 0.1.7 -> 0.1.8 0001-usb.h-Include-sys-types.h.patch refreshed for new version Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-usb.h-Include-sys-types.h.patch | 14 ++++---- .../recipes-support/libusb/libusb-compat_0.1.7.bb | 41 ---------------------- .../recipes-support/libusb/libusb-compat_0.1.8.bb | 41 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb create mode 100644 meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch index f4f759c85e..7df44737ad 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -8,21 +8,23 @@ 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 fa0e6c6..4e88eb8 100644 +index ea62543..18b610a 100644 --- a/libusb/usb.h +++ b/libusb/usb.h -@@ -45,6 +45,8 @@ typedef unsigned __int32 uint32_t; +@@ -46,6 +46,8 @@ typedef unsigned __int32 uint32_t; #include #endif +#include + - /* - * USB spec information - * + /* On linux PATH_MAX is defined in linux/limits.h. */ + #if defined(__linux__) + #include +-- +2.34.1 + diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb deleted file mode 100644 index 5ab08f6e50..0000000000 --- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "libusb-0.1 compatibility layer for libusb1" -DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ -that aims to look, feel and behave exactly like libusb-0.1" -HOMEPAGE = "http://www.libusb.org/" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" -DEPENDS = "libusb1" - -# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), -# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. -# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power -# consumption. -PROVIDES = "libusb virtual/libusb0" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -SRC_URI = " \ - git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ - file://0001-usb.h-Include-sys-types.h.patch \ -" -SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" - -BINCONFIG = "${bindir}/libusb-config" - -inherit autotools pkgconfig binconfig-disabled lib_package - -EXTRA_OECONF = "--libdir=${base_libdir}" - -do_install:append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb new file mode 100644 index 0000000000..869e98fe51 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb @@ -0,0 +1,41 @@ +SUMMARY = "libusb-0.1 compatibility layer for libusb1" +DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ +that aims to look, feel and behave exactly like libusb-0.1" +HOMEPAGE = "http://www.libusb.org/" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" +DEPENDS = "libusb1" + +# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), +# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. +# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power +# consumption. +PROVIDES = "libusb virtual/libusb0" +BBCLASSEXTEND = "native nativesdk" + +PE = "1" + +SRC_URI = " \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ + file://0001-usb.h-Include-sys-types.h.patch \ +" +SRCREV = "88740f0fe497b473c8ef40093ab7daeebfb40eb6" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" + +BINCONFIG = "${bindir}/libusb-config" + +inherit autotools pkgconfig binconfig-disabled lib_package + +EXTRA_OECONF = "--libdir=${base_libdir}" + +do_install:append() { + install -d ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} -- cgit v1.2.3-54-g00ecf