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)
This commit is contained in:
Piotr Kubaj 2022-01-04 18:11:33 +00:00
parent a8fa66ed77
commit 2c49566b3f
4 changed files with 21 additions and 34 deletions

View File

@ -1,7 +1,7 @@
# Created by: Vasil Dimov <vd@FreeBSD.org>
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
WRKSRC= ${WRKDIR}/libpano13-${DISTVERSION}
OPTIONS_DEFINE= DOCS JAVA SUITESPARSE
OPTIONS_DEFAULT= SUITESPARSE
SUITESPARSE_DESC= Use math/suitesparse for faster operation
OPTIONS_SUB= yes
JAVA_USE= java=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 <bsd.port.mk>

View File

@ -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

View File

@ -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)

View File

@ -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