From nobody Tue Jan 04 18:17:51 2022 X-Original-To: dev-commits-ports-main@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 32CA5192995D; Tue, 4 Jan 2022 18:17:53 +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 4JT17N22Qpz3FZQ; Tue, 4 Jan 2022 18:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D6FB91D9B2; Tue, 4 Jan 2022 18:17:51 +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 204IHpXb039216; Tue, 4 Jan 2022 18:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204IHpd5039215; Tue, 4 Jan 2022 18:17:51 GMT (envelope-from git) Date: Tue, 4 Jan 2022 18:17:51 GMT Message-Id: <202201041817.204IHpd5039215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2c49566b3fdc - main - graphics/libpano13: update to 2.9.21 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c49566b3fdc86db72c9d9c76cefa16fbb7ea0f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641320272; 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=aCYEaFgPFzE81vYkU/nP9iGCkIQFE8XKI2W8D3kWY4I=; b=PAhZB9U6zICwW0XavxsoYLGK+LOiQaJswAD1GDyvuuduRwBB1zYYDM782ovDwFZR2lHVnu XqUeOyrH0TJLKBx4U64WE0A0bJA5qF9JJgR5sqK48ajiiuqqdXbsXxje+EgFqzGCo5bUGX 6KJ7SzcucEaj5kVlbpwqOY/YdHDHOhZ7HlrPR3LYPzAND8/fkQ7BTt2Hjfc0h2m4+PWe6c EILb3u+AeSF9/QFISxh38dmcEfz9S8kh9X8NKn+BfAlOi1OvMxAAjaSYxsiu7OZ+EN6m5z n/yub/KY0f1f4u+NZ1FcBLh99Rj57LI7iNb/W0fnbF8y92hKEpe3cxNAs6P+7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641320272; a=rsa-sha256; cv=none; b=p/Ogv7ylxE+funxc28V9mGz+4jpMVhGhsz2LYwLoUZkCWVPrZSse4/bI3F8YEBUg/95hBG FhTPmyaHKh9mZ0lErST/+Q8xUP8zq3Zl6WtgJ+nz+WwgOctfLaXYxqgOW+VImuDDFZHwDh dYnfRz/vBNpN73Y6fjFaWHbN3SmLuQhbMU6L0r2Dut40xVUHhwJqIOQqQeyhcLv44JwJYm tD96LjbqHnOj8LiknOD5GPrAK+hwjVtIlyN18RKAcXsCUTreeuiLEBCoNpFzXAy3kN5JYK TgrK1O6OYuvqGBREnFAtglOGuN3mosifBC9rva6DMMImziSQXiT1srIAePZJuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c49566b3fdc86db72c9d9c76cefa16fbb7ea0f7 commit 2c49566b3fdc86db72c9d9c76cefa16fbb7ea0f7 Author: Piotr Kubaj AuthorDate: 2022-01-04 18:11:33 +0000 Commit: Piotr Kubaj CommitDate: 2022-01-04 18:11:33 +0000 graphics/libpano13: update to 2.9.21 - revert unapproved changes from the 2.9.20 update - add new SUITESPARSE option - remove superseeded patches Relevant upstream changes: - new optional suitesparse dependency for improved geometric optimisation speed - the test suite is now functional again - a lot of fixes for potential crashes and safer handling of data - fix for bigendian architectures - link with libm if necessary - various installation location and content fixes Changelog: https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.21/README.txt PR: 260819 Submitted by: fuz@fuz.su (maintainer) --- graphics/libpano13/Makefile | 25 ++++++++++++++----------- graphics/libpano13/distinfo | 6 +++--- graphics/libpano13/files/patch-CMakeLists.txt | 22 +++------------------- graphics/libpano13/pkg-plist | 2 +- 4 files changed, 21 insertions(+), 34 deletions(-) diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 073e56e0e2f0..246bd09c59e3 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -1,7 +1,7 @@ # Created by: Vasil Dimov PORTNAME= libpano13 -DISTVERSION= 2.9.20 +DISTVERSION= 2.9.21 CATEGORIES= graphics java MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${DISTVERSION} @@ -14,20 +14,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_GnuTar - -USES= cmake cpe jpeg libtool pathfix pkgconfig +USES= cmake:testing cpe jpeg libtool pathfix perl5 pkgconfig CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= yes +USE_PERL5= build # for pod2man -OPTIONS_DEFINE= DOCS JAVA STATIC -OPTIONS_SUB= yes +WRKSRC= ${WRKDIR}/libpano13-${DISTVERSION} -JAVA_USE= java=yes +OPTIONS_DEFINE= DOCS JAVA SUITESPARSE +OPTIONS_DEFAULT= SUITESPARSE +SUITESPARSE_DESC= Use math/suitesparse for faster operation +OPTIONS_SUB= yes +JAVA_USE= java=yes JAVA_CMAKE_BOOL= SUPPORT_JAVA_PROGRAMS -JAVA_VARS= JAVA_OS=native - -post-install-STATIC-off: - ${RM} ${STAGEDIR}${PREFIX}/lib/libpano13.a +JAVA_VARS= JAVA_OS=native +SUITESPARSE_LIB_DEPENDS= \ + libcholmod.so:math/suitesparse-cholmod \ + libspqr.so:math/suitesparse-spqr +SUITESPARSE_CMAKE_BOOL= USE_SPARSE_LEVMAR .include diff --git a/graphics/libpano13/distinfo b/graphics/libpano13/distinfo index 4178d274f261..8dc7c0222b49 100644 --- a/graphics/libpano13/distinfo +++ b/graphics/libpano13/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631016195 -SHA256 (libpano13-2.9.20.tar.gz) = 3b532836c37b8cd75cd2227fd9207f7aca3fdcbbd1cce3b9749f056a10229b89 -SIZE (libpano13-2.9.20.tar.gz) = 3564544 +TIMESTAMP = 1640872553 +SHA256 (libpano13-2.9.21.tar.gz) = 79e5a1452199305e2961462720ef5941152779c127c5b96fc340d2492e633590 +SIZE (libpano13-2.9.21.tar.gz) = 2801535 diff --git a/graphics/libpano13/files/patch-CMakeLists.txt b/graphics/libpano13/files/patch-CMakeLists.txt index ba41816f36f7..d332057e3eb4 100644 --- a/graphics/libpano13/files/patch-CMakeLists.txt +++ b/graphics/libpano13/files/patch-CMakeLists.txt @@ -1,15 +1,6 @@ ---- CMakeLists.txt.orig 2021-09-12 22:30:36 UTC +--- CMakeLists.txt.orig 2021-12-06 23:34:35 UTC +++ CMakeLists.txt -@@ -116,7 +116,7 @@ FIND_PACKAGE(PNG REQUIRED) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) - --set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) -+set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} m) - - # - # Check build type and set options accordingly -@@ -314,7 +314,7 @@ INSTALL( +@@ -333,7 +333,7 @@ INSTALL( AUTHORS COPYING README @@ -18,7 +9,7 @@ COMPONENT headers ) INSTALL( -@@ -323,7 +323,7 @@ INSTALL( +@@ -342,7 +342,7 @@ INSTALL( doc/PTblender.readme doc/PTmender.readme doc/stitch.txt @@ -27,10 +18,3 @@ COMPONENT doc ) -@@ -488,6 +488,3 @@ if(CPACK_BINARY_RPM) - endif() - - include(CPack) -- --enable_testing() --add_subdirectory(tests) diff --git a/graphics/libpano13/pkg-plist b/graphics/libpano13/pkg-plist index a88c22af835c..77888b2540b6 100644 --- a/graphics/libpano13/pkg-plist +++ b/graphics/libpano13/pkg-plist @@ -20,7 +20,7 @@ include/pano13/pteditor.h include/pano13/ptutils.h include/pano13/queryfeature.h include/pano13/version.h -%%STATIC%%lib/libpano13.a +lib/libpano13.a lib/libpano13.so lib/libpano13.so.3 lib/libpano13.so.3.0.0