aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2022-01-04 18:11:33 +0000
committerPiotr Kubaj <pkubaj@FreeBSD.org>2022-01-04 18:11:33 +0000
commit2c49566b3fdc86db72c9d9c76cefa16fbb7ea0f7 (patch)
tree804e38beb0f271eaa41583cc7a646a0cde2df555 /graphics
parenta8fa66ed77bcad15c3d970eff36b6740f690c916 (diff)
downloadports-2c49566b3fdc86db72c9d9c76cefa16fbb7ea0f7.tar.gz
ports-2c49566b3fdc86db72c9d9c76cefa16fbb7ea0f7.zip
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)
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libpano13/Makefile25
-rw-r--r--graphics/libpano13/distinfo6
-rw-r--r--graphics/libpano13/files/patch-CMakeLists.txt22
-rw-r--r--graphics/libpano13/pkg-plist2
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 <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
-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 <bsd.port.mk>
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