libusb: update to 1.0.25

This commit is contained in:
Henrik Grimler 2022-02-03 02:22:35 +01:00
parent f06a8eb5ec
commit 5c1a05bc9b
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 2 additions and 38 deletions

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libusb.info/
TERMUX_PKG_DESCRIPTION="A C library that provides generic access to USB devices"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.0.24
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.0.25
TERMUX_PKG_SRCURL=https://github.com/libusb/libusb/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=b7724c272dfc5713dce88ff717efd60f021ca5b7c8e30f08ebb2c42d2eea08ae
TERMUX_PKG_SHA256=f9c4b7dad27a6196ca9ec3c6ec7fa446194342de326c71e030eb2c480895e169
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BREAKS="libusb-dev"
TERMUX_PKG_REPLACES="libusb-dev"

View File

@ -1,35 +0,0 @@
commit e78cafbaa2692f5b6e8e8f0ff306f5826c5dd94d
Author: Mark Kuo <starryalley@gmail.com>
Date: Sun Jan 10 16:58:26 2021 +1100
linux_usbfs: Fix exit crash on Android
In commit "89b810ec Android: Add option LIBUSB_OPTION_WEAK_AUTHORITY
to support used in apk", we should also check weak_authority when
exiting the backend.
[dickens] Fixed whitespace
Closes #842
Signed-off-by: Mark Kuo <starryalley@gmail.com>
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 7175b35..4882c0f 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -415,6 +415,13 @@ static int op_init(struct libusb_context *ctx)
static void op_exit(struct libusb_context *ctx)
{
UNUSED(ctx);
+
+#ifdef __ANDROID__
+ if (weak_authority) {
+ return;
+ }
+#endif
+
usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
assert(init_count != 0);
if (!--init_count) {