From nobody Wed Sep 28 08:12:32 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mcq3h6QDYz4d0hw; Wed, 28 Sep 2022 08:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mcq3h5z58z40sv; Wed, 28 Sep 2022 08:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664352752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uvc4WrE/HpAnymqU+PQ0TFg94jEfd4ZiA7x/ecWb9Sg=; b=dBiNitsqfQzSrX1SkUGF+9imxO2WFMYaTBwiMM05t0eYlePP5m0fZj+z7kF6a8wQQ3icpD oE+MKP+TIQiXTnTuPnZsirsIuBfXbd5RUk5Ub4VOTw8HhA1EGBssktKRPtVk+gufOLp0DB /eeL6FA+rIw/QzaIfCG+MOy8cphsegXkaZi9gjA4RDZ5VkTVNXpGQ3MsuCO4a+tXBAQFHz mFg4Enpz0TWQjBACRsKNQQ1dAHZGVRgMXPwJ7IcwLHxJNAWH629MpeE5CYwV/VqE/p/Khj nO/FwIUAgeB3G9T+SX+cae2kD6h6e6uxtwjgPUZyVVCVvXRYlnIh5OtdabZJVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mcq3h51jBzPm4; Wed, 28 Sep 2022 08:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28S8CWnW080476; Wed, 28 Sep 2022 08:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28S8CWBD080475; Wed, 28 Sep 2022 08:12:32 GMT (envelope-from git) Date: Wed, 28 Sep 2022 08:12:32 GMT Message-Id: <202209280812.28S8CWBD080475@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: f00462870ffc - main - graphics/lensfun: fix packaging of the Python bits, enable test suite List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f00462870ffcbdaebb11be12b42a8f58bcfead95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664352752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uvc4WrE/HpAnymqU+PQ0TFg94jEfd4ZiA7x/ecWb9Sg=; b=VMiAttiFVCcVP0H6ENPKhkl/2bsZKvA7HBNWwUrvWIlcZHB4HXrVs2CpKu79tGlhtdGe30 /jMhZppUrr935HwTnO2JUuntR2PXhUHlxtFdyXyMCrUcWKm9EKK5qNmC3Q9SpMrf16zTMr UO6+iA1lt35gvBvoB7x/Y+wMGuwXPs46tnCCx/dHOk7WbTomVzLH8Is/fds/s2JYvvlNWB tLJuZIiBlVS0eAd5W3sNx5VfCPNUwCGeHncwwKXcM2807X8NNruG1hjmWi1lLM6NPT2gm3 xKliou8kTzmSNZoPjai/2kXh4hvBfoZfTunPAH/5Xg8V4SWH2TzZpE+ws516/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664352752; a=rsa-sha256; cv=none; b=X7y+4VULA+VphMtSAeNnpY9ymyBSwF5PeTZ9w9RpbqCh/qFIG3yS2b0hsq/Q7LpnIdiRUh VrDskXyrVMb96C6bOYf9ceNmGQSG/sw47JW7CyMWG4fMF7/+wb6MSI/TMW5WTdYds/EKyO nvObWeDv4ZRrN9calAfzK2FrUpwEt9dH8RZ/tsqGDAB+XphU9u7Vll0Kct49tjU0pjAksc dLoVpBDzewBbtsTBWf2rmDV4HI41gVJ+sr33PiwATAdBmEO1op+QRwl6becT44/dz1LqTT YsWoQcQFmbdUneqnyV7+H26+DaPBwrdGHp+xXVhZqUHQ1atHgLvGeEB2FJFpyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f00462870ffcbdaebb11be12b42a8f58bcfead95 commit f00462870ffcbdaebb11be12b42a8f58bcfead95 Author: Alexey Dokuchaev AuthorDate: 2022-09-28 08:11:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-09-28 08:11:30 +0000 graphics/lensfun: fix packaging of the Python bits, enable test suite Python bits require distutils which was missing from the dependencies but often installed on user's machine, this breaking packaging. Drop redundant PYTHON_SUFFIX from the PLIST_SUB while here and enable the build of ancillary program (because why not). PR: 265753 Submitted by: Gian-Simon Purkert --- graphics/lensfun/Makefile | 22 ++++++++++++++++++---- graphics/lensfun/pkg-plist | 6 +++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index 2d048bcc4bd6..83ead2d1c5cc 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -1,6 +1,6 @@ PORTNAME= lensfun PORTVERSION= 0.3.95 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -22,19 +22,33 @@ SHEBANG_FILES= apps/lensfun-add-adapter apps/lensfun-convert-lcp \ apps/lensfun-update-data USE_GNOME= glib20 USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON +CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON -DBUILD_LENSTOOL:BOOL=ON \ + -DBUILD_TESTS:BOOL=ON MAKE_ENV+= PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= -PLIST_SUB+= PYTHON_SUFFIX=${PYTHON_SUFFIX} OPTIONS_DEFINE= SIMD PYHELPERS OPTIONS_DEFAULT= SIMD PYHELPERS OPTIONS_SUB= yes -PYHELPERS_DESC= Install database helper scripts (need Python 3) +PYHELPERS_DESC= Install database helper Python scripts SIMD_CMAKE_OFF= -DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF +PYHELPERS_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/setuptools/_distutils/core.py:devel/py-setuptools@${PY_FLAVOR} PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD} PYHELPERS_CMAKE_OFF= -DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE PYHELPERS_USES= python:3.4+ +post-patch: + @${REINPLACE_CMD} -e '/#include / { x; s/^/#include /; G; }' \ + ${WRKSRC}/tests/test_modifier_coord_centering_old.cpp \ + ${WRKSRC}/tests/test_modifier_coord_perspective_correction.cpp \ + ${WRKSRC}/tests/test_modifier_coord_perspective_correction_old.cpp \ + ${WRKSRC}/tests/test_modifier_coord_tiny_image_old.cpp \ + ${WRKSRC}/tests/test_modifier_performance.cpp \ + ${WRKSRC}/tests/test_modifier_regression.cpp \ + ${WRKSRC}/tests/test_modifier_regression_old.cpp + +do-test: + @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} + .include diff --git a/graphics/lensfun/pkg-plist b/graphics/lensfun/pkg-plist index eed26801d239..e2a3a9712842 100644 --- a/graphics/lensfun/pkg-plist +++ b/graphics/lensfun/pkg-plist @@ -2,6 +2,7 @@ %%PYHELPERS%%bin/lensfun-add-adapter %%PYHELPERS%%bin/lensfun-convert-lcp %%PYHELPERS%%bin/lensfun-update-data +bin/lenstool include/lensfun/lensfun.h lib/liblensfun.so lib/liblensfun.so.2 @@ -63,6 +64,9 @@ libdata/pkgconfig/lensfun.pc %%DATADIR%%/version_2/slr-vivitar.xml %%DATADIR%%/version_2/slr-zeiss.xml %%DATADIR%%/version_2/timestamp.txt -%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info +%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__init__.py %%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc