Sat Jan 9 21:17:37 2021 UTC ()
hugin: updated to 2020.0

Hugin 2020.0
* Fixes fast preview on HiDPI screens under GTK+3 and MacOS.
* Make fast preview screen zoomable with mouse wheel.
* Make hugin_hdrmerge aware of cropped intermediate images.
* Several improvements for command line tools (pto_var, pto_move, pto_gen, autooptimiser).
* More checks in GUI for strange user input.


(adam)
diff -r1.109 -r1.110 pkgsrc/graphics/hugin/Makefile
diff -r1.13 -r1.14 pkgsrc/graphics/hugin/PLIST
diff -r1.23 -r1.24 pkgsrc/graphics/hugin/distinfo
diff -r1.6 -r1.7 pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt
diff -r1.2 -r1.3 pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp
cvs diff -r1.109 -r1.110 pkgsrc/graphics/hugin/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/Makefile 2021/01/01 08:24:45 1.109
+++ pkgsrc/graphics/hugin/Makefile 2021/01/09 21:17:37 1.110
@@ -1,52 +1,56 @@ @@ -1,52 +1,56 @@
1# $NetBSD: Makefile,v 1.109 2021/01/01 08:24:45 ryoon Exp $ 1# $NetBSD: Makefile,v 1.110 2021/01/09 21:17:37 adam Exp $
2 2
3DISTNAME= hugin-2019.2.0 3DISTNAME= hugin-2020.0.0
4PKGREVISION= 11 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://hugin.sourceforge.net/ 9HOMEPAGE= http://hugin.sourceforge.net/
11COMMENT= Panorama photo stitcher 10COMMENT= Panorama photo stitcher
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
15 14
16DEPENDS+= p5-Image-ExifTool>=8.15:../../graphics/p5-Image-ExifTool 15DEPENDS+= p5-Image-ExifTool>=8.15:../../graphics/p5-Image-ExifTool
17 16
18USE_CMAKE= yes 17USE_CMAKE= yes
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
20USE_TOOLS+= msgfmt pkg-config 19USE_TOOLS+= msgfmt pkg-config
21CONFIGURE_ENV+= MANDIR=${PKGMANDIR} 20CONFIGURE_ENV+= MANDIR=${PKGMANDIR}
 21CONFIGURE_DIRS= ${WRKDIR}/build
 22CMAKE_ARG_PATH= ${WRKSRC}
22 23
23CMAKE_ARGS+= -DBUILD_HSI=ON 24CMAKE_ARGS+= -DBUILD_HSI=ON
24 25
25PY_PATCHPLIST= yes 26PY_PATCHPLIST= yes
26REPLACE_PYTHON+= src/hugin_script_interface/*.py 27REPLACE_PYTHON+= src/hugin_script_interface/*.py
27REPLACE_PYTHON+= src/hugin_script_interface/plugins/*.py 28REPLACE_PYTHON+= src/hugin_script_interface/plugins/*.py
28REPLACE_PYTHON+= src/hugin_script_interface/plugins-dev/*.py 29REPLACE_PYTHON+= src/hugin_script_interface/plugins-dev/*.py
29 30
30SUBST_CLASSES+= apple 31SUBST_CLASSES+= apple
31SUBST_MESSAGE.apple= Avoiding Mac OS X application bundles 32SUBST_MESSAGE.apple= Avoiding Mac OS X application bundles
32SUBST_STAGE.apple= pre-configure 33SUBST_STAGE.apple= pre-configure
33SUBST_FILES.apple= src/hugin1/hugin/CMakeLists.txt 34SUBST_FILES.apple= src/hugin1/hugin/CMakeLists.txt
34SUBST_FILES.apple+= src/hugin1/calibrate_lens/CMakeLists.txt 35SUBST_FILES.apple+= src/hugin1/calibrate_lens/CMakeLists.txt
35SUBST_FILES.apple+= src/hugin1/icpfind/CMakeLists.txt 36SUBST_FILES.apple+= src/hugin1/icpfind/CMakeLists.txt
36SUBST_FILES.apple+= src/hugin1/ptbatcher/CMakeLists.txt 37SUBST_FILES.apple+= src/hugin1/ptbatcher/CMakeLists.txt
37SUBST_FILES.apple+= src/hugin1/stitch_project/CMakeLists.txt 38SUBST_FILES.apple+= src/hugin1/stitch_project/CMakeLists.txt
38SUBST_SED.apple= -e 's,(APPLE),(ELPPA),g' 39SUBST_SED.apple= -e 's,(APPLE),(ELPPA),g'
39 40
 41post-extract:
 42 ${MKDIR} ${WRKDIR}/build
 43
40.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
41 45
42.include "../../databases/sqlite3/buildlink3.mk" 46.include "../../databases/sqlite3/buildlink3.mk"
43.include "../../devel/boost-headers/buildlink3.mk" 47.include "../../devel/boost-headers/buildlink3.mk"
44.include "../../devel/boost-libs/buildlink3.mk" 48.include "../../devel/boost-libs/buildlink3.mk"
45.include "../../devel/swig2/buildlink3.mk" 49.include "../../devel/swig2/buildlink3.mk"
46.include "../../devel/tclap/buildlink3.mk" 50.include "../../devel/tclap/buildlink3.mk"
47.include "../../graphics/exiv2/buildlink3.mk" 51.include "../../graphics/exiv2/buildlink3.mk"
48.include "../../graphics/glew/buildlink3.mk" 52.include "../../graphics/glew/buildlink3.mk"
49.if ${OPSYS} != "Darwin" 53.if ${OPSYS} != "Darwin"
50.include "../../graphics/freeglut/buildlink3.mk" 54.include "../../graphics/freeglut/buildlink3.mk"
51.endif 55.endif
52.include "../../graphics/gnome-icon-theme/buildlink3.mk" 56.include "../../graphics/gnome-icon-theme/buildlink3.mk"
cvs diff -r1.13 -r1.14 pkgsrc/graphics/hugin/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/PLIST 2020/01/03 18:15:21 1.13
+++ pkgsrc/graphics/hugin/PLIST 2021/01/09 21:17:37 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2020/01/03 18:15:21 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2021/01/09 21:17:37 adam Exp $
2bin/PTBatcherGUI 2bin/PTBatcherGUI
3bin/align_image_stack 3bin/align_image_stack
4bin/autooptimiser 4bin/autooptimiser
5bin/calibrate_lens_gui 5bin/calibrate_lens_gui
6bin/celeste_standalone 6bin/celeste_standalone
7bin/checkpto 7bin/checkpto
8bin/cpclean 8bin/cpclean
9bin/cpfind 9bin/cpfind
10bin/deghosting_mask 10bin/deghosting_mask
11bin/fulla 11bin/fulla
12bin/geocpset 12bin/geocpset
13bin/hugin 13bin/hugin
14bin/hugin_executor 14bin/hugin_executor
@@ -45,45 +45,43 @@ man/man1/align_image_stack.1 @@ -45,45 +45,43 @@ man/man1/align_image_stack.1
45man/man1/autooptimiser.1 45man/man1/autooptimiser.1
46man/man1/calibrate_lens_gui.1 46man/man1/calibrate_lens_gui.1
47man/man1/celeste_standalone.1 47man/man1/celeste_standalone.1
48man/man1/checkpto.1 48man/man1/checkpto.1
49man/man1/cpclean.1 49man/man1/cpclean.1
50man/man1/cpfind.1 50man/man1/cpfind.1
51man/man1/deghosting_mask.1 51man/man1/deghosting_mask.1
52man/man1/fulla.1 52man/man1/fulla.1
53man/man1/geocpset.1 53man/man1/geocpset.1
54man/man1/hugin.1 54man/man1/hugin.1
55man/man1/hugin_executor.1 55man/man1/hugin_executor.1
56man/man1/hugin_hdrmerge.1 56man/man1/hugin_hdrmerge.1
57man/man1/hugin_lensdb.1 57man/man1/hugin_lensdb.1
 58man/man1/hugin_stacker.1
58man/man1/hugin_stitch_project.1 59man/man1/hugin_stitch_project.1
59man/man1/icpfind.1 60man/man1/icpfind.1
60man/man1/linefind.1 61man/man1/linefind.1
61man/man1/nona.1 62man/man1/nona.1
62man/man1/pano_modify.1 63man/man1/pano_modify.1
63man/man1/pano_trafo.1 64man/man1/pano_trafo.1
64man/man1/pto_gen.1 65man/man1/pto_gen.1
65man/man1/pto_lensstack.1 66man/man1/pto_lensstack.1
66man/man1/pto_mask.1 67man/man1/pto_mask.1
67man/man1/pto_merge.1 68man/man1/pto_merge.1
68man/man1/pto_move.1 69man/man1/pto_move.1
69man/man1/pto_template.1 70man/man1/pto_template.1
70man/man1/pto_var.1 71man/man1/pto_var.1
71man/man1/tca_correct.1 72man/man1/tca_correct.1
72man/man1/verdandi.1 73man/man1/verdandi.1
73man/man1/vig_optimize.1 74man/man1/vig_optimize.1
74share/appdata/PTBatcherGUI.appdata.xml 
75share/appdata/calibrate_lens_gui.appdata.xml 
76share/appdata/hugin.appdata.xml 
77share/applications/PTBatcherGUI.desktop 75share/applications/PTBatcherGUI.desktop
78share/applications/calibrate_lens_gui.desktop 76share/applications/calibrate_lens_gui.desktop
79share/applications/hugin.desktop 77share/applications/hugin.desktop
80share/applications/pto_gen.desktop 78share/applications/pto_gen.desktop
81share/hugin/data/blended_stacks.executor 79share/hugin/data/blended_stacks.executor
82share/hugin/data/celeste.model 80share/hugin/data/celeste.model
83share/hugin/data/default.setting 81share/hugin/data/default.setting
84share/hugin/data/duallens.assistant 82share/hugin/data/duallens.assistant
85share/hugin/data/expressions.ini 83share/hugin/data/expressions.ini
86share/hugin/data/fused_layers.executor 84share/hugin/data/fused_layers.executor
87share/hugin/data/hdr_pano.executor 85share/hugin/data/hdr_pano.executor
88share/hugin/data/hugin_exiftool_copy.arg 86share/hugin/data/hugin_exiftool_copy.arg
89share/hugin/data/hugin_exiftool_final_example.arg 87share/hugin/data/hugin_exiftool_final_example.arg
@@ -555,27 +553,27 @@ share/hugin/xrc/images_panel.xrc @@ -555,27 +553,27 @@ share/hugin/xrc/images_panel.xrc
555share/hugin/xrc/import_raw_dialog.xrc 553share/hugin/xrc/import_raw_dialog.xrc
556share/hugin/xrc/lenscal_frame.xrc 554share/hugin/xrc/lenscal_frame.xrc
557share/hugin/xrc/lensdb_dialogs.xrc 555share/hugin/xrc/lensdb_dialogs.xrc
558share/hugin/xrc/main_frame.xrc 556share/hugin/xrc/main_frame.xrc
559share/hugin/xrc/main_menu.xrc 557share/hugin/xrc/main_menu.xrc
560share/hugin/xrc/main_tool.xrc 558share/hugin/xrc/main_tool.xrc
561share/hugin/xrc/mask_editor_panel.xrc 559share/hugin/xrc/mask_editor_panel.xrc
562share/hugin/xrc/optimize_panel.xrc 560share/hugin/xrc/optimize_panel.xrc
563share/hugin/xrc/optimize_photo_panel.xrc 561share/hugin/xrc/optimize_photo_panel.xrc
564share/hugin/xrc/pano_panel.xrc 562share/hugin/xrc/pano_panel.xrc
565share/hugin/xrc/pref_dialog.xrc 563share/hugin/xrc/pref_dialog.xrc
566share/hugin/xrc/preview_frame.xrc 564share/hugin/xrc/preview_frame.xrc
567share/hugin/xrc/reset_dialog.xrc 565share/hugin/xrc/reset_dialog.xrc
568share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png 566share/icons/gnome/48x48/mimetypes/application-x-ptoptimizer-script.png
569share/icons/hicolor/128x128/apps/hugin.png 567share/icons/hicolor/128x128/apps/hugin.png
570share/icons/hicolor/128x128/apps/ptbatcher.png 568share/icons/hicolor/128x128/apps/ptbatcher.png
571share/icons/hicolor/16x16/apps/hugin.png 569share/icons/hicolor/16x16/apps/hugin.png
572share/icons/hicolor/16x16/apps/ptbatcher.png 570share/icons/hicolor/16x16/apps/ptbatcher.png
573share/icons/hicolor/256x256/apps/hugin.png 571share/icons/hicolor/256x256/apps/hugin.png
574share/icons/hicolor/256x256/apps/ptbatcher.png 572share/icons/hicolor/256x256/apps/ptbatcher.png
575share/icons/hicolor/32x32/apps/hugin.png 573share/icons/hicolor/32x32/apps/hugin.png
576share/icons/hicolor/32x32/apps/ptbatcher.png 574share/icons/hicolor/32x32/apps/ptbatcher.png
577share/icons/hicolor/48x48/apps/hugin.png 575share/icons/hicolor/48x48/apps/hugin.png
578share/icons/hicolor/48x48/apps/ptbatcher.png 576share/icons/hicolor/48x48/apps/ptbatcher.png
579share/icons/hicolor/scalable/apps/hugin.svg 577share/icons/hicolor/scalable/apps/hugin.svg
580share/icons/hicolor/scalable/apps/ptbatcher.svg 578share/icons/hicolor/scalable/apps/ptbatcher.svg
581share/locale/ca_ES/LC_MESSAGES/hugin.mo 579share/locale/ca_ES/LC_MESSAGES/hugin.mo
@@ -590,14 +588,17 @@ share/locale/fi/LC_MESSAGES/hugin.mo @@ -590,14 +588,17 @@ share/locale/fi/LC_MESSAGES/hugin.mo
590share/locale/fr/LC_MESSAGES/hugin.mo 588share/locale/fr/LC_MESSAGES/hugin.mo
591share/locale/hu/LC_MESSAGES/hugin.mo 589share/locale/hu/LC_MESSAGES/hugin.mo
592share/locale/it/LC_MESSAGES/hugin.mo 590share/locale/it/LC_MESSAGES/hugin.mo
593share/locale/ja/LC_MESSAGES/hugin.mo 591share/locale/ja/LC_MESSAGES/hugin.mo
594share/locale/nl/LC_MESSAGES/hugin.mo 592share/locale/nl/LC_MESSAGES/hugin.mo
595share/locale/pl/LC_MESSAGES/hugin.mo 593share/locale/pl/LC_MESSAGES/hugin.mo
596share/locale/pt_BR/LC_MESSAGES/hugin.mo 594share/locale/pt_BR/LC_MESSAGES/hugin.mo
597share/locale/ro/LC_MESSAGES/hugin.mo 595share/locale/ro/LC_MESSAGES/hugin.mo
598share/locale/ru/LC_MESSAGES/hugin.mo 596share/locale/ru/LC_MESSAGES/hugin.mo
599share/locale/sk/LC_MESSAGES/hugin.mo 597share/locale/sk/LC_MESSAGES/hugin.mo
600share/locale/sv/LC_MESSAGES/hugin.mo 598share/locale/sv/LC_MESSAGES/hugin.mo
601share/locale/zh_CN/LC_MESSAGES/hugin.mo 599share/locale/zh_CN/LC_MESSAGES/hugin.mo
602share/locale/zh_TW/LC_MESSAGES/hugin.mo 600share/locale/zh_TW/LC_MESSAGES/hugin.mo
 601share/metainfo/PTBatcherGUI.appdata.xml
 602share/metainfo/calibrate_lens_gui.appdata.xml
 603share/metainfo/hugin.appdata.xml
603share/mime/packages/hugin.xml 604share/mime/packages/hugin.xml
cvs diff -r1.23 -r1.24 pkgsrc/graphics/hugin/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/distinfo 2020/01/03 18:15:21 1.23
+++ pkgsrc/graphics/hugin/distinfo 2021/01/09 21:17:37 1.24
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.23 2020/01/03 18:15:21 adam Exp $ 1$NetBSD: distinfo,v 1.24 2021/01/09 21:17:37 adam Exp $
2 2
3SHA1 (hugin-2019.2.0.tar.bz2) = e91bfbb286d0d5f40cd93ecb961eb55a37f3f5bb 3SHA1 (hugin-2020.0.0.tar.bz2) = 20e39ab82e1d8208a7eee2f216ab1271c95f583f
4RMD160 (hugin-2019.2.0.tar.bz2) = d16c364779a48451b3b222a0dd0efa46535e6ddc 4RMD160 (hugin-2020.0.0.tar.bz2) = 499c24bf2dd0eb0b1e223183004dd00f9ced61c2
5SHA512 (hugin-2019.2.0.tar.bz2) = 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1 5SHA512 (hugin-2020.0.0.tar.bz2) = 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
6Size (hugin-2019.2.0.tar.bz2) = 10335030 bytes 6Size (hugin-2020.0.0.tar.bz2) = 10371301 bytes
7SHA1 (patch-CMakeLists.txt) = b5c72651a150e4c3c095f670eaaeabcb4b4c5749 7SHA1 (patch-CMakeLists.txt) = 94e087f3eeab899a6dad701cc4d8a95414a980df
8SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc 8SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
9SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f 9SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
10SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182 10SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182
11SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b 11SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b
12SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5 12SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5
13SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = fda8db4abf3ab10332d4309c90f0ef4f845c76a6 13SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = 0b1396f4a45a5ab6529c0b8c64ff291a021226c4
14SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171 14SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171
15SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1 15SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1
16SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71 16SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71
17SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104 17SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104
cvs diff -r1.6 -r1.7 pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt 2020/01/03 18:15:21 1.6
+++ pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt 2021/01/09 21:17:37 1.7
@@ -1,31 +1,20 @@ @@ -1,31 +1,20 @@
1$NetBSD: patch-CMakeLists.txt,v 1.6 2020/01/03 18:15:21 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.7 2021/01/09 21:17:37 adam Exp $
2 2
3Do not make an application bundle on OS X. 3Do not make an application bundle on OS X.
4 4
5--- CMakeLists.txt.orig 2019-12-15 15:44:00.000000000 +0000 5--- CMakeLists.txt.orig 2020-12-12 11:09:15.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -2,10 +2,6 @@ 7@@ -558,16 +558,6 @@ IF (APPLE)
8 # require at least cmake 3.8 
9 cmake_minimum_required(VERSION 3.8 FATAL_ERROR ) 
10  
11-# prevent in-tree building 
12-if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") 
13- message(FATAL_ERROR "In-source builds are not allowed.") 
14-endif() 
15  
16 if(COMMAND cmake_policy) 
17 cmake_policy(SET CMP0003 NEW) 
18@@ -557,16 +553,6 @@ IF (APPLE) 
19 ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) 8 ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
20 ENDIF (APPLE) 9 ENDIF (APPLE)
21  10
22-IF (HUGIN_SHARED AND UNIX AND NOT APPLE) 11-IF (HUGIN_SHARED AND UNIX AND NOT APPLE)
23- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin") 12- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin")
24- SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal 13- SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal
25- libraries in private subdirectory" ) 14- libraries in private subdirectory" )
26-ELSE () 15-ELSE ()
27- # On OS X files are moved around after make install, do not try to use 16- # On OS X files are moved around after make install, do not try to use
28- # rpath or CMAKE_INSTALL_NAME_DIR 17- # rpath or CMAKE_INSTALL_NAME_DIR
29- SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal 18- SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal
30- libraries in private subdirectory" ) 19- libraries in private subdirectory" )
31-ENDIF() 20-ENDIF()
cvs diff -r1.2 -r1.3 pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp 2016/11/06 16:08:00 1.2
+++ pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp 2021/01/09 21:17:37 1.3
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.2 2016/11/06 16:08:00 adam Exp $ 1$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.3 2021/01/09 21:17:37 adam Exp $
2 2
3Re-order includes to fix building. 3Re-order includes to fix building.
4 4
5--- src/hugin1/hugin/GLPreviewFrame.cpp.orig 2016-02-28 08:18:00.000000000 +0000 5--- src/hugin1/hugin/GLPreviewFrame.cpp.orig 2020-10-27 17:24:30.000000000 +0000
6+++ src/hugin1/hugin/GLPreviewFrame.cpp 6+++ src/hugin1/hugin/GLPreviewFrame.cpp
7@@ -41,6 +41,8 @@ 7@@ -35,6 +35,8 @@
8 #include "panoinc_WX.h" 
9 #include "panoinc.h" 8 #include "panoinc.h"
 9 #include <wx/msgdlg.h>
10  10
11+#include "vigra_ext/InterestPoints.h" 11+#include "vigra_ext/InterestPoints.h"
12+#include "vigra_ext/Correlation.h" 12+#include "vigra_ext/Correlation.h"
13 #include "base_wx/platform.h" 13 #include "base_wx/platform.h"
14 #include "base_wx/wxPlatform.h" 14 #include "base_wx/wxPlatform.h"
15 #include "base_wx/LensTools.h" 15 #include "base_wx/LensTools.h"
16@@ -65,8 +67,6 @@ 16@@ -59,8 +61,6 @@
17 #include "hugin/PanoOperation.h" 17 #include "hugin/PanoOperation.h"
18 #include "hugin/PanoOutputDialog.h" 18 #include "hugin/PanoOutputDialog.h"
19 #include "base_wx/PTWXDlg.h" 19 #include "base_wx/PTWXDlg.h"
20-#include "vigra_ext/InterestPoints.h" 20-#include "vigra_ext/InterestPoints.h"
21-#include "vigra_ext/Correlation.h" 21-#include "vigra_ext/Correlation.h"
22 #include "algorithms/control_points/CleanCP.h" 22 #include "algorithms/control_points/CleanCP.h"
23 #include "hugin_utils/openmp_lock.h" 23 #include "hugin_utils/openmp_lock.h"
24  24