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
cvs diff -r1.38 -r1.39 pkgsrc/graphics/lensfun/Makefile (expand / switch to unified diff)

--- 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,33 +1,41 @@ @@ -1,33 +1,41 @@
1# $NetBSD: Makefile,v 1.38 2021/12/08 16:02:11 adam Exp $ 1# $NetBSD: Makefile,v 1.39 2022/05/30 16:00:14 adam Exp $
2 2
3DISTNAME= lensfun-0.3.2 3DISTNAME= lensfun-0.3.3
4PKGREVISION= 4 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lensfun/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=lensfun/}
 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= https://lensfun.github.io/ 9HOMEPAGE= https://lensfun.github.io/
10COMMENT= Library for rectifying defects introduced by photographic equipment 10COMMENT= Library for rectifying defects introduced by photographic equipment
11LICENSE= gnu-lgpl-v3 11LICENSE= gnu-lgpl-v3
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++03 14USE_LANGUAGES= c c++03
15USE_TOOLS+= gmake pkg-config gsed 15USE_TOOLS+= gmake pkg-config gsed
16 16
 17EGG_NAME= ${DISTNAME:C/-([^0-9])/_\1/g}
 18EGG_INFODIR= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 19PY_PATCHPLIST= yes
 20PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR}
 21
17REPLACE_SH= apps/g-lensfun-update-data 22REPLACE_SH= apps/g-lensfun-update-data
 23REPLACE_PYTHON+= apps/lensfun/__init__.py.in
18REPLACE_PYTHON+= apps/lensfun-add-adapter 24REPLACE_PYTHON+= apps/lensfun-add-adapter
19REPLACE_PYTHON+= apps/lensfun-update-data 25REPLACE_PYTHON+= apps/lensfun-update-data
20 26
21.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
22 28
23.if ${MACHINE_ARCH} != "x86_64" 29.if ${MACHINE_ARCH} != "x86_64"
24CMAKE_ARGS+= -DBUILD_FOR_SSE=OFF 30CMAKE_ARGS+= -DBUILD_FOR_SSE=OFF
25CMAKE_ARGS+= -DBUILD_FOR_SSE2=OFF 31CMAKE_ARGS+= -DBUILD_FOR_SSE2=OFF
26.endif 32.endif
27 33
28.include "../../devel/glib2/buildlink3.mk" 34.include "../../devel/glib2/buildlink3.mk"
29.include "../../devel/zlib/buildlink3.mk" 35.include "../../devel/zlib/buildlink3.mk"
30# png: for test programs only 36# png: for test programs only
31.include "../../graphics/png/buildlink3.mk" 37.include "../../graphics/png/buildlink3.mk"
32.include "../../lang/python/application.mk" 38.include "../../lang/python/application.mk"
 39# for PYSITELIB
 40.include "../../lang/python/extension.mk"
33.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/graphics/lensfun/PLIST (expand / switch to unified diff)

--- 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,51 +1,59 @@ @@ -1,51 +1,59 @@
1@comment $NetBSD: PLIST,v 1.12 2015/12/27 12:31:53 adam Exp $ 1@comment $NetBSD: PLIST,v 1.13 2022/05/30 16:00:14 adam Exp $
2bin/g-lensfun-update-data 2bin/g-lensfun-update-data
3bin/lensfun-add-adapter 3bin/lensfun-add-adapter
4bin/lensfun-update-data 4bin/lensfun-update-data
5include/lensfun/lensfun.h 5include/lensfun/lensfun.h
6lib/liblensfun.so 6lib/liblensfun.so
7lib/liblensfun.so.1 
8lib/liblensfun.so.${PKGVERSION} 7lib/liblensfun.so.${PKGVERSION}
 8lib/liblensfun.so.1
