From 70802c9b809397c195795e3d936d27e5c6857333 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Tue, 18 Nov 2025 13:51:37 +0100 Subject: [PATCH] telldus-core: fix support for CMake >= 4.0 and move to libftdi1 Add 2 trivial patch to fix support for CMake 4.0 version and use libftdi1 library instead of the old libftdi 0.x library. It's safe to use the new library version as the package already expect it to be used but somehow the CMakeFiles were never updated to actually use libftdi1 instead of libftdi. Signed-off-by: Christian Marangi --- utils/telldus-core/Makefile | 4 +-- .../130-service-switch-to-libftdi1.patch | 33 +++++++++++++++++++ ...min-version-to-3.10-to-support-CMake.patch | 24 ++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 utils/telldus-core/patches/130-service-switch-to-libftdi1.patch create mode 100644 utils/telldus-core/patches/131-CMakeLists-bump-min-version-to-3.10-to-support-CMake.patch diff --git a/utils/telldus-core/Makefile b/utils/telldus-core/Makefile index 028d6ff9f3..d5017e0ecf 100644 --- a/utils/telldus-core/Makefile +++ b/utils/telldus-core/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=telldus-core PKG_VERSION:=2.1.2 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.telldus.com/TellStick/Software/telldus-core/ @@ -40,7 +40,7 @@ define Package/telldus-core CATEGORY:=Utilities TITLE:=Telldus TellStick USB interface URL:=https://telldus.com - DEPENDS:=+confuse +libftdi +libstdcpp + DEPENDS:=+confuse +libftdi1 +libstdcpp endef define Package/telldus-core/description diff --git a/utils/telldus-core/patches/130-service-switch-to-libftdi1.patch b/utils/telldus-core/patches/130-service-switch-to-libftdi1.patch new file mode 100644 index 0000000000..47aca01350 --- /dev/null +++ b/utils/telldus-core/patches/130-service-switch-to-libftdi1.patch @@ -0,0 +1,33 @@ +From fe792646a8390d8e9a5047889a72a12813c8748a Mon Sep 17 00:00:00 2001 +From: Christian Marangi +Date: Tue, 18 Nov 2025 11:15:29 +0100 +Subject: [PATCH 1/2] service: switch to libftdi1 + +Switch to libftdi1 as libftdi 0.x is too old and currently doesn't +compile with new CMake version. + +The code happily compile with the new library version and API were +compared to make sure no regression will be caused by the version bump. + +Also this reflect the compile documentation where it's said to use +libftdi1 library. + +Signed-off-by: Christian Marangi +--- + service/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/service/CMakeLists.txt ++++ b/service/CMakeLists.txt +@@ -184,9 +184,9 @@ IF (FTDI_ENGINE STREQUAL "ftd2xx") + LIST(APPEND telldus-service_SRCS TellStick_ftd2xx.cpp ) + LIST(APPEND telldus-service_LIBRARIES ${FTD2XX_LIBRARY}) + ELSE (FTDI_ENGINE STREQUAL "ftd2xx") +- FIND_LIBRARY(FTDI_LIBRARY ftdi) ++ FIND_LIBRARY(FTDI_LIBRARY ftdi1) + INCLUDE(FindPkgConfig) +- PKG_SEARCH_MODULE(FTDI libftdi) ++ PKG_SEARCH_MODULE(FTDI libftdi1) + INCLUDE_DIRECTORIES( ${FTDI_INCLUDEDIR} ) + ADD_DEFINITIONS( -DLIBFTDI ) + LIST(APPEND telldus-service_SRCS TellStick_libftdi.cpp ) diff --git a/utils/telldus-core/patches/131-CMakeLists-bump-min-version-to-3.10-to-support-CMake.patch b/utils/telldus-core/patches/131-CMakeLists-bump-min-version-to-3.10-to-support-CMake.patch new file mode 100644 index 0000000000..ef47bdc749 --- /dev/null +++ b/utils/telldus-core/patches/131-CMakeLists-bump-min-version-to-3.10-to-support-CMake.patch @@ -0,0 +1,24 @@ +From 388c501bd55fc725e5213158179bcb8fcd4077b4 Mon Sep 17 00:00:00 2001 +From: Christian Marangi +Date: Tue, 18 Nov 2025 11:17:47 +0100 +Subject: [PATCH 2/2] CMakeLists: bump min version to 3.10 to support CMake >= + 4.0 + +New CMake version require at least 3.5 as minimum version. Bump to 3.10 +to future proof the package when also 3.10 will be required by CMake. + +Signed-off-by: Christian Marangi +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + PROJECT( telldus-core ) + +-CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 ) ++CMAKE_MINIMUM_REQUIRED( VERSION 3.10 ) + + CMAKE_POLICY(SET CMP0003 NEW) + -- 2.30.2