diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-02-06 12:37:08 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-02-06 12:37:08 -0500 |
| commit | 549a4b424ab08eb3963a961d05d79f26c77371d9 (patch) | |
| tree | d0dfbee6786924a6660aea241d56b8149842723d | |
| parent | Merge pull request #8712 (diff) | |
| parent | depends: bump hidapi/libusb (diff) | |
| download | monero-549a4b424ab08eb3963a961d05d79f26c77371d9.tar.xz | |
Merge pull request #8713
eaa3aff depends: bump hidapi/libusb (tobtoht)
| -rw-r--r-- | cmake/FindLibUSB.cmake | 2 | ||||
| -rw-r--r-- | contrib/depends/funcs.mk | 5 | ||||
| -rw-r--r-- | contrib/depends/packages/hidapi.mk | 6 | ||||
| -rw-r--r-- | contrib/depends/packages/libusb.mk | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/cmake/FindLibUSB.cmake b/cmake/FindLibUSB.cmake index 7f8a11460..f780628f8 100644 --- a/cmake/FindLibUSB.cmake +++ b/cmake/FindLibUSB.cmake @@ -113,7 +113,7 @@ if ( LibUSB_FOUND ) if (APPLE OR LibUSB_VERSION_1.0.16 OR STATIC) if (APPLE) if(DEPENDS) - list(APPEND TEST_COMPILE_EXTRA_LIBRARIES "-framework Foundation -framework IOKit") + list(APPEND TEST_COMPILE_EXTRA_LIBRARIES "-framework Foundation -framework IOKit -framework Security") else() find_library(COREFOUNDATION CoreFoundation) find_library(IOKIT IOKit) diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index 804125990..66555aad7 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -143,8 +143,11 @@ $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig $(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)" $(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)" $(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)" -$(1)_autoconf=./configure --host=$($($(1)_type)_host) --disable-dependency-tracking --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" +$(1)_autoconf=./configure --host=$($($(1)_type)_host) --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" +ifneq ($(1),libusb) +$(1)_autoconf += --disable-dependency-tracking +endif ifneq ($($(1)_nm),) $(1)_autoconf += NM="$$($(1)_nm)" endif diff --git a/contrib/depends/packages/hidapi.mk b/contrib/depends/packages/hidapi.mk index 97e204f17..64935a36a 100644 --- a/contrib/depends/packages/hidapi.mk +++ b/contrib/depends/packages/hidapi.mk @@ -1,8 +1,8 @@ package=hidapi -$(package)_version=0.11.0 -$(package)_download_path=https://github.com/libusb/hidapi/archive +$(package)_version=0.13.1 +$(package)_download_path=https://github.com/libusb/hidapi/archive/refs/tags $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=391d8e52f2d6a5cf76e2b0c079cfefe25497ba1d4659131297081fc0cd744632 +$(package)_sha256_hash=476a2c9a4dc7d1fc97dd223b84338dbea3809a84caea2dcd887d9778725490e3 $(package)_linux_dependencies=libusb eudev $(package)_patches=missing_win_include.patch diff --git a/contrib/depends/packages/libusb.mk b/contrib/depends/packages/libusb.mk index 348c410a7..c1d9fe6a9 100644 --- a/contrib/depends/packages/libusb.mk +++ b/contrib/depends/packages/libusb.mk @@ -1,8 +1,8 @@ package=libusb -$(package)_version=1.0.22 -$(package)_download_path=https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-$($(package)_version)/ +$(package)_version=1.0.26 +$(package)_download_path=https://github.com/libusb/libusb/releases/download/v$($(package)_version) $(package)_file_name=$(package)-$($(package)_version).tar.bz2 -$(package)_sha256_hash=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 +$(package)_sha256_hash=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 define $(package)_preprocess_cmds autoreconf -i |