Mon May 30 16:00:14 2022 UTC ()
lensfun: updated to 0.3.3
v0.3.3
New maintenance release for the 0.3.x branch. Includes all new cameras and lenses.
(adam)
diff -r1.38 -r1.39 pkgsrc/graphics/lensfun/Makefile
diff -r1.12 -r1.13 pkgsrc/graphics/lensfun/PLIST
diff -r1.18 -r1.19 pkgsrc/graphics/lensfun/distinfo
diff -r0 -r1.1 pkgsrc/graphics/lensfun/patches/patch-apps_CMakeLists.txt
--- pkgsrc/graphics/lensfun/Makefile 2021/12/08 16:02:11 1.38
+++ pkgsrc/graphics/lensfun/Makefile 2022/05/30 16:00:14 1.39
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2021/12/08 16:02:11 adam Exp $
+# $NetBSD: Makefile,v 1.39 2022/05/30 16:00:14 adam Exp $
-DISTNAME= lensfun-0.3.2
-PKGREVISION= 4
+DISTNAME= lensfun-0.3.3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lensfun/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=lensfun/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= gdt@NetBSD.org
HOMEPAGE= https://lensfun.github.io/
@@ -14,7 +14,13 @@
USE_LANGUAGES= c c++03
USE_TOOLS+= gmake pkg-config gsed
+EGG_NAME= ${DISTNAME:C/-([^0-9])/_\1/g}
+EGG_INFODIR= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+PY_PATCHPLIST= yes
+PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR}
+
REPLACE_SH= apps/g-lensfun-update-data
+REPLACE_PYTHON+= apps/lensfun/__init__.py.in
REPLACE_PYTHON+= apps/lensfun-add-adapter
REPLACE_PYTHON+= apps/lensfun-update-data
@@ -30,4 +36,6 @@
# png: for test programs only
.include "../../graphics/png/buildlink3.mk"
.include "../../lang/python/application.mk"
+# for PYSITELIB
+.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/graphics/lensfun/PLIST 2015/12/27 12:31:53 1.12
+++ pkgsrc/graphics/lensfun/PLIST 2022/05/30 16:00:14 1.13
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST,v 1.12 2015/12/27 12:31:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/05/30 16:00:14 adam Exp $
bin/g-lensfun-update-data
bin/lensfun-add-adapter
bin/lensfun-update-data
include/lensfun/lensfun.h
lib/liblensfun.so
-lib/liblensfun.so.1
lib/liblensfun.so.${PKGVERSION}
+lib/liblensfun.so.1
lib/pkgconfig/lensfun.pc
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/lensfun/__init__.py
+${PYSITELIB}/lensfun/__init__.pyc
share/lensfun/version_1/6x6.xml
share/lensfun/version_1/actioncams.xml
share/lensfun/version_1/compact-canon.xml
@@ -27,6 +33,7 @@
share/lensfun/version_1/generic.xml
share/lensfun/version_1/mil-canon.xml
share/lensfun/version_1/mil-fujifilm.xml
+share/lensfun/version_1/mil-leica.xml
share/lensfun/version_1/mil-nikon.xml
share/lensfun/version_1/mil-olympus.xml
share/lensfun/version_1/mil-panasonic.xml
@@ -36,6 +43,7 @@
share/lensfun/version_1/mil-sigma.xml
share/lensfun/version_1/mil-sony.xml
share/lensfun/version_1/mil-tamron.xml
+share/lensfun/version_1/mil-tokina.xml
share/lensfun/version_1/mil-zeiss.xml
share/lensfun/version_1/misc.xml
share/lensfun/version_1/rf-leica.xml
--- pkgsrc/graphics/lensfun/distinfo 2021/10/26 10:46:24 1.18
+++ pkgsrc/graphics/lensfun/distinfo 2022/05/30 16:00:14 1.19
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 10:46:24 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/05/30 16:00:14 adam Exp $
-BLAKE2s (lensfun-0.3.2.tar.gz) = ad91b0dca37f2e765cfaae5537d1817ba86457f54680b488f8dabf1020784065
+BLAKE2s (lensfun-0.3.3.tar.gz) = 7509b00ef9682f062c40419988b0f6647bbfeeaa8fbb30a893b53c1b497b0829
-SHA512 (lensfun-0.3.2.tar.gz) = 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
+SHA512 (lensfun-0.3.3.tar.gz) = 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
-Size (lensfun-0.3.2.tar.gz) = 784825 bytes
+Size (lensfun-0.3.3.tar.gz) = 992432 bytes
+SHA1 (patch-apps_CMakeLists.txt) = fddae733ee78ed07b1151bd36bf4c2011e503c0a
$NetBSD: patch-apps_CMakeLists.txt,v 1.1 2022/05/30 16:00:14 adam Exp $
Find correct Python executable.
--- apps/CMakeLists.txt.orig 2022-02-22 20:49:04.000000000 +0000
+++ apps/CMakeLists.txt
@@ -21,8 +21,8 @@ ENDIF(INSTALL_HELPER_SCRIPTS)
# Inspired by http://bloerg.net/2012/11/10/cmake-and-distutils.html
-FIND_PROGRAM(PYTHON "python3")
-IF(PYTHON)
+find_package (Python3 COMPONENTS Interpreter)
+IF(Python3_FOUND)
SET(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
SET(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
SET(DEPS_IN "${CMAKE_CURRENT_SOURCE_DIR}/lensfun/__init__.py.in")
@@ -33,7 +33,7 @@ IF(PYTHON)
CONFIGURE_FILE(${DEPS_IN} ${DEPS})
ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT}
- COMMAND ${PYTHON} ${SETUP_PY} build
+ COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
DEPENDS ${DEPS_IN})
@@ -42,5 +42,5 @@ IF(PYTHON)
IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
ENDIF()
- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
+ INSTALL(CODE "execute_process(COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --root=\$ENV{DESTDIR})")
ENDIF(PYTHON)