ports/90619: [PATCH] unbreak graphics/hugin

Marco Molteni molter at tin.it
Sun Dec 18 22:50:04 UTC 2005


>Number:         90619
>Category:       ports
>Synopsis:       [PATCH] unbreak graphics/hugin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 18 22:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Marco Molteni
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
Citello Networks
>Environment:
System: FreeBSD tortellino 7.0-CURRENT
>Description:
	<precise description of the problem (multiple lines)>
        Unbreak graphics/hugin by upping the compiler template-depth.
        While we are at it, update hugin to the latest (0.5) version.
>How-To-Repeat:
        cd /usr/ports/hugin && make
>Fix:
        Apply following patch


        
diff -u --show-c-function -ruN /usr/ports/graphics/hugin/Makefile /usr/ports/graphics/hugin.marco/Makefile
--- /usr/ports/graphics/hugin/Makefile	Sun Dec 18 17:10:13 2005
+++ /usr/ports/graphics/hugin.marco/Makefile	Sun Dec 18 22:59:43 2005
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	hugin
-PORTVERSION=	0.5.b2
-PORTREVISION=	5
+PORTVERSION=	0.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-0.5-beta2
 
 MAINTAINER=	cartola at openit.com.br
 COMMENT=	A GUI for Panorama Tools, to stitch panoramic images
@@ -28,15 +26,12 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/t
 RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
 		PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
 
-BROKEN=		Does not compile
-
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-32" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
-USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 
diff -u --show-c-function -ruN /usr/ports/graphics/hugin/distinfo /usr/ports/graphics/hugin.marco/distinfo
--- /usr/ports/graphics/hugin/distinfo	Sat Mar  5 20:26:29 2005
+++ /usr/ports/graphics/hugin.marco/distinfo	Sun Dec 18 17:44:25 2005
@@ -1,2 +1,3 @@
-MD5 (hugin-0.5-beta2.tar.bz2) = 42649638bbd6aaff8dc56f379278d12e
-SIZE (hugin-0.5-beta2.tar.bz2) = 1424575
+MD5 (hugin-0.5.tar.gz) = 18b38f5d6744831567b7fabfedb643fd
+SHA256 (hugin-0.5.tar.gz) = 28b49663ea52ff73b61453a6b397c99b704844d6147f316f961327532f9ca1fc
+SIZE (hugin-0.5.tar.gz) = 2264996
diff -u --show-c-function -ruN /usr/ports/graphics/hugin/files/patch-src-hugin-Makefile.in /usr/ports/graphics/hugin.marco/files/patch-src-hugin-Makefile.in
--- /usr/ports/graphics/hugin/files/patch-src-hugin-Makefile.in	Thu Jan  1 01:00:00 1970
+++ /usr/ports/graphics/hugin.marco/files/patch-src-hugin-Makefile.in	Sun Dec 18 23:28:37 2005
@@ -0,0 +1,10 @@
+--- src/hugin/Makefile.in.marco	Sun Dec 18 23:26:42 2005
++++ src/hugin/Makefile.in	Sun Dec 18 23:27:30 2005
+@@ -754,7 +754,6 @@
+ install-data-am: install-desktopDATA install-gnomemimeiconDATA \
+ 	install-sharedmimepackageDATA
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-exec-am: install-binPROGRAMS
+ 
diff -u --show-c-function -ruN /usr/ports/graphics/hugin/files/patch-src-include-vigra_ext-PointMatching.h /usr/ports/graphics/hugin.marco/files/patch-src-include-vigra_ext-PointMatching.h
--- /usr/ports/graphics/hugin/files/patch-src-include-vigra_ext-PointMatching.h	Sun Aug 14 15:43:22 2005
+++ /usr/ports/graphics/hugin.marco/files/patch-src-include-vigra_ext-PointMatching.h	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
---- src/include/vigra_ext/PointMatching.h.orig	Thu Aug 11 19:34:40 2005
-+++ src/include/vigra_ext/PointMatching.h	Thu Aug 11 19:48:12 2005
-@@ -33,7 +33,9 @@
- 
- // BAD: sgi stl extension
- #if defined(__GNUC__)
-+#if __GNUC__ > 2
-     #include <ext/algorithm>
-+#endif
- #elif defined(HAVE_STLport)
-     #include <stlport4/algorithm>
- #endif
-@@ -193,8 +195,13 @@
-         {
-             std::vector<SIFTFeature> randomfeat(feat1.size()*m_percent/100);
- #if defined(__GNUC__)
-+#if __GNUC__ > 2
-             __gnu_cxx::random_sample(feat1.begin(), feat1.end(),
-                                randomfeat.begin(), randomfeat.end());
-+#else
-+	    std::random_sample(feat1.begin(), feat1.end(),
-+                          randomfeat.begin(), randomfeat.end());
-+#endif
- #elif defined(HAVE_STLport)
-             _STL::random_sample(feat1.begin(), feat1.end(),
-                                randomfeat.begin(), randomfeat.end());


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list