From e7e00df831813e003cc56eab5e309d3f2d4363c1 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sat, 4 Jan 2025 04:31:50 +0100 Subject: [PATCH] depends: remove eudev --- cmake/FindHIDAPI.cmake | 14 +++++++++----- cmake/FindLibUSB.cmake | 2 +- contrib/depends/packages/eudev.mk | 25 ------------------------- contrib/depends/packages/hidapi.mk | 4 ++-- contrib/depends/packages/packages.mk | 2 +- contrib/guix/manifest.scm | 1 - 6 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 contrib/depends/packages/eudev.mk diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake index f56bab482..f4958cf43 100644 --- a/cmake/FindHIDAPI.cmake +++ b/cmake/FindHIDAPI.cmake @@ -41,13 +41,17 @@ if(HIDAPI_FOUND) set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}") if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux") OR ANDROID) find_library(LIBUSB-1.0_LIBRARY usb-1.0) - find_library(LIBUDEV_LIBRARY udev) if(LIBUSB-1.0_LIBRARY) set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUSB-1.0_LIBRARY}") - if(LIBUDEV_LIBRARY) - set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUDEV_LIBRARY}") - elseif(NOT ANDROID) - message(WARNING "libudev library not found, binaries may fail to link.") + + # Hidapi is built without the udev backend in depends + if (NOT DEPENDS) + find_library(LIBUDEV_LIBRARY udev) + if(LIBUDEV_LIBRARY) + set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUDEV_LIBRARY}") + elseif(NOT ANDROID) + message(WARNING "libudev library not found, binaries may fail to link.") + endif() endif() else() message(WARNING "libusb-1.0 library not found, binaries may fail to link.") diff --git a/cmake/FindLibUSB.cmake b/cmake/FindLibUSB.cmake index 647f3c656..3b698565f 100644 --- a/cmake/FindLibUSB.cmake +++ b/cmake/FindLibUSB.cmake @@ -119,7 +119,7 @@ if ( LibUSB_FOUND ) list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${LibUSB_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES ${TEST_COMPILE_EXTRA_LIBRARIES}) - if((STATIC AND UNIX AND NOT APPLE AND NOT FREEBSD) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux") OR ANDROID) + if((STATIC AND UNIX AND NOT APPLE AND NOT FREEBSD AND NOT DEPENDS) OR ANDROID) find_library(LIBUDEV_LIBRARY udev) if(LIBUDEV_LIBRARY) set(LibUSB_LIBRARIES "${LibUSB_LIBRARIES};${LIBUDEV_LIBRARY}") diff --git a/contrib/depends/packages/eudev.mk b/contrib/depends/packages/eudev.mk deleted file mode 100644 index 0cf34faab..000000000 --- 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=$(package)-$($(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) AR_FLAGS=$($(package)_arflags) -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 164456ed9..9d004b2b6 100644 --- a/contrib/depends/packages/hidapi.mk +++ b/contrib/depends/packages/hidapi.mk @@ -3,10 +3,10 @@ $(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 define $(package)_set_vars - $(package)_config_opts+=-DBUILD_SHARED_LIBS=OFF + $(package)_config_opts+=-DBUILD_SHARED_LIBS=OFF -DHIDAPI_WITH_HIDRAW=OFF endef # Remove blobs diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index a5352cfe0..f34a62237 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -20,7 +20,7 @@ packages += gtest endif linux_native_packages := -linux_packages := eudev +linux_packages := freebsd_native_packages := freebsd_base freebsd_packages := diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index f44078339..f266f690a 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -273,7 +273,6 @@ chain for " target " development.")) autoconf-2.71 ; defaults to 2.69, which does not recognize the aarch64-apple-darwin target automake pkg-config - gperf ; required to build eudev in depends cmake-minimal ;; Scripting