diff options
| author | tobtoht <tob@featherwallet.org> | 2024-02-13 18:27:22 +0100 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2024-02-13 19:28:42 +0100 |
| commit | 442146a5084ac2f10a438cb84a24da372eb0a73f (patch) | |
| tree | a22e4e71f8595c36ecc9d183dee6dbb6a4caaf11 | |
| parent | Merge pull request #9126 (diff) | |
| download | monero-442146a5084ac2f10a438cb84a24da372eb0a73f.tar.xz | |
depends: libusb: update to 1.0.27
| -rw-r--r-- | contrib/depends/packages/libusb.mk | 24 | ||||
| -rw-r--r-- | contrib/depends/patches/libusb/fix_osx_avail.patch | 12 |
2 files changed, 8 insertions, 28 deletions
diff --git a/contrib/depends/packages/libusb.mk b/contrib/depends/packages/libusb.mk index fb6646685..53c91134c 100644 --- a/contrib/depends/packages/libusb.mk +++ b/contrib/depends/packages/libusb.mk @@ -1,12 +1,11 @@ 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)_file_name=$(package)-$($(package)_version).tar.bz2 -$(package)_sha256_hash=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 -$(package)_patches=fix_osx_avail.patch +$(package)_sha256_hash=ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575 define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/fix_osx_avail.patch &&\ + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \ autoreconf -i endef @@ -18,17 +17,9 @@ define $(package)_set_vars $(package)_config_opts_freebsd=--with-pic --disable-udev endef -ifneq ($(host_os),darwin) - define $(package)_config_cmds - cp -f $(BASEDIR)/config.guess config.guess &&\ - 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)_config_cmds + $($(package)_autoconf) AR_FLAGS=$($(package)_arflags) +endef define $(package)_build_cmd $(MAKE) @@ -38,5 +29,6 @@ define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install 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 diff --git a/contrib/depends/patches/libusb/fix_osx_avail.patch b/contrib/depends/patches/libusb/fix_osx_avail.patch deleted file mode 100644 index 2474993f5..000000000 --- a/contrib/depends/patches/libusb/fix_osx_avail.patch +++ /dev/null @@ -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 |