Changes 2010.2.0:

It delivers some major new features, completes integration of projects from
the 2009 Google Summer of Code, and includes many general improvements.

7 files changed, 39 insertions, 52 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 4a58f8dd115..bd97a887195 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/09/15 10:28:09 adam Exp $
+# $NetBSD: Makefile,v 1.13 2010/10/19 10:33:38 adam Exp $
 
-DISTNAME=	hugin-2010.0.0
-PKGREVISION=	4
+DISTNAME=	hugin-2010.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
 
diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST
index 93febcf9a7e..f2df2a7ee3f 100644
--- a/graphics/hugin/PLIST
+++ b/graphics/hugin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/04/10 16:29:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/10/19 10:33:38 adam Exp $
 bin/PTBatcher
 bin/PTBatcherGUI
 bin/align_image_stack
@@ -15,7 +15,10 @@ bin/hugin_stitch_project
 bin/matchpoint
 bin/nona
 bin/nona_gui
+bin/pano_modify
+bin/pano_trafo
 bin/pto2mk
+bin/pto_merge
 bin/tca_correct
 bin/vig_optimize
 lib/libceleste.so
@@ -24,6 +27,8 @@ lib/libhuginANN.so
 lib/libhuginANN.so.0.0
 lib/libhuginbase.so
 lib/libhuginbase.so.0.0
+lib/libhuginbasewx.so
+lib/libhuginbasewx.so.0.0
 lib/libhuginvigraimpex.so
 lib/libhuginvigraimpex.so.0.0
 man/man1/PTBatcherGUI.1
@@ -39,7 +44,10 @@ man/man1/hugin_hdrmerge.1
 man/man1/hugin_stitch_project.1
 man/man1/nona.1
 man/man1/nona_gui.1
+man/man1/pano_modify.1
+man/man1/pano_trafo.1
 man/man1/pto2mk.1
+man/man1/pto_merge.1
 man/man1/tca_correct.1
 man/man1/vig_optimize.1
 share/applications/PTBatcherGUI.desktop
@@ -109,6 +117,7 @@ share/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_start.png
 share/hugin/xrc/data/help_en_EN/180px-Focal_length.gif
 share/hugin/xrc/data/help_en_EN/180px-LagardePont-fish.jpg
 share/hugin/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg
+share/hugin/xrc/data/help_en_EN/197px-Field-of-view.svg.png
 share/hugin/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png
 share/hugin/xrc/data/help_en_EN/200px-Ben_Architectural.jpg
 share/hugin/xrc/data/help_en_EN/200px-Ben_Equirectangular_panini.jpg
@@ -128,6 +137,7 @@ share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_crop.svg.png
 share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_drag.svg.png
 share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_identify.svg.png
 share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_photometric.svg.png
+share/hugin/xrc/data/help_en_EN/22px-Preview_layout.svg.png
 share/hugin/xrc/data/help_en_EN/22px-Show_Control_Points_Button.svg.png
 share/hugin/xrc/data/help_en_EN/24597ccab188a3598a0828c69e380228.png
 share/hugin/xrc/data/help_en_EN/250px-Cubic.jpg
@@ -143,6 +153,7 @@ share/hugin/xrc/data/help_en_EN/250px-TKS-Mmm-obliquev120-recti.png
 share/hugin/xrc/data/help_en_EN/29e2300eb2f198d830f04682f14872e2.png
 share/hugin/xrc/data/help_en_EN/3016f25d3d1249eab1305b78b0b82d3d.png
 share/hugin/xrc/data/help_en_EN/312418a7fcf9d47adc8e5683e89c58cd.png
+share/hugin/xrc/data/help_en_EN/360px-Pantheon-150x100-rect-panini.jpg
 share/hugin/xrc/data/help_en_EN/38d368a092f7d5a4d2b42bdf4d0dd89c.png
 share/hugin/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png
 share/hugin/xrc/data/help_en_EN/400px-220x120deg-panini-grid.png
@@ -280,10 +291,14 @@ share/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html
 share/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html
 share/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html
 share/hugin/xrc/data/help_en_EN/Hugin_Main_window.html
