From 8bec347159e6ad3bb8b376ccaff8df5b5591e228 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Mon, 8 Jun 2020 12:52:56 +0200 Subject: libnfc: upgrade 1.7.1 -> 1.8.0 See full changelog https://github.com/nfc-tools/libnfc/blob/master/ChangeLog#L1 Also remove patch applied upstream Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../0001-usbbus-Include-stdint.h-for-uintX_t.patch | 24 ---------------------- meta-oe/recipes-core/libnfc/libnfc_git.bb | 8 +++----- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch diff --git a/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch b/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch deleted file mode 100644 index b8ed87aa0f..0000000000 --- a/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cb2a3991545ba9e885704226ed3e831bd5e4cb27 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 20 May 2019 22:10:05 -0700 -Subject: [PATCH] usbbus: Include stdint.h for uintX_t - -stdint.h is needed for uintX_t typedefs which are -used to replace u_intX_t in libusb API headers in the cmake files - -Upstream-Status: Submitted [https://github.com/nfc-tools/libnfc/pull/544] -Signed-off-by: Khem Raj ---- - libnfc/buses/usbbus.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/libnfc/buses/usbbus.h -+++ b/libnfc/buses/usbbus.h -@@ -35,6 +35,7 @@ - - #ifndef _WIN32 - // Under POSIX system, we use libusb (>= 0.1.12) -+#include - #include - #define USB_TIMEDOUT ETIMEDOUT - #define _usb_strerror( X ) strerror(-X) diff --git a/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-oe/recipes-core/libnfc/libnfc_git.bb index 2851ecf9fe..9e602f193b 100644 --- a/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -7,13 +7,11 @@ SECTION = "libs" inherit autotools pkgconfig -PV = "1.7.1+git${SRCPV}" +PV = "1.8.0+git${SRCPV}" S = "${WORKDIR}/git" -SRCREV = "2d4543673e9b76c02679ca8b89259659f1afd932" -SRC_URI = "git://github.com/nfc-tools/libnfc.git \ - file://0001-usbbus-Include-stdint.h-for-uintX_t.patch \ - " +SRCREV = "f02ff51449240102c27a97173dc495e8e7789046" +SRC_URI = "git://github.com/nfc-tools/libnfc.git" CFLAGS_append_libc-musl = " -D_GNU_SOURCE" DEPENDS = "libusb" -- cgit v1.2.3-54-g00ecf