Attachment #230557 for bug #260819

View | Details | Raw Unified | Return to bug 260819
Collapse All | Expand All




# Created by: Vasil Dimov <vd@FreeBSD.org>

PORTNAME=	libpano13
DISTVERSION=	2.9.21
CATEGORIES=	graphics java
MASTER_SITES=	SF/panotools/${PORTNAME}/${PORTNAME}-${DISTVERSION}


LIB_DEPENDS=	libpng.so:graphics/png \
		libtiff.so:graphics/tiff

USES=		cmake:testing cpe jpeg libtool pathfix perl5 pkgconfig

USES=		cmake cpe jpeg libtool pathfix pkgconfig
CPE_VENDOR=	${PORTNAME}_project
USE_LDCONFIG=	yes
USE_PERL5=	build	# for pod2man

WRKSRC=		${WRKDIR}/libpano13-${DISTVERSION}
OPTIONS_SUB=	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
SUITESPARSE_LIB_DEPENDS= \
		libcholmod.so:math/suitesparse-cholmod \
		libspqr.so:math/suitesparse-spqr
SUITESPARSE_CMAKE_BOOL=	USE_SPARSE_LEVMAR

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/libpano13/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1631016195	1	TIMESTAMP = 1640872553
2	SHA256 (libpano13-2.9.20.tar.gz) = 3b532836c37b8cd75cd2227fd9207f7aca3fdcbbd1cce3b9749f056a10229b89	2	SHA256 (libpano13-2.9.21.tar.gz) = 79e5a1452199305e2961462720ef5941152779c127c5b96fc340d2492e633590
3	SIZE (libpano13-2.9.20.tar.gz) = 3564544	3	SIZE (libpano13-2.9.21.tar.gz) = 2801535




--- CMakeLists.txt.orig	2021-12-06 23:34:35 UTC
+++ CMakeLists.txt
@@ -333,7 +333,7 @@ INSTALL(
 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(
 	AUTHORS
 	COPYING
 	README

   COMPONENT headers
         )
 INSTALL(
@@ -342,7 +342,7 @@ INSTALL(
         doc/PTblender.readme
         doc/PTmender.readme
         doc/stitch.txt

   COMPONENT doc
         )
 
@@ -488,6 +488,3 @@ if(CPACK_BINARY_RPM)
 endif()
 
 include(CPack)
-
-enable_testing()
-add_subdirectory(tests)

Lines 20-26 include/pano13/pteditor.h Link Here

(-)b/graphics/libpano13/pkg-plist (-2 / +1 lines)
20	include/pano13/ptutils.h	20	include/pano13/ptutils.h
21	include/pano13/queryfeature.h	21	include/pano13/queryfeature.h
22	include/pano13/version.h	22	include/pano13/version.h
23	%%STATIC%%lib/libpano13.a	23	lib/libpano13.a
24	lib/libpano13.so	24	lib/libpano13.so
25	lib/libpano13.so.3	25	lib/libpano13.so.3
26	lib/libpano13.so.3.0.0	26	lib/libpano13.so.3.0.0
27	-

Return to bug 260819

Lines 1-7 Link Here

(-)b/graphics/libpano13/Makefile (-11 / +14 lines)
1	# Created by: Vasil Dimov <vd@FreeBSD.org>	1	# Created by: Vasil Dimov <vd@FreeBSD.org>
2		2
3	PORTNAME= libpano13	3	PORTNAME= libpano13
4	DISTVERSION= 2.9.20	4	DISTVERSION= 2.9.21
5	CATEGORIES= graphics java	5	CATEGORIES= graphics java
6	MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${DISTVERSION}	6	MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${DISTVERSION}
7		7
Lines 14-33 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
14	LIB_DEPENDS= libpng.so:graphics/png \	14	LIB_DEPENDS= libpng.so:graphics/png \
15	libtiff.so:graphics/tiff	15	libtiff.so:graphics/tiff
16		16
17	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_GnuTar	17	USES= cmake:testing cpe jpeg libtool pathfix perl5 pkgconfig
18
19	USES= cmake cpe jpeg libtool pathfix pkgconfig
20	CPE_VENDOR= ${PORTNAME}_project	18	CPE_VENDOR= ${PORTNAME}_project
21	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
		20	USE_PERL5= build # for pod2man
22		21
23	OPTIONS_DEFINE= DOCS JAVA STATIC	22	WRKSRC= ${WRKDIR}/libpano13-${DISTVERSION}
24	OPTIONS_SUB= yes
25		23
26	JAVA_USE= java=yes	24	OPTIONS_DEFINE= DOCS JAVA SUITESPARSE
		25	OPTIONS_DEFAULT= SUITESPARSE
		26	SUITESPARSE_DESC= Use math/suitesparse for faster operation
		27	OPTIONS_SUB= yes
		28	JAVA_USE= java=yes
27	JAVA_CMAKE_BOOL= SUPPORT_JAVA_PROGRAMS	29	JAVA_CMAKE_BOOL= SUPPORT_JAVA_PROGRAMS
28	JAVA_VARS= JAVA_OS=native	30	JAVA_VARS= JAVA_OS=native
29		31	SUITESPARSE_LIB_DEPENDS= \
30	post-install-STATIC-off:	32	libcholmod.so:math/suitesparse-cholmod \
31	${RM} ${STAGEDIR}${PREFIX}/lib/libpano13.a	33	libspqr.so:math/suitesparse-spqr
		34	SUITESPARSE_CMAKE_BOOL= USE_SPARSE_LEVMAR
32		35
33	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)b/graphics/libpano13/files/patch-CMakeLists.txt (-19 / +3 lines)
1	--- CMakeLists.txt.orig 2021-09-12 22:30:36 UTC	1	--- CMakeLists.txt.orig 2021-12-06 23:34:35 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -116,7 +116,7 @@ FIND_PACKAGE(PNG REQUIRED)	3	@@ -333,7 +333,7 @@ INSTALL(
4	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
5	INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
6
7	-set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
8	+set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} m)
9
10	#
11	# Check build type and set options accordingly
12	@@ -314,7 +314,7 @@ INSTALL(
13	AUTHORS	4	AUTHORS
14	COPYING	5	COPYING
15	README	6	README
Lines 18-24 Link Here
18	COMPONENT headers	9	COMPONENT headers
19	)	10	)
20	INSTALL(	11	INSTALL(
21	@@ -323,7 +323,7 @@ INSTALL(	12	@@ -342,7 +342,7 @@ INSTALL(
22	doc/PTblender.readme	13	doc/PTblender.readme
23	doc/PTmender.readme	14	doc/PTmender.readme
24	doc/stitch.txt	15	doc/stitch.txt
Lines 27-36 Link Here
27	COMPONENT doc	18	COMPONENT doc
28	)	19	)
29		20
30	@@ -488,6 +488,3 @@ if(CPACK_BINARY_RPM)
31	endif()
32
33	include(CPack)
34	-
35	-enable_testing()
36	-add_subdirectory(tests)