From 10790098312fc4f3b9a569867719831eb4de69cb Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Wed, 6 May 2026 16:57:14 +0000 Subject: [PATCH] package/openfpgaloader: bump to version 1.1.1 For release notes, see: https://github.com/trabucayre/openFPGALoader/releases/tag/v1.1.1 Bump openFPGALoader to latest version. Also adds a patch to fix cmake configuration when the libftdi version contains rcX. Signed-off-by: Gwenhael Goavec-Merou [Julien: - reformat patch "Upstream:" tag to fix check-package error - add link to release notes in commit log ] Signed-off-by: Julien Olivain --- ...ses-regex-to-remove-potential-rcX-in.patch | 32 +++++++++++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 4 ++- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 package/openfpgaloader/0001-CMakeLists.txt-uses-regex-to-remove-potential-rcX-in.patch diff --git a/package/openfpgaloader/0001-CMakeLists.txt-uses-regex-to-remove-potential-rcX-in.patch b/package/openfpgaloader/0001-CMakeLists.txt-uses-regex-to-remove-potential-rcX-in.patch new file mode 100644 index 0000000000..5a184a8e87 --- /dev/null +++ b/package/openfpgaloader/0001-CMakeLists.txt-uses-regex-to-remove-potential-rcX-in.patch @@ -0,0 +1,32 @@ +From ed6025645f506c8941ab245f142db701b9f9bf2a Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Wed, 6 May 2026 18:12:24 +0200 +Subject: [PATCH] CMakeLists.txt: uses regex to remove potential rcX in + LIBFTDI_VERSION_MINOR + +LIBFTDI_VERSION_XXX is used by FTDI_VERSION to adapts code according +to libftdi version. But when rcX is present in LIBFTDI_VERSION_MINOR +cmake fails with the math function. +This PR adds a REGEX to only keep numeric value and drop rcX + +Signed-off-by: Gwenhael Goavec-Merou +Upstream: https://github.com/trabucayre/openFPGALoader/commit/ed6025645f506c8941ab245f142db701b9f9bf2a +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 442327f..2bf20e1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -200,6 +200,7 @@ if (USE_PKGCONFIG) + string(REPLACE "." ";" VERSION_LIST ${LIBFTDI_VERSION}) + list(GET VERSION_LIST 0 LIBFTDI_VERSION_MAJOR) + list(GET VERSION_LIST 1 LIBFTDI_VERSION_MINOR) ++ string(REGEX REPLACE "[^0-9].*" "" LIBFTDI_VERSION_MINOR "${LIBFTDI_VERSION_MINOR}") + endif() + else() + set(LIBFTDI_LIBRARY_DIRS "") +-- +2.53.0 + diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 33f798b7d4..b95402c10f 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cf19b596e5dea21891b1be3cb9a04be7a1501926ee0919dcc5c9f1b6d3bd0a96 openfpgaloader-1.0.0.tar.gz +sha256 ca965f933c52a2a9dbb318df4d4de70fac5f095a8e64523f81036ab467a4b567 openfpgaloader-1.1.1.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 06c8b2face..ca2ef4b97b 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,12 +4,14 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 1.0.0 +OPENFPGALOADER_VERSION = 1.1.1 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE OPENFPGALOADER_DEPENDENCIES = libftdi1 zlib +OPENFPGALOADER_CONF_OPTS = "-DCMAKE_DISABLE_FIND_PACKAGE_LibFTDI1=ON" + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) OPENFPGALOADER_DEPENDENCIES += udev OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=ON