depends: remove eudev

diff --git a/contrib/depends/packages/eudev.mk b/contrib/depends/packages/eudev.mk
deleted file mode 100644 (file)
index 7774d96..0000000
--- a/contrib/depends/packages/eudev.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-package=eudev
-$(package)_version=3.2.14
-$(package)_download_path=https://github.com/eudev-project/eudev/releases/download/v$($(package)_version)/
-$(package)_file_name=eudev-$($(package)_version).tar.gz
-$(package)_sha256_hash=8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f
-
-define $(package)_set_vars
-  $(package)_config_opts=--disable-gudev --disable-introspection --disable-hwdb --disable-manpages --disable-shared
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmd
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm lib/*.la
-endef

diff --git a/contrib/depends/packages/hidapi.mk b/contrib/depends/packages/hidapi.mk
index 19ea1cb2c4330bc4c09b45d79e4a5e8cf789bede..f10954a358fd33a757c84d16413e9c5ce4b1ff1c 100644 (file)
--- a/contrib/depends/packages/hidapi.mk
+++ b/contrib/depends/packages/hidapi.mk
@@ -3,11 +3,12 @@ $(package)_version=0.14.0
 $(package)_download_path=https://github.com/libusb/hidapi/archive/refs/tags
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd
-$(package)_linux_dependencies=libusb eudev
+$(package)_linux_dependencies=libusb
 $(package)_patches=cmake-fix-libusb.patch
 
 define $(package)_set_vars
-  $(package)_config_opts+=-DBUILD_SHARED_LIBS=OFF
+  $(package)_config_opts := -DBUILD_SHARED_LIBS=OFF
+  $(package)_config_opts += -DHIDAPI_WITH_HIDRAW=OFF
 endef
 
 define $(package)_preprocess_cmds

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index 856c1a5c63c95bcb8efec0108554b086591e2969..95cd7fd73b92b72a02ab5820591d0c7db1a14815 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -1,7 +1,7 @@
 packages := boost openssl unbound qrencode libsodium polyseed hidapi abseil protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp
 native_packages := native_qt native_abseil native_protobuf
 
-linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime wayland libffi
+linux_packages := libfuse libsquashfuse zstd appimage_runtime wayland libffi
 linux_native_packages := native_expat native_libffi native_wayland
 
 x86_64_linux_packages := flatstart

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 6e88106f22d5bc392dbed2e4dd42403ffebc27d7..f73ed071edbdfb5356b6c7550fb5e395c0c4784c 100644 (file)
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -505,7 +505,6 @@ inspecting signatures in Mach-O binaries.")
            (list
              (make-bitcoin-cross-toolchain target)
              squashfs-tools
-             gperf ;; used to build eudev in depends
              zig   ;; used to build flatstart in depends
           ))
           ((string-contains target "darwin")

diff --git a/monero b/monero
index 111b3135e40e137a75ef99da1685b0fbc47e8ec9..91498ad98c61fbf6cfde09576a469831262a579e 160000 (submodule)
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit 111b3135e40e137a75ef99da1685b0fbc47e8ec9
+Subproject commit 91498ad98c61fbf6cfde09576a469831262a579e