update Hugin to 0.8.0rc4.

2009-06-21 15:54:31 +00:00 · 2009-06-21 15:54:31 +00:00 · 74c96d52d7
commit 74c96d52d7
parent b654f91899
7 changed files with 27 additions and 40 deletions
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2009/06/08 20:06:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2009/06/21 15:54:31 sthen Exp $

 COMMENT =		panorama image stitcher

-DISTNAME =		hugin-0.8.0_rc3
+DISTNAME =		hugin-0.8.0_rc4
 PKGNAME =		${DISTNAME:S/_//}
 WRKDIST =		${WRKDIR}/${DISTNAME:C/_.*//}

@ -26,7 +26,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =patents
 PERMIT_DISTFILES_FTP =	Yes

-WANTLIB += GL GLU ICE SM X11 Xext c g2c m pthread stdc++ z
+WANTLIB += GL GLU ICE SM X11 Xext c m pthread stdc++ z

 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=hugin/}

@ -43,8 +43,6 @@ LIB_DEPENDS =		boost_thread-mt::devel/boost \
 			IlmImf::graphics/openexr \
 			png::graphics/png \
 			tiff::graphics/tiff \
-			blas::math/blas \
-			lapack::math/lapack \
 			wx_base,wx_base_net,wx_base_xml,wx_gtk2_adv,wx_gtk2_core,wx_gtk2_gl,wx_gtk2_html,wx_gtk2_xrc::x11/wxWidgets

 USE_X11=		Yes
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@ -1,5 +1,5 @@
-MD5 (hugin-0.8.0_rc3.tar.gz) = LjmuUvkUWkyKMxuBp68QWg==
-RMD160 (hugin-0.8.0_rc3.tar.gz) = jVIJGHQAvLctBrzrWfqOnsIEHhA=
-SHA1 (hugin-0.8.0_rc3.tar.gz) = fC9Eqx9XEePkGC6kQgEPR1DZjRs=
-SHA256 (hugin-0.8.0_rc3.tar.gz) = R6fGY5AHMsn4z2QN24n3N48h6XnBvaymR6CsaJhXLi8=
-SIZE (hugin-0.8.0_rc3.tar.gz) = 12080000
+MD5 (hugin-0.8.0_rc4.tar.gz) = uqQKpAcWlSsjagYu5sau2g==
+RMD160 (hugin-0.8.0_rc4.tar.gz) = gx4dCHMOLupzx+tT8rtQPoum3KI=
+SHA1 (hugin-0.8.0_rc4.tar.gz) = EppRUwCUe+VLWwL1w7aTZHKUlho=
+SHA256 (hugin-0.8.0_rc4.tar.gz) = zpwll3hzfHtGg2vmTX1WNGOj1S6SBYGRtUqmz/m5WaM=
+SIZE (hugin-0.8.0_rc4.tar.gz) = 12077233
--- a/graphics/hugin/patches/patch-CMakeLists_txt
+++ b/graphics/hugin/patches/patch-CMakeLists_txt
@ -1,6 +1,6 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2009/06/03 13:45:14 sthen Exp $
--- CMakeLists.txt.orig	Mon Jun  1 21:56:11 2009
-+++ CMakeLists.txt	Wed Jun  3 02:22:10 2009
+$OpenBSD: patch-CMakeLists_txt,v 1.4 2009/06/21 15:54:31 sthen Exp $
+--- CMakeLists.txt.orig	Wed Jun 17 18:48:38 2009
+++ CMakeLists.txt	Sun Jun 21 16:10:55 2009
@@ -106,6 +106,7 @@ ENDIF(WIN32)
 #  finding the wxWidgets distributions of those packages (Win32 only).
 
@ -9,7 +9,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2009/06/03 13:45:14 sthen Exp $
 FIND_PACKAGE(wxWidgets REQUIRED)
 
 # hugin requires wxwidgets 2.7.0 or above
-@@ -246,6 +247,7 @@ ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+@@ -248,6 +249,7 @@ ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 SET(HUGINDATADIR share/hugin)
 SET(DATADIR share)
 SET(BINDIR  bin)
--- a/graphics/hugin/patches/patch-CMakeModules_FindLAPACK_cmake
+++ b/graphics/hugin/patches/patch-CMakeModules_FindLAPACK_cmake
@ -1,10 +0,0 @@
-$OpenBSD: patch-CMakeModules_FindLAPACK_cmake,v 1.1 2009/06/03 13:45:14 sthen Exp $
--- CMakeModules/FindLAPACK.cmake.orig	Wed Jun  3 13:30:39 2009
-+++ CMakeModules/FindLAPACK.cmake	Wed Jun  3 13:31:16 2009
-@@ -17,5 +17,6 @@ FIND_LIBRARY(LAPACK_LIBRARIES
- 
- IF(LAPACK_LIBRARIES)
-   SET( LAPACK_FOUND "YES" )
-+  SET( LAPACK_LIBRARIES g2c blas ${LAPACK_LIBRARIES} )
- ENDIF(LAPACK_LIBRARIES)
- 
--- a/graphics/hugin/patches/patch-src_foreign_levmar_lm_h
+++ b/graphics/hugin/patches/patch-src_foreign_levmar_lm_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_foreign_levmar_lm_h,v 1.1 2009/06/21 15:54:31 sthen Exp $
+--- src/foreign/levmar/lm.h.orig	Sun Jun 21 16:11:00 2009
+++ src/foreign/levmar/lm.h	Sun Jun 21 16:11:05 2009
+@@ -20,7 +20,7 @@
+ #ifndef _LM_H_
+ #define _LM_H_
+ 
+-//#undef HAVE_LAPACK // uncomment this to force not using LAPACK
+#undef HAVE_LAPACK // uncomment this to force not using LAPACK
+ 
+ #define LINSOLVERS_RETAIN_MEMORY // comment this is if you don't want routines in Axb.c retain working memory between calls
+ 
--- a/graphics/hugin/patches/patch-src_hugin_base_algorithms_panorama_makefile_PanoramaMakefileExport_cpp
+++ b/graphics/hugin/patches/patch-src_hugin_base_algorithms_panorama_makefile_PanoramaMakefileExport_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-src_hugin_base_algorithms_panorama_makefile_PanoramaMakefileExport_cpp,v 1.2 2009/06/08 20:06:02 sthen Exp $
--- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp.orig	Fri Jun  5 23:07:30 2009
-+++ src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp	Mon Jun  8 17:58:21 2009
-@@ -763,11 +763,7 @@ void PanoramaMakefileExport::createMakefile(const Pano
-           << "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
-         // test rm
-         o << "\t@echo -n 'Checking rm...'" << endl
-#ifdef MAC_OS_X
-           << "\t@-which $(RM) > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
-#else
-          << "\t@-$(RM) --version > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
-#endif
-         o << endl;
- 
-         // ==============================
--- a/graphics/hugin/pkg/DESCR
+++ b/graphics/hugin/pkg/DESCR
@ -17,4 +17,6 @@ This package contains the following programs:
 - nona_gui, nona with a graphical progress bar.

 - autooptimiser, optimise a panorama pairwise, starting from an
-   anchor image. cmd line version of the pairwise mode in hugin
+   anchor image. cmd line version of the pairwise mode in hugin.
+
+Tutorials: http://hugin.sourceforge.net/tutorials/