git: a9539de32327 - main - graphics/lensfun: unbreak the port's build against CMake 4.x
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Sep 2026 14:01:27 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a9539de32327589347e8c6e8ad7a05e8c3ea107f
commit a9539de32327589347e8c6e8ad7a05e8c3ea107f
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-09-30 13:59:36 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-09-30 13:59:36 +0000
graphics/lensfun: unbreak the port's build against CMake 4.x
While here, merge USES+=pathfix into already existing patch
to reduce the number of post-edit backups files.
PR: 298953
---
graphics/lensfun/Makefile | 2 +-
graphics/lensfun/files/patch-CMakeLists.txt | 9 +++++++++
graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt | 15 +++++++++++----
graphics/lensfun/files/patch-tests_CMakeLists.txt | 9 +++++++++
4 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 4e859df1c8ad..2cc2586f0f26 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -19,7 +19,7 @@ LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/docs/cc-by-sa-3.0.txt
LIB_DEPENDS= libpng.so:graphics/png
-USES= cmake compiler:c++11-lang gettext-runtime gnome pathfix \
+USES= cmake compiler:c++11-lang gettext-runtime gnome \
pkgconfig shebangfix
SHEBANG_FILES= apps/lensfun-add-adapter apps/lensfun-convert-lcp \
apps/lensfun-update-data
diff --git a/graphics/lensfun/files/patch-CMakeLists.txt b/graphics/lensfun/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..6168615fb2b1
--- /dev/null
+++ b/graphics/lensfun/files/patch-CMakeLists.txt
@@ -0,0 +1,9 @@
+--- CMakeLists.txt.orig 2018-06-29 10:29:17 UTC
++++ CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # require at least cmake 2.8
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR )
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8...9.9)
+
+ # path for helper modules
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake/modules")
diff --git a/graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt b/graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt
index 9a96f7f2d4fd..485b84bc9879 100644
--- a/graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt
+++ b/graphics/lensfun/files/patch-libs_lensfun_CMakeLists.txt
@@ -1,8 +1,8 @@
---- libs/lensfun/CMakeLists.txt.orig 2014-09-30 17:37:34 UTC
+--- libs/lensfun/CMakeLists.txt.orig 2018-06-29 10:29:17 UTC
+++ libs/lensfun/CMakeLists.txt
-@@ -9,6 +9,11 @@ IF(WIN32)
- LIST(APPEND LENSFUN_SRC windows/auxfun.cpp)
- ENDIF()
+@@ -11,6 +11,11 @@ SET_SOURCE_FILES_PROPERTIES(mod-color-sse2.cpp
+ SET_SOURCE_FILES_PROPERTIES(mod-color-sse2.cpp
+ PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE2_FLAGS}")
+SET_SOURCE_FILES_PROPERTIES(mod-color-sse.cpp mod-coord-sse.cpp
+ PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE_FLAGS}")
@@ -12,3 +12,10 @@
IF(BUILD_STATIC)
ADD_LIBRARY(lensfun STATIC ${LENSFUN_SRC})
ELSE()
+@@ -28,5 +33,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lensfun.pc.
+
+ # pkgconfig support
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lensfun.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc @ONLY)
+-INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
++INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig )
+
diff --git a/graphics/lensfun/files/patch-tests_CMakeLists.txt b/graphics/lensfun/files/patch-tests_CMakeLists.txt
new file mode 100644
index 000000000000..07b8b2358d47
--- /dev/null
+++ b/graphics/lensfun/files/patch-tests_CMakeLists.txt
@@ -0,0 +1,9 @@
+--- tests/CMakeLists.txt.orig 2018-06-29 10:29:17 UTC
++++ tests/CMakeLists.txt
+@@ -106,5 +106,5 @@ ADD_TEST(test_lffuzzystrcmp test_lffuzzystrcmp)
+ TARGET_LINK_LIBRARIES(test_lffuzzystrcmp lensfun ${COMMON_LIBS})
+ ADD_TEST(test_lffuzzystrcmp test_lffuzzystrcmp)
+
+-FIND_PACKAGE(PythonInterp REQUIRED)
++FIND_PACKAGE(Python REQUIRED COMPONENTS Interpreter) # cmake --help-policy CMP0148
+ ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ${CMAKE_SOURCE_DIR}/data/db)