Attachment 230557 Details for Bug 260819 – graphics/libpano13: update to 2.9.21

[patch] graphics/libpano13: update to 2.9.21

0001-graphics-libpano13-update-to-2.9.21.patch (text/plain), 4.55 KB, created by Robert Clausecker on 2021-12-30 15:39:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-12-30 15:39:53 UTC

Size: 4.55 KB

patch

obsolete

>From 80e5f14c27774fc6aa6e438620222f7d73f2db61 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 7 Sep 2021 15:10:42 +0200
>Subject: [PATCH 1/2] 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
>---
> 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 <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
>-- 
>2.32.0
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 260819: 230557