Received: by mail.netbsd.org (Postfix, from userid 605) id A695F84E9E; Mon, 30 May 2022 15:59:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DF1C284E7B for ; Mon, 30 May 2022 15:59:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1ec30n6xscqa for ; Mon, 30 May 2022 15:59:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0E43E84D21 for ; Mon, 30 May 2022 15:59:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E87D4FAEB; Mon, 30 May 2022 16:00:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165392641491410" MIME-Version: 1.0 Date: Mon, 30 May 2022 16:00:14 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/graphics/lensfun To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20220530160014.E87D4FAEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165392641491410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon May 30 16:00:14 UTC 2022 Modified Files: pkgsrc/graphics/lensfun: Makefile PLIST distinfo Added Files: pkgsrc/graphics/lensfun/patches: patch-apps_CMakeLists.txt Log Message: lensfun: updated to 0.3.3 v0.3.3 New maintenance release for the 0.3.x branch. Includes all new cameras and lenses. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/lensfun/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/lensfun/PLIST cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/lensfun/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/lensfun/patches/patch-apps_CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165392641491410 Content-Disposition: inline Content-Length: 5808 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/lensfun/Makefile diff -u pkgsrc/graphics/lensfun/Makefile:1.38 pkgsrc/graphics/lensfun/Makefile:1.39 --- pkgsrc/graphics/lensfun/Makefile:1.38 Wed Dec 8 16:02:11 2021 +++ pkgsrc/graphics/lensfun/Makefile Mon May 30 16:00:14 2022 @@ -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_CMAKE= yes 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 @@ CMAKE_ARGS+= -DBUILD_FOR_SSE2=OFF # 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" Index: pkgsrc/graphics/lensfun/PLIST diff -u pkgsrc/graphics/lensfun/PLIST:1.12 pkgsrc/graphics/lensfun/PLIST:1.13 --- pkgsrc/graphics/lensfun/PLIST:1.12 Sun Dec 27 12:31:53 2015 +++ pkgsrc/graphics/lensfun/PLIST Mon May 30 16:00:14 2022 @@ -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/contax.xml 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-samyang.xml 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 Index: pkgsrc/graphics/lensfun/distinfo diff -u pkgsrc/graphics/lensfun/distinfo:1.18 pkgsrc/graphics/lensfun/distinfo:1.19 --- pkgsrc/graphics/lensfun/distinfo:1.18 Tue Oct 26 10:46:24 2021 +++ pkgsrc/graphics/lensfun/distinfo Mon May 30 16:00:14 2022 @@ -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 -SHA512 (lensfun-0.3.2.tar.gz) = 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446 -Size (lensfun-0.3.2.tar.gz) = 784825 bytes +BLAKE2s (lensfun-0.3.3.tar.gz) = 7509b00ef9682f062c40419988b0f6647bbfeeaa8fbb30a893b53c1b497b0829 +SHA512 (lensfun-0.3.3.tar.gz) = 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf +Size (lensfun-0.3.3.tar.gz) = 992432 bytes +SHA1 (patch-apps_CMakeLists.txt) = fddae733ee78ed07b1151bd36bf4c2011e503c0a Added files: Index: pkgsrc/graphics/lensfun/patches/patch-apps_CMakeLists.txt diff -u /dev/null pkgsrc/graphics/lensfun/patches/patch-apps_CMakeLists.txt:1.1 --- /dev/null Mon May 30 16:00:14 2022 +++ pkgsrc/graphics/lensfun/patches/patch-apps_CMakeLists.txt Mon May 30 16:00:14 2022 @@ -0,0 +1,33 @@ +$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) --_----------=_165392641491410--