9lib/pkgconfig/lensfun.pc 9lib/pkgconfig/lensfun.pc
 10${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 11${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 12${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 13${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 14${PYSITELIB}/lensfun/__init__.py
 15${PYSITELIB}/lensfun/__init__.pyc
10share/lensfun/version_1/6x6.xml 16share/lensfun/version_1/6x6.xml
11share/lensfun/version_1/actioncams.xml 17share/lensfun/version_1/actioncams.xml
12share/lensfun/version_1/compact-canon.xml 18share/lensfun/version_1/compact-canon.xml
13share/lensfun/version_1/compact-casio.xml 19share/lensfun/version_1/compact-casio.xml
14share/lensfun/version_1/compact-fujifilm.xml 20share/lensfun/version_1/compact-fujifilm.xml
15share/lensfun/version_1/compact-kodak.xml 21share/lensfun/version_1/compact-kodak.xml
16share/lensfun/version_1/compact-konica-minolta.xml 22share/lensfun/version_1/compact-konica-minolta.xml
17share/lensfun/version_1/compact-leica.xml 23share/lensfun/version_1/compact-leica.xml
18share/lensfun/version_1/compact-nikon.xml 24share/lensfun/version_1/compact-nikon.xml
19share/lensfun/version_1/compact-olympus.xml 25share/lensfun/version_1/compact-olympus.xml
20share/lensfun/version_1/compact-panasonic.xml 26share/lensfun/version_1/compact-panasonic.xml
21share/lensfun/version_1/compact-pentax.xml 27share/lensfun/version_1/compact-pentax.xml
22share/lensfun/version_1/compact-ricoh.xml 28share/lensfun/version_1/compact-ricoh.xml
23share/lensfun/version_1/compact-samsung.xml 29share/lensfun/version_1/compact-samsung.xml
24share/lensfun/version_1/compact-sigma.xml 30share/lensfun/version_1/compact-sigma.xml
25share/lensfun/version_1/compact-sony.xml 31share/lensfun/version_1/compact-sony.xml
26share/lensfun/version_1/contax.xml 32share/lensfun/version_1/contax.xml
27share/lensfun/version_1/generic.xml 33share/lensfun/version_1/generic.xml
28share/lensfun/version_1/mil-canon.xml 34share/lensfun/version_1/mil-canon.xml
29share/lensfun/version_1/mil-fujifilm.xml 35share/lensfun/version_1/mil-fujifilm.xml
 36share/lensfun/version_1/mil-leica.xml
30share/lensfun/version_1/mil-nikon.xml 37share/lensfun/version_1/mil-nikon.xml
31share/lensfun/version_1/mil-olympus.xml 38share/lensfun/version_1/mil-olympus.xml
32share/lensfun/version_1/mil-panasonic.xml 39share/lensfun/version_1/mil-panasonic.xml
33share/lensfun/version_1/mil-pentax.xml 40share/lensfun/version_1/mil-pentax.xml
34share/lensfun/version_1/mil-samsung.xml 41share/lensfun/version_1/mil-samsung.xml
35share/lensfun/version_1/mil-samyang.xml 42share/lensfun/version_1/mil-samyang.xml
36share/lensfun/version_1/mil-sigma.xml 43share/lensfun/version_1/mil-sigma.xml
37share/lensfun/version_1/mil-sony.xml 44share/lensfun/version_1/mil-sony.xml
38share/lensfun/version_1/mil-tamron.xml 45share/lensfun/version_1/mil-tamron.xml
 46share/lensfun/version_1/mil-tokina.xml
39share/lensfun/version_1/mil-zeiss.xml 47share/lensfun/version_1/mil-zeiss.xml
40share/lensfun/version_1/misc.xml 48share/lensfun/version_1/misc.xml
41share/lensfun/version_1/rf-leica.xml 49share/lensfun/version_1/rf-leica.xml
42share/lensfun/version_1/slr-canon.xml 50share/lensfun/version_1/slr-canon.xml
43share/lensfun/version_1/slr-hasselblad.xml 51share/lensfun/version_1/slr-hasselblad.xml
44share/lensfun/version_1/slr-konica-minolta.xml 52share/lensfun/version_1/slr-konica-minolta.xml
45share/lensfun/version_1/slr-leica.xml 53share/lensfun/version_1/slr-leica.xml
46share/lensfun/version_1/slr-nikon.xml 54share/lensfun/version_1/slr-nikon.xml
47share/lensfun/version_1/slr-olympus.xml 55share/lensfun/version_1/slr-olympus.xml
48share/lensfun/version_1/slr-panasonic.xml 56share/lensfun/version_1/slr-panasonic.xml
49share/lensfun/version_1/slr-pentax.xml 57share/lensfun/version_1/slr-pentax.xml
50share/lensfun/version_1/slr-ricoh.xml 58share/lensfun/version_1/slr-ricoh.xml
51share/lensfun/version_1/slr-samsung.xml 59share/lensfun/version_1/slr-samsung.xml
cvs diff -r1.18 -r1.19 pkgsrc/graphics/lensfun/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.18 2021/10/26 10:46:24 nia Exp $ 1$NetBSD: distinfo,v 1.19 2022/05/30 16:00:14 adam Exp $
2 2
3BLAKE2s (lensfun-0.3.2.tar.gz) = ad91b0dca37f2e765cfaae5537d1817ba86457f54680b488f8dabf1020784065 3BLAKE2s (lensfun-0.3.3.tar.gz) = 7509b00ef9682f062c40419988b0f6647bbfeeaa8fbb30a893b53c1b497b0829
4SHA512 (lensfun-0.3.2.tar.gz) = 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446 4SHA512 (lensfun-0.3.3.tar.gz) = 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
5Size (lensfun-0.3.2.tar.gz) = 784825 bytes 5Size (lensfun-0.3.3.tar.gz) = 992432 bytes
 6SHA1 (patch-apps_CMakeLists.txt) = fddae733ee78ed07b1151bd36bf4c2011e503c0a
File Added: pkgsrc/graphics/lensfun/patches/patch-apps_CMakeLists.txt
$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)