From c6ef948f298dcfe68942787c0ce5040105f65395 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Fri, 19 Apr 2024 09:12:41 +0300 Subject: [PATCH] package/libusbgx: bump to recent git version The current tagged version is more than 6 years old, and no new tags have been made upstream, so let's update to the latest git version. The current version contains many fixes and improvements and supports several new types of USB gadgets. The patch was a backport from upstream, so it can be dropped. Also, upstream has changed from https://github.com/libusbgx/libusbgx to https://github.com/linux-usb-gadgets/libusbgx: the former is a redirect to the latter. Signed-off-by: Alexander Shiyan Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Add-include-of-sys-sysmacro.h.patch | 98 ------------------- package/libusbgx/Config.in | 2 +- package/libusbgx/libusbgx.hash | 2 +- package/libusbgx/libusbgx.mk | 4 +- 5 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2118269003..3be4f6a1df 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -982,7 +982,6 @@ package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.pa package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch lib_patch.Upstream package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch lib_patch.Upstream package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch lib_patch.Upstream -package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch lib_patch.Upstream package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch lib_patch.Upstream package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch lib_patch.Upstream package/libwebsock/0002-fix-ssl.patch lib_patch.Upstream diff --git a/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch b/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch deleted file mode 100644 index 0f47454f7a..0000000000 --- a/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 45c14ef4d5d7ced0fbf984208de44ced6d5ed898 Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Mon, 10 Sep 2018 15:52:09 +0200 -Subject: [PATCH] libusbgx: fix build with glibc-2.28 since - is no more included by - -Since https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html sys/sysmacros.h -must be explicitly included. -Without sys/sysmacros.h and with glibc-2.28 build fails with error like: -src/.libs/libusbgx.so: undefined reference to minor' src/.libs/libusbgx.so: undefined reference tomajor' -src/.libs/libusbgx.so: undefined reference to `makedev' - -Signed-off-by: Sid Spry -Signed-off-by: Gwenhael Goavec-Merou ---- - examples/gadget-acm-ecm.c | 1 + - examples/gadget-import.c | 1 + - examples/gadget-ms.c | 1 + - examples/show-gadgets.c | 1 + - examples/show-udcs.c | 1 + - include/usbg/usbg_internal_libconfig.h | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/examples/gadget-acm-ecm.c b/examples/gadget-acm-ecm.c -index 1c5e2ca..29360da 100644 ---- a/examples/gadget-acm-ecm.c -+++ b/examples/gadget-acm-ecm.c -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/examples/gadget-import.c b/examples/gadget-import.c -index e684fdb..63df449 100644 ---- a/examples/gadget-import.c -+++ b/examples/gadget-import.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - int main(int argc, char **argv) -diff --git a/examples/gadget-ms.c b/examples/gadget-ms.c -index 478c370..a5c6681 100644 ---- a/examples/gadget-ms.c -+++ b/examples/gadget-ms.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/examples/show-gadgets.c b/examples/show-gadgets.c -index 707d448..a2a21c8 100644 ---- a/examples/show-gadgets.c -+++ b/examples/show-gadgets.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/examples/show-udcs.c b/examples/show-udcs.c -index 66e950f..2f5cc45 100644 ---- a/examples/show-udcs.c -+++ b/examples/show-udcs.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - - int main(void) -diff --git a/include/usbg/usbg_internal_libconfig.h b/include/usbg/usbg_internal_libconfig.h -index ac51758..3fa55c0 100644 ---- a/include/usbg/usbg_internal_libconfig.h -+++ b/include/usbg/usbg_internal_libconfig.h -@@ -12,6 +12,7 @@ - #ifndef USBG_INTERNAL_LIBCONFIG_H - #define USBG_INTERNAL_LIBCONFIG_H - -+#include - #include - #ifdef __cplusplus - extern "C" { --- -2.16.4 - diff --git a/package/libusbgx/Config.in b/package/libusbgx/Config.in index fcebf3cfaa..09a2b8f15e 100644 --- a/package/libusbgx/Config.in +++ b/package/libusbgx/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBUSBGX libusbgx is a C library encapsulating the kernel USB gadget-configfs userspace API functionality. - https://github.com/libusbgx/libusbgx + https://github.com/linux-usb-gadgets/libusbgx comment "libusbgx needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libusbgx/libusbgx.hash b/package/libusbgx/libusbgx.hash index dd43ec7b97..b18258978f 100644 --- a/package/libusbgx/libusbgx.hash +++ b/package/libusbgx/libusbgx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 b15abc89a0ef82c6a650cc1d58b5ba50f7ce076db392add84caabcd86c608ee2 libusbgx-0.2.0.tar.gz +sha256 d0b483d8b190a75a1f9b52d6db229de5580c78b201077361a524cf32c5aad517 libusbgx-a5bfa81017a9b2064bc449cf74f5f9d106445f62.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk index 516ad25970..03e8dff6bb 100644 --- a/package/libusbgx/libusbgx.mk +++ b/package/libusbgx/libusbgx.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUSBGX_VERSION = 0.2.0 -LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,libusbgx-v$(LIBUSBGX_VERSION)) +LIBUSBGX_VERSION = a5bfa81017a9b2064bc449cf74f5f9d106445f62 +LIBUSBGX_SITE = $(call github,linux-usb-gadgets,libusbgx,$(LIBUSBGX_VERSION)) LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig