From 5aee7b033475d64e4917fe34e4163b503299c3c7 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 3 Jun 2009 13:45:14 +0000 Subject: [PATCH] update to 0.8.0RC2 --- graphics/hugin/Makefile | 9 +++++--- graphics/hugin/distinfo | 10 ++++----- graphics/hugin/patches/patch-CMakeLists_txt | 12 +++++------ .../patch-CMakeModules_FindLAPACK_cmake | 10 +++++++++ .../hugin/patches/patch-doc_CMakeLists_txt | 13 ++++++------ .../patches/patch-src_celeste_Utilities_cpp | 8 +++---- .../patch-src_hugin1_hugin_TextureManager_cpp | 21 +++++++++++++++++++ graphics/hugin/pkg/PFRAG.shared | 3 +-- graphics/hugin/pkg/PLIST | 12 +++++------ 9 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 graphics/hugin/patches/patch-CMakeModules_FindLAPACK_cmake create mode 100644 graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager_cpp diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 3f3149c4961..9035d86b414 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2009/05/09 19:28:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2009/06/03 13:45:14 sthen Exp $ COMMENT = panorama image stitcher -DISTNAME = hugin-0.8.0_rc1 +DISTNAME = hugin-0.8.0_rc2 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 m pthread stdc++ z +WANTLIB += GL GLU ICE SM X11 Xext c g2c m pthread stdc++ z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/} @@ -43,11 +43,14 @@ 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 MODULES += devel/cmake CONFIGURE_STYLE = cmake +# doesnt work CONFIGURE_ARGS = -DLAPACK_FOUND:Strings=NO NO_REGRESS = Yes CFLAGS += -pthread diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index 8d220fe6e27..3b3d6d2511a 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,5 +1,5 @@ -MD5 (hugin-0.8.0_rc1.tar.gz) = PLYeNJHz/WbbhT0w1+B+bA== -RMD160 (hugin-0.8.0_rc1.tar.gz) = 2QHANT/G5EygpAjKMLwhunezHnM= -SHA1 (hugin-0.8.0_rc1.tar.gz) = 3w6HE2PF5zLp2Re6CW3KFACqD2Q= -SHA256 (hugin-0.8.0_rc1.tar.gz) = +A1Un4HAtQUcla/hI+k1yBkZ2tG+eOYJao5ZSbL97Z0= -SIZE (hugin-0.8.0_rc1.tar.gz) = 11982423 +MD5 (hugin-0.8.0_rc2.tar.gz) = qLspjZE8uWV+bflpZuFjWg== +RMD160 (hugin-0.8.0_rc2.tar.gz) = SDqKOOD4X47FHNswH8R88OiZyq4= +SHA1 (hugin-0.8.0_rc2.tar.gz) = WlNXIth4dh3cdcmruhmRfYd+CsY= +SHA256 (hugin-0.8.0_rc2.tar.gz) = B+tFMMwdy8b/LSQXH1Amwof0kUZCpNI9+t9Xd15KNHg= +SIZE (hugin-0.8.0_rc2.tar.gz) = 12079695 diff --git a/graphics/hugin/patches/patch-CMakeLists_txt b/graphics/hugin/patches/patch-CMakeLists_txt index abf50129999..b5ff4bff988 100644 --- a/graphics/hugin/patches/patch-CMakeLists_txt +++ b/graphics/hugin/patches/patch-CMakeLists_txt @@ -1,15 +1,15 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.2 2009/05/09 19:28:55 sthen Exp $ ---- CMakeLists.txt.orig Mon Apr 27 19:46:05 2009 -+++ CMakeLists.txt Tue Apr 28 21:58:41 2009 +$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 @@ -106,6 +106,7 @@ ENDIF(WIN32) # finding the wxWidgets distributions of those packages (Win32 only). SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net) +SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1) FIND_PACKAGE(wxWidgets REQUIRED) - IF(NOT wxWidgets_FOUND) - MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled") -@@ -222,6 +223,7 @@ ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + + # hugin requires wxwidgets 2.7.0 or above +@@ -246,6 +247,7 @@ ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") SET(HUGINDATADIR share/hugin) SET(DATADIR share) SET(BINDIR bin) diff --git a/graphics/hugin/patches/patch-CMakeModules_FindLAPACK_cmake b/graphics/hugin/patches/patch-CMakeModules_FindLAPACK_cmake new file mode 100644 index 00000000000..614c773d4fe --- /dev/null +++ b/graphics/hugin/patches/patch-CMakeModules_FindLAPACK_cmake @@ -0,0 +1,10 @@ +$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) + diff --git a/graphics/hugin/patches/patch-doc_CMakeLists_txt b/graphics/hugin/patches/patch-doc_CMakeLists_txt index 3fea4c76884..76d8ce26094 100644 --- a/graphics/hugin/patches/patch-doc_CMakeLists_txt +++ b/graphics/hugin/patches/patch-doc_CMakeLists_txt @@ -1,12 +1,11 @@ -$OpenBSD: patch-doc_CMakeLists_txt,v 1.1.1.1 2009/04/19 11:18:40 sthen Exp $ ---- doc/CMakeLists.txt.orig Sat Apr 18 05:03:35 2009 -+++ doc/CMakeLists.txt Sat Apr 18 05:03:49 2009 -@@ -3,7 +3,7 @@ IF (WIN32) +$OpenBSD: patch-doc_CMakeLists_txt,v 1.2 2009/06/03 13:45:14 sthen Exp $ +--- doc/CMakeLists.txt.orig Mon Jun 1 21:56:11 2009 ++++ doc/CMakeLists.txt Wed Jun 3 02:32:00 2009 +@@ -3,6 +3,6 @@ IF (WIN32) INSTALL(FILES fulla.html DESTINATION doc) INSTALL(FILES nona.txt DESTINATION doc) ELSE (WIN32) --INSTALL(FILES align_image_stack.1 autooptimiser.1 fulla.1 hugin.1 hugin_hdrmerge.1 hugin_stitch_project.1 nona.1 nona_gui.1 vig_optimize.1 DESTINATION share/man/man1) -+INSTALL(FILES align_image_stack.1 autooptimiser.1 fulla.1 hugin.1 hugin_hdrmerge.1 hugin_stitch_project.1 nona.1 nona_gui.1 vig_optimize.1 DESTINATION ${MANDIR}/man1) - INSTALL(FILES nona.txt DESTINATION share/hugin) +-INSTALL(FILES align_image_stack.1 autooptimiser.1 celeste_standalone.1 fulla.1 hugin.1 hugin_hdrmerge.1 hugin_stitch_project.1 nona.1 nona_gui.1 PTBatcherGUI.1 pto2mk.1 tca_correct.1 vig_optimize.1 DESTINATION share/man/man1) ++INSTALL(FILES align_image_stack.1 autooptimiser.1 celeste_standalone.1 fulla.1 hugin.1 hugin_hdrmerge.1 hugin_stitch_project.1 nona.1 nona_gui.1 PTBatcherGUI.1 pto2mk.1 tca_correct.1 vig_optimize.1 DESTINATION ${MANDIR}/man1) ENDIF(WIN32) diff --git a/graphics/hugin/patches/patch-src_celeste_Utilities_cpp b/graphics/hugin/patches/patch-src_celeste_Utilities_cpp index 4e216eaf229..3e553a3cf4a 100644 --- a/graphics/hugin/patches/patch-src_celeste_Utilities_cpp +++ b/graphics/hugin/patches/patch-src_celeste_Utilities_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_celeste_Utilities_cpp,v 1.1.1.1 2009/04/19 11:18:40 sthen Exp $ ---- src/celeste/Utilities.cpp.orig Sat Apr 18 00:26:18 2009 -+++ src/celeste/Utilities.cpp Sat Apr 18 00:26:26 2009 -@@ -5,6 +5,7 @@ +$OpenBSD: patch-src_celeste_Utilities_cpp,v 1.2 2009/06/03 13:45:14 sthen Exp $ +--- src/celeste/Utilities.cpp.orig Mon Jun 1 21:56:10 2009 ++++ src/celeste/Utilities.cpp Wed Jun 3 02:22:10 2009 +@@ -26,6 +26,7 @@ Copyright (c) 2002-3 Adriaan Tijsseling */ #include diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager_cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager_cpp new file mode 100644 index 00000000000..917612da52a --- /dev/null +++ b/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager_cpp @@ -0,0 +1,21 @@ +$OpenBSD: patch-src_hugin1_hugin_TextureManager_cpp,v 1.1 2009/06/03 13:45:14 sthen Exp $ + +r3904 from svn; fix for slowdown of GL preview after changes made to images. + +--- src/hugin1/hugin/TextureManager.cpp.orig Mon Jun 1 21:56:11 2009 ++++ src/hugin1/hugin/TextureManager.cpp Wed Jun 3 02:25:33 2009 +@@ -370,6 +370,14 @@ void TextureManager::CheckUpdate() + // Either: 1. We haven't seen this image before + // or: 2. Our texture for this is image is the wrong size + // ...therefore we make a new one the right size: ++ // ++ // remove duplicate key if exists ++ TextureKey checkKey (img_p, &photometric_correct); ++ if (textures.find(checkKey) != textures.end()) { ++ // Already exists in map, remove it first before adding a new one ++ textures.erase(checkKey); ++ } ++ + std::pair::iterator, bool> ins; + ins = textures.insert(std::pair + (TextureKey(img_p, &photometric_correct), diff --git a/graphics/hugin/pkg/PFRAG.shared b/graphics/hugin/pkg/PFRAG.shared index 7b6667bea7a..f4dc3c0f224 100644 --- a/graphics/hugin/pkg/PFRAG.shared +++ b/graphics/hugin/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/04/19 11:18:40 sthen Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.2 2009/06/03 13:45:14 sthen Exp $ @comment lib/libceleste.so @lib lib/libceleste.so.${LIBceleste_VERSION} @comment lib/libhuginANN.so @@ -6,6 +6,5 @@ @comment lib/libhuginbase.so @lib lib/libhuginbase.so.${LIBhuginbase_VERSION} @comment lib/libhuginjhead.so -@lib lib/libhuginjhead.so.${LIBhuginjhead_VERSION} @comment lib/libhuginvigraimpex.so @lib lib/libhuginvigraimpex.so.${LIBhuginvigraimpex_VERSION} diff --git a/graphics/hugin/pkg/PLIST b/graphics/hugin/pkg/PLIST index 3174c07f25c..60968202241 100644 --- a/graphics/hugin/pkg/PLIST +++ b/graphics/hugin/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/05/09 19:28:55 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/06/03 13:45:14 sthen Exp $ %%SHARED%% @bin bin/PTBatcher @bin bin/PTBatcherGUI @@ -15,21 +15,23 @@ @bin bin/pto2mk @bin bin/tca_correct @bin bin/vig_optimize +@man man/man1/PTBatcherGUI.1 @man man/man1/align_image_stack.1 @man man/man1/autooptimiser.1 +@man man/man1/celeste_standalone.1 @man man/man1/fulla.1 @man man/man1/hugin.1 @man man/man1/hugin_hdrmerge.1 @man man/man1/hugin_stitch_project.1 @man man/man1/nona.1 @man man/man1/nona_gui.1 +@man man/man1/pto2mk.1 +@man man/man1/tca_correct.1 @man man/man1/vig_optimize.1 share/applications/PTBatcherGUI.desktop share/applications/hugin.desktop -share/applications/hugin_stitch_project.desktop share/hugin/ share/hugin/Makefile.equirect.mk -share/hugin/nona.txt share/hugin/xrc/ share/hugin/xrc/about.xrc share/hugin/xrc/assistant_panel.xrc @@ -209,7 +211,6 @@ share/hugin/xrc/data/help_en_EN/CA_tCA01.jpg share/hugin/xrc/data/help_en_EN/CA_tCA02.jpg share/hugin/xrc/data/help_en_EN/CA_tCA03.jpg share/hugin/xrc/data/help_en_EN/CCD.html -share/hugin/xrc/data/help_en_EN/CMakeLists.txt share/hugin/xrc/data/help_en_EN/Camera_response_curve.html share/hugin/xrc/data/help_en_EN/Celeste_cpeditor_post.jpg share/hugin/xrc/data/help_en_EN/Celeste_cpeditor_pre.jpg @@ -394,7 +395,6 @@ share/hugin/xrc/data/help_en_EN/hugin.hhc share/hugin/xrc/data/help_en_EN/hugin.hhk share/hugin/xrc/data/help_en_EN/hugin.hhp share/hugin/xrc/data/help_en_EN/license.html -share/hugin/xrc/data/help_en_EN/pages.txt share/hugin/xrc/data/help_it_IT/ share/hugin/xrc/data/help_it_IT/16bit_workflow_with_hugin.html share/hugin/xrc/data/help_it_IT/Aliasing.html @@ -410,7 +410,6 @@ share/hugin/xrc/data/help_it_IT/Banding.html share/hugin/xrc/data/help_it_IT/Barrel_distortion.html share/hugin/xrc/data/help_it_IT/Bracketing.html share/hugin/xrc/data/help_it_IT/CCD.html -share/hugin/xrc/data/help_it_IT/CMakeLists.txt share/hugin/xrc/data/help_it_IT/Camera_response_curve.html share/hugin/xrc/data/help_it_IT/Chromatic_aberration.html share/hugin/xrc/data/help_it_IT/Color_correct_tiff.html @@ -622,6 +621,7 @@ share/locale/sl/LC_MESSAGES/hugin.mo share/locale/sv/LC_MESSAGES/hugin.mo share/locale/uk/LC_MESSAGES/hugin.mo share/locale/zh_CN/LC_MESSAGES/hugin.mo +share/locale/zh_TW/LC_MESSAGES/hugin.mo share/mime/ share/mime/packages/ share/mime/packages/hugin.xml