From e16546abbc2b17abe3cd5b0fd68235b3247d01db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 31 May 2026 08:21:03 +0200 Subject: [PATCH] package/lensfun: bump version to git commit 268821c024 Last release dates back to Jul 2023 with >3000 commits since then: https://github.com/lensfun/lensfun/issues/2634 Removed patch which is included in this version. Renamed CMake option PYTHON to INSTALL_PYTHON_MODULE: Upstream renamed PYTHON to PYTHONINTERP_FOUND with commit https://github.com/lensfun/lensfun/commit/824b9d36c13f97b415a94d271e35c815ea576b21 and later guarded the python code with a new CMake option INSTALL_PYTHON_MODULE which we now use. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/lensfun/0001-cmake4.patch | 29 ----------------------------- package/lensfun/lensfun.hash | 2 +- package/lensfun/lensfun.mk | 8 +++++--- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 package/lensfun/0001-cmake4.patch diff --git a/package/lensfun/0001-cmake4.patch b/package/lensfun/0001-cmake4.patch deleted file mode 100644 index d7973f4cb7..0000000000 --- a/package/lensfun/0001-cmake4.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 011de2e85813ff496a85404b30891352555de077 Mon Sep 17 00:00:00 2001 -From: Jonas -Date: Fri, 17 Feb 2023 18:26:01 +0100 -Subject: [PATCH] cmake: use FindPython3 (#1983) - -@jonas-ott Thank you for contributing! - -Upstream: https://github.com/lensfun/lensfun/commit/011de2e85813ff496a85404b30891352555de077 - -[Bernd: partial backport to version 0.3.4] -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 4 ++-- - apps/CMakeLists.txt | 55 +++++++++++++++++++++----------------------- - tests/CMakeLists.txt | 4 ++-- - 3 files changed, 30 insertions(+), 33 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ccb9976d..7bb7a6878 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ --# require at least cmake 2.8.12 --CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR ) -+# require at least cmake 3.12 -+CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR) - - # path for helper modules - set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake/modules") diff --git a/package/lensfun/lensfun.hash b/package/lensfun/lensfun.hash index 5cb4fe37cd..f73ea46e17 100644 --- a/package/lensfun/lensfun.hash +++ b/package/lensfun/lensfun.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 dafb39c08ef24a0e2abd00d05d7341b1bf1f0c38bfcd5a4c69cf5f0ecb6db112 lensfun-0.3.4.tar.gz +sha256 656fb82a0501616b4024854fc716f004cf07d28443ee09fcf436afb6722da561 lensfun-268821c02495c0ffff8332417f0d59bdbefa545d.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 docs/gpl-3.0.txt sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c docs/lgpl-3.0.txt diff --git a/package/lensfun/lensfun.mk b/package/lensfun/lensfun.mk index 59f008ce6d..d9b4faa8d5 100644 --- a/package/lensfun/lensfun.mk +++ b/package/lensfun/lensfun.mk @@ -4,8 +4,8 @@ # ################################################################################ -LENSFUN_VERSION = 0.3.4 -LENSFUN_SITE = $(call github,lensfun,lensfun,v$(LENSFUN_VERSION)) +LENSFUN_VERSION = 268821c02495c0ffff8332417f0d59bdbefa545d +LENSFUN_SITE = $(call github,lensfun,lensfun,$(LENSFUN_VERSION)) LENSFUN_LICENSE = LGPL-3.0+ (libraries), GPL-3.0+ (programs) LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt LENSFUN_INSTALL_STAGING = YES @@ -42,6 +42,8 @@ endif # Don't install helper scripts (which require python3 and gksudo). # Don't run setup.py on the host. -LENSFUN_CONF_OPTS += -DINSTALL_HELPER_SCRIPTS=OFF -DPYTHON=OFF +LENSFUN_CONF_OPTS += \ + -DINSTALL_HELPER_SCRIPTS=OFF \ + -DINSTALL_PYTHON_MODULE=OFF $(eval $(cmake-package))