nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9167

Browse Source 
442146a depends: libusb: update to 1.0.27 (tobtoht)
This commit is contained in:
luigi1111 2024-03-07 21:22:17 -05:00
commit 1d24774b5b
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/depends/packages/libusb.mk
View File

@ -1,12 +1,11 @@
package=libusb package=libusb
$(package)_version=1.0.26 $(package)_version=1.0.27
$(package)_download_path=https://github.com/libusb/libusb/releases/download/v$($(package)_version) $(package)_download_path=https://github.com/libusb/libusb/releases/download/v$($(package)_version)
$(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 $(package)_sha256_hash=ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575
$(package)_patches=fix_osx_avail.patch
define $(package)_preprocess_cmds define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/fix_osx_avail.patch &&\ cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
autoreconf -i autoreconf -i
endef endef
@ -18,17 +17,9 @@ define $(package)_set_vars
$(package)_config_opts_freebsd=--with-pic --disable-udev $(package)_config_opts_freebsd=--with-pic --disable-udev
endef endef
ifneq ($(host_os),darwin) define $(package)_config_cmds
define $(package)_config_cmds $($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
cp -f $(BASEDIR)/config.guess config.guess &&\ endef
cp -f $(BASEDIR)/config.sub config.sub &&\
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
endef
else
define $(package)_config_cmds
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
endef
endif
define $(package)_build_cmd define $(package)_build_cmd
$(MAKE) $(MAKE)
@ -38,5 +29,6 @@ define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install $(MAKE) DESTDIR=$($(package)_staging_dir) install
endef endef
define $(package)_postprocess_cmds cp -f lib/libusb-1.0.a lib/libusb.a define $(package)_postprocess_cmds
cp -f lib/libusb-1.0.a lib/libusb.a
endef endef

12
contrib/depends/patches/libusb/fix_osx_avail.patch
View File

@ -1,12 +0,0 @@
--- a/libusb/os/darwin_usb.h 2023-03-19 12:07:53
+++ b/libusb/os/darwin_usb.h 2023-03-19 12:07:47
@@ -165,7 +165,8 @@
#define __has_builtin(x) 0 // Compatibility with non-clang compilers.
#endif
#if __has_builtin(__builtin_available)
- #define HAS_CAPTURE_DEVICE() __builtin_available(macOS 10.10, *)
+// #define HAS_CAPTURE_DEVICE() __builtin_available(macOS 10.10, *)
+ #define HAS_CAPTURE_DEVICE() 0
#else
#define HAS_CAPTURE_DEVICE() 0
#endif