From fd92a9bd82a5f65914956d215dea3ba6eb549379 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 24 Dec 2024 10:04:06 +0100 Subject: [PATCH] depends: hidapi: update to 0.14.0 --- contrib/depends/packages/hidapi.mk | 24 ++++--------------- .../patches/hidapi/missing_win_include.patch | 21 ---------------- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 contrib/depends/patches/hidapi/missing_win_include.patch diff --git a/contrib/depends/packages/hidapi.mk b/contrib/depends/packages/hidapi.mk index 64935a36a74..54860abd3f4 100644 --- a/contrib/depends/packages/hidapi.mk +++ b/contrib/depends/packages/hidapi.mk @@ -1,27 +1,16 @@ package=hidapi -$(package)_version=0.13.1 +$(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=476a2c9a4dc7d1fc97dd223b84338dbea3809a84caea2dcd887d9778725490e3 +$(package)_sha256_hash=a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd $(package)_linux_dependencies=libusb eudev -$(package)_patches=missing_win_include.patch define $(package)_set_vars -$(package)_config_opts=--enable-static --disable-shared -$(package)_config_opts+=--prefix=$(host_prefix) -$(package)_config_opts_linux+=libudev_LIBS="-L$(host_prefix)/lib -ludev" -$(package)_config_opts_linux+=libudev_CFLAGS=-I$(host_prefix)/include -$(package)_config_opts_linux+=libusb_LIBS="-L$(host_prefix)/lib -lusb-1.0" -$(package)_config_opts_linux+=libusb_CFLAGS=-I$(host_prefix)/include/libusb-1.0 -$(package)_config_opts_linux+=--with-pic -endef - -define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/missing_win_include.patch && ./bootstrap + $(package)_config_opts+=-DBUILD_SHARED_LIBS=OFF endef define $(package)_config_cmds - $($(package)_autoconf) AR_FLAGS=$($(package)_arflags) + $($(package)_cmake) . endef define $(package)_build_cmds @@ -31,8 +20,3 @@ 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/patches/hidapi/missing_win_include.patch b/contrib/depends/patches/hidapi/missing_win_include.patch deleted file mode 100644 index 5bbe82def42..00000000000 --- a/contrib/depends/patches/hidapi/missing_win_include.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a77b066311da42ed7654e39c0356a3b951b2e296 Mon Sep 17 00:00:00 2001 -From: selsta -Date: Wed, 10 Nov 2021 02:28:54 +0100 -Subject: [PATCH] windows: add missing include for mingw32 - ---- - windows/hid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/windows/hid.c b/windows/hid.c -index 24756a4..6d8394c 100644 ---- a/windows/hid.c -+++ b/windows/hid.c -@@ -33,6 +33,7 @@ typedef LONG NTSTATUS; - #endif - - #ifdef __MINGW32__ -+#include - #include - #include - #endif