From 34903a8a4546afe67eedba9de5d6ca23cfff3b92 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 19 May 2025 09:57:35 +0000 Subject: [PATCH] hidapi: update to 0.15.0 Includes now uptreamed patch. Revert "hidapi: allow build with cmake-4.0.0" This reverts commit d3bc779d177d889c37c67515fc024cfe59edc6a3. --- .../addons/addon-depends/hidapi/package.mk | 4 +- .../hidapi-663-build-with-cmake-4.0.0.patch | 95 ------------------- 2 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 packages/addons/addon-depends/hidapi/patches/hidapi-663-build-with-cmake-4.0.0.patch diff --git a/packages/addons/addon-depends/hidapi/package.mk b/packages/addons/addon-depends/hidapi/package.mk index bee13ef94b..fa03c4b281 100644 --- a/packages/addons/addon-depends/hidapi/package.mk +++ b/packages/addons/addon-depends/hidapi/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="hidapi" -PKG_VERSION="0.14.0" -PKG_SHA256="a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd" +PKG_VERSION="0.15.0" +PKG_SHA256="5d84dec684c27b97b921d2f3b73218cb773cf4ea915caee317ac8fc73cef8136" PKG_LICENSE="HIDAPI-orig" PKG_SITE="http://libusb.info/" PKG_URL="https://github.com/libusb/hidapi/archive/refs/tags/hidapi-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/hidapi/patches/hidapi-663-build-with-cmake-4.0.0.patch b/packages/addons/addon-depends/hidapi/patches/hidapi-663-build-with-cmake-4.0.0.patch deleted file mode 100644 index 394131641e..0000000000 --- a/packages/addons/addon-depends/hidapi/patches/hidapi-663-build-with-cmake-4.0.0.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 6a130ba36867c23eb3dcbff32a1abb7386eb2eab Mon Sep 17 00:00:00 2001 -From: Ihor Dutchak -Date: Tue, 5 Mar 2024 11:16:18 +0200 -Subject: [PATCH] Avoid CMake backward compatibility warning - -Avoid a message: -``` -Compatibility with CMake < 3.5 will be removed from a future version of CMake. - -Update the VERSION argument value or use a ... suffix to tell -CMake that the project does not need compatibility with older versions. -``` ---- - BUILD.cmake.md | 2 +- - CMakeLists.txt | 2 +- - hidtest/CMakeLists.txt | 2 +- - libusb/CMakeLists.txt | 2 +- - linux/CMakeLists.txt | 2 +- - mac/CMakeLists.txt | 2 +- - subprojects/hidapi_build_cmake/CMakeLists.txt | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/BUILD.cmake.md b/BUILD.cmake.md -index 5555fd2ea..573f910de 100644 ---- a/BUILD.cmake.md -+++ b/BUILD.cmake.md -@@ -159,7 +159,7 @@ endif() - HIDAPI can be easily used as a subdirectory of a larger CMake project: - ```cmake - # root CMakeLists.txt --cmake_minimum_required(VERSION 3.4.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.4.3...3.25 FATAL_ERROR) - - add_subdirectory(hidapi) - add_subdirectory(my_application) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b4c99be51..d7086813c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.1.3...3.25 FATAL_ERROR) - - if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - add_subdirectory(src) -diff --git a/hidtest/CMakeLists.txt b/hidtest/CMakeLists.txt -index 701a4fb91..19c50e1fb 100644 ---- a/hidtest/CMakeLists.txt -+++ b/hidtest/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.1.3...3.25 FATAL_ERROR) - project(hidtest C) - - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) -diff --git a/libusb/CMakeLists.txt b/libusb/CMakeLists.txt -index 617cd551a..4c458c569 100644 ---- a/libusb/CMakeLists.txt -+++ b/libusb/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.6.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.6.3...3.25 FATAL_ERROR) - - list(APPEND HIDAPI_PUBLIC_HEADERS "hidapi_libusb.h") - -diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt -index 0970ac3f1..9c627087f 100644 ---- a/linux/CMakeLists.txt -+++ b/linux/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.6.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.6.3...3.25 FATAL_ERROR) - - add_library(hidapi_hidraw - ${HIDAPI_PUBLIC_HEADERS} -diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt -index ccb0b91d4..0a1c1d95b 100644 ---- a/mac/CMakeLists.txt -+++ b/mac/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.4.3...3.25 FATAL_ERROR) - - list(APPEND HIDAPI_PUBLIC_HEADERS "hidapi_darwin.h") - -diff --git a/subprojects/hidapi_build_cmake/CMakeLists.txt b/subprojects/hidapi_build_cmake/CMakeLists.txt -index 80aed67d5..4586ce6a6 100644 ---- a/subprojects/hidapi_build_cmake/CMakeLists.txt -+++ b/subprojects/hidapi_build_cmake/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.1.3...3.25 FATAL_ERROR) - project(hidapi LANGUAGES C) - - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/root")