+share/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html
 share/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html
+share/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html
 share/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
 share/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html
+share/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html
 share/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html
+share/hugin/xrc/data/help_en_EN/Hugin_Trackers.html
 share/hugin/xrc/data/help_en_EN/Hugin_add_project.png
 share/hugin/xrc/data/help_en_EN/Hugin_cancel_batch.png
 share/hugin/xrc/data/help_en_EN/Hugin_center_pano.png
@@ -322,6 +337,7 @@ share/hugin/xrc/data/help_en_EN/JPEG.html
 share/hugin/xrc/data/help_en_EN/LICENCE.manual
 share/hugin/xrc/data/help_en_EN/Landscape.html
 share/hugin/xrc/data/help_en_EN/Laplacian-of-gaussian.png
+share/hugin/xrc/data/help_en_EN/Layout-small.png
 share/hugin/xrc/data/help_en_EN/Lens_correction_model.html
 share/hugin/xrc/data/help_en_EN/Lens_distortion.html
 share/hugin/xrc/data/help_en_EN/Lightprobe.html
@@ -346,6 +362,7 @@ share/hugin/xrc/data/help_en_EN/PTblender.html
 share/hugin/xrc/data/help_en_EN/PTmender.html
 share/hugin/xrc/data/help_en_EN/PTtiff2psd.html
 share/hugin/xrc/data/help_en_EN/Pano12.html
+share/hugin/xrc/data/help_en_EN/Pano_modify.html
 share/hugin/xrc/data/help_en_EN/Panoglview.html
 share/hugin/xrc/data/help_en_EN/Panoinfo.html
 share/hugin/xrc/data/help_en_EN/Panomatic.html
@@ -365,6 +382,7 @@ share/hugin/xrc/data/help_en_EN/Pitch.html
 share/hugin/xrc/data/help_en_EN/Portrait.html
 share/hugin/xrc/data/help_en_EN/Projections.html
 share/hugin/xrc/data/help_en_EN/Pto2mk.html
+share/hugin/xrc/data/help_en_EN/Pto_merge.html
 share/hugin/xrc/data/help_en_EN/QTVR.html
 share/hugin/xrc/data/help_en_EN/Qtvr2img.html
 share/hugin/xrc/data/help_en_EN/RAW.html
@@ -560,6 +578,7 @@ share/hugin/xrc/data/optimize.png
 share/hugin/xrc/data/pause.png
 share/hugin/xrc/data/preview.png
 share/hugin/xrc/data/preview_auto_update.png
+share/hugin/xrc/data/preview_layout_small.png
 share/hugin/xrc/data/preview_num_transform.png
 share/hugin/xrc/data/preview_show_all.png
 share/hugin/xrc/data/preview_show_none.png
@@ -584,13 +603,13 @@ share/hugin/xrc/lens_panel.xrc
 share/hugin/xrc/main_frame.xrc
 share/hugin/xrc/main_menu.xrc
 share/hugin/xrc/main_tool.xrc
+share/hugin/xrc/mask_editor_panel.xrc
 share/hugin/xrc/optimize_panel.xrc
 share/hugin/xrc/optimize_photo_panel.xrc
 share/hugin/xrc/pano_panel.xrc
 share/hugin/xrc/pref_dialog.xrc
 share/hugin/xrc/preview_frame.xrc
 share/hugin/xrc/reset_dialog.xrc
-share/hugin/xrc/vig_corr_dlg.xrc
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
 share/locale/bg/LC_MESSAGES/hugin.mo
 share/locale/ca_ES/LC_MESSAGES/hugin.mo
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index fe46a3dbca8..6b969097e66 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/06/13 22:44:35 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/10/19 10:33:38 adam Exp $
 
-SHA1 (hugin-2010.0.0.tar.gz) = 41eb7253aab12b913a5c9b6d9975d8652390dcb5
-RMD160 (hugin-2010.0.0.tar.gz) = e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516
-Size (hugin-2010.0.0.tar.gz) = 12085453 bytes
-SHA1 (patch-aa) = 87336d2059b3fe50346c9a806e28a1b881de011e
-SHA1 (patch-ab) = 3cf662d49f4cbfe742375d661653f25321d29aa1
-SHA1 (patch-ac) = b091312601668e0504bca85da2ce808f7c447cd8
-SHA1 (patch-ad) = 64c30359067384fa058cb675dc1b08813bdc666c
+SHA1 (hugin-2010.2.0.tar.gz) = f0676f28cd3fbebcf4086f55af7cf09566772899
+RMD160 (hugin-2010.2.0.tar.gz) = c39d279bf95cdf5686e5994030bb4eb61ba285aa
+Size (hugin-2010.2.0.tar.gz) = 12412050 bytes
+SHA1 (patch-ab) = 41542f252de828f6a798f1172894f195b6ef46c8
+SHA1 (patch-ac) = 586be6b87ec4aad3a94dede0bd2391b0735f274b
diff --git a/graphics/hugin/patches/patch-aa b/graphics/hugin/patches/patch-aa
deleted file mode 100644
index 58d8446db3c..00000000000
--- a/graphics/hugin/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2010/01/17 08:24:27 adam Exp $
-
---- src/hugin1/hugin/config_defaults.h.orig	2009-12-01 22:39:00.000000000 +0000
-+++ src/hugin1/hugin/config_defaults.h
-@@ -133,7 +133,7 @@
- 
- #endif
- 
--#elif defined unix
-+#else
- 
- #define HUGIN_PT_SCRIPTFILE                   "PT_script.txt"
- 
diff --git a/graphics/hugin/patches/patch-ab b/graphics/hugin/patches/patch-ab
index 259de989ffb..7715bbfb24c 100644
--- a/graphics/hugin/patches/patch-ab
+++ b/graphics/hugin/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2010/06/13 22:44:35 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2010/10/19 10:33:39 adam Exp $
 
---- CMakeModules/FindPNG.cmake.orig	2010-03-02 23:17:21.000000000 +0000
+--- CMakeModules/FindPNG.cmake.orig	2010-09-28 22:06:45.000000000 +0000
 +++ CMakeModules/FindPNG.cmake
-@@ -29,7 +29,7 @@ IF (ZLIB_FOUND)
- 
+@@ -33,6 +33,7 @@ IF (ZLIB_FOUND)
    find_library_with_debug(PNG_LIBRARIES
      WIN32_DEBUG_POSTFIX d
--    NAMES png libpng wxpng
-+    NAMES png14 libpng14 wxpng
-     PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+     NAMES png libpng libpng14 wxpng
++    NAMES png libpng png14 libpng14 wxpng
+     PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
    )
  
diff --git a/graphics/hugin/patches/patch-ac b/graphics/hugin/patches/patch-ac
index 68556746921..9163688dfad 100644
--- a/graphics/hugin/patches/patch-ac
+++ b/graphics/hugin/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2010/01/17 08:24:27 adam Exp $
+$NetBSD: patch-ac,v 1.3 2010/10/19 10:33:39 adam Exp $
 
---- CMakeLists.txt.orig	2009-12-01 22:39:05.000000000 +0000
+--- CMakeLists.txt.orig	2010-09-28 22:06:42.000000000 +0000
 +++ CMakeLists.txt
-@@ -283,7 +283,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STRE
- ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+@@ -319,7 +319,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STRE
+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
      SET (MANDIR "man")
  ELSE(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "")
 -    SET (MANDIR "share/man")
diff --git a/graphics/hugin/patches/patch-ad b/graphics/hugin/patches/patch-ad
deleted file mode 100644
index 034225aa88b..00000000000
--- a/graphics/hugin/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:35 wiz Exp $
-
---- src/foreign/vigra/vigra_impex/png.cxx.orig	2010-03-02 23:17:21.000000000 +0000
-+++ src/foreign/vigra/vigra_impex/png.cxx
-@@ -271,8 +271,8 @@ namespace vigra {
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
-