diff options
Diffstat (limited to 'graphics/hugin')
| -rw-r--r-- | graphics/hugin/Makefile | 7 | ||||
| -rw-r--r-- | graphics/hugin/PLIST | 121 | ||||
| -rw-r--r-- | graphics/hugin/distinfo | 14 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-CMakeLists.txt | 14 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-src_hugin1_base__wx_StitchingExecutor.cpp | 17 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp | 17 |
6 files changed, 89 insertions, 101 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 91b7d7c52e3..1b571ae082a 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.87 2019/04/25 07:32:57 maya Exp $ +# $NetBSD: Makefile,v 1.88 2019/04/30 09:19:25 adam Exp $ -DISTNAME= hugin-2018.0.0 -PKGREVISION= 13 +DISTNAME= hugin-2019.0.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/} EXTRACT_SUFX= .tar.bz2 @@ -13,7 +12,6 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -DEPENDS+= enblend-enfuse>=4.0:../../graphics/enblend-enfuse DEPENDS+= p5-Image-ExifTool>=8.15:../../graphics/p5-Image-ExifTool USE_CMAKE= yes @@ -51,6 +49,7 @@ SUBST_SED.apple= -e 's,(APPLE),(ELPPA),g' .include "../../graphics/glut/buildlink3.mk" .endif .include "../../graphics/gnome-icon-theme/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/lensfun/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../graphics/libpano13/buildlink3.mk" diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST index 30184fc756d..62cee029eb6 100644 --- a/graphics/hugin/PLIST +++ b/graphics/hugin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2018/02/27 09:59:36 adam Exp $ +@comment $NetBSD: PLIST,v 1.12 2019/04/30 09:19:25 adam Exp $ bin/PTBatcherGUI bin/align_image_stack bin/autooptimiser @@ -87,6 +87,7 @@ share/hugin/data/fused_layers.executor share/hugin/data/hdr_pano.executor share/hugin/data/hugin_exiftool_copy.arg share/hugin/data/hugin_exiftool_final_example.arg +share/hugin/data/hugin_rt.pp3 share/hugin/data/median_stack.executor share/hugin/data/multirow.assistant share/hugin/data/normal.assistant @@ -136,6 +137,10 @@ share/hugin/xrc/data/filesaveas.png share/hugin/xrc/data/fit_pano.png share/hugin/xrc/data/gl_preview.png share/hugin/xrc/data/gl_preview_small.png +share/hugin/xrc/data/help_en_EN/0014985448cc97c209313a079e4eda593c810582.png +share/hugin/xrc/data/help_en_EN/0881f567a2579a682ece721d6d93816eecbcff0d.png +share/hugin/xrc/data/help_en_EN/0d04667eb3325cfad4ec50e994bf00c22782f509.png +share/hugin/xrc/data/help_en_EN/0f203b686a923982358b9274fb508753ac31b996.png share/hugin/xrc/data/help_en_EN/100px-Big_ben_transverse_mercator.jpg share/hugin/xrc/data/help_en_EN/100px-PC_img01.jpg share/hugin/xrc/data/help_en_EN/100px-PC_img02.jpg @@ -150,27 +155,19 @@ share/hugin/xrc/data/help_en_EN/120px-Flatfield1_Munich.jpg share/hugin/xrc/data/help_en_EN/120px-Flatfield2_Munich.jpg share/hugin/xrc/data/help_en_EN/120px-Flatfield3_Munich.jpg share/hugin/xrc/data/help_en_EN/120px-Flatfield4_Munich.jpg +share/hugin/xrc/data/help_en_EN/132e57acb643253e7810ee9702d9581f159a1c61.png share/hugin/xrc/data/help_en_EN/150px-Ben_Equisolid.jpg share/hugin/xrc/data/help_en_EN/150px-Ben_Orthographic.jpg share/hugin/xrc/data/help_en_EN/150px-Big_ben_fisheye.jpg share/hugin/xrc/data/help_en_EN/150px-Big_ben_rectilinear.jpg share/hugin/xrc/data/help_en_EN/150px-Big_ben_stereographic.jpg -share/hugin/xrc/data/help_en_EN/16788a4cd7337294823325c28db92225.png share/hugin/xrc/data/help_en_EN/16bit.html share/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html -share/hugin/xrc/data/help_en_EN/17af7474cdfd5abe24fd07eb58810dba.png -share/hugin/xrc/data/help_en_EN/180px-2125768589_b.jpg -share/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_crop.png -share/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_drag.png -share/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_identify.png -share/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_rotate_drag.png -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/1876c10b5fac40156f4cd7ab00928c9fc2bed36b.png share/hugin/xrc/data/help_en_EN/197px-Field-of-view.svg.png -share/hugin/xrc/data/help_en_EN/1e3fbb44cf80bc872c3bc50c35a10b98.png -share/hugin/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png +share/hugin/xrc/data/help_en_EN/1d8b2987693a73b6ef2eb74783d2e51786789f89.png +share/hugin/xrc/data/help_en_EN/1d90bc6b2f34e2398a9accb8c63bb46bdcf8a629.png share/hugin/xrc/data/help_en_EN/200px-Ben_Architectural.jpg share/hugin/xrc/data/help_en_EN/200px-Ben_Lambert_cylindrical_equal_area.jpg share/hugin/xrc/data/help_en_EN/200px-Ben_Miller_cylindrical.jpg @@ -183,6 +180,7 @@ share/hugin/xrc/data/help_en_EN/200px-Hugin-2011.0_fpw_overview.png share/hugin/xrc/data/help_en_EN/200px-Hugin2013_overview.png share/hugin/xrc/data/help_en_EN/200px-Panoglview.png share/hugin/xrc/data/help_en_EN/220px-Ben_Equirectangular_panini.jpg +share/hugin/xrc/data/help_en_EN/228647b7d4a18b6c8c0c390b439a61da8fafec76.png share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_autocrop.svg.png 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 @@ -200,36 +198,48 @@ share/hugin/xrc/data/help_en_EN/250px-Orientation-plate.jpg share/hugin/xrc/data/help_en_EN/250px-Rectlinear.JPG share/hugin/xrc/data/help_en_EN/250px-TKS-Mmm-obliquev120-gP70_50_50.png share/hugin/xrc/data/help_en_EN/250px-TKS-Mmm-obliquev120-recti.png +share/hugin/xrc/data/help_en_EN/2c5d28ca1131956936f41807db3895584e54ba78.png +share/hugin/xrc/data/help_en_EN/300px-2125768589_b.jpg +share/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_crop.png +share/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_drag.png +share/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_identify.png +share/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_rotate_drag.png +share/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_start.png +share/hugin/xrc/data/help_en_EN/300px-Focal_length.gif share/hugin/xrc/data/help_en_EN/300px-Hugin2013_layout_tab.png +share/hugin/xrc/data/help_en_EN/300px-Lamp_enfuse.jpg share/hugin/xrc/data/help_en_EN/300px-SimpleGui_stitch_popup.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/36408bbe3513b733d360cf77918a5cbfbedef425.png +share/hugin/xrc/data/help_en_EN/39178db26b94bc87f737b575c304974110ba292b.png share/hugin/xrc/data/help_en_EN/400px-220x120deg-panini-grid.png -share/hugin/xrc/data/help_en_EN/422cb0e4439a3b643f880b45af9d5636.png -share/hugin/xrc/data/help_en_EN/4c08b4c70c5be7cb6c402efa92fdb6ee.png -share/hugin/xrc/data/help_en_EN/4d4d22d9c63b47c6f8fb7825ec5cd1db.png +share/hugin/xrc/data/help_en_EN/435638222a3155b22cedd949f090863742aeb32e.png +share/hugin/xrc/data/help_en_EN/468496ffa63b733cefc74a49e3eb869acb771abe.png +share/hugin/xrc/data/help_en_EN/4b0bfb3769bf24d80e15374dc37b0441e2616e33.png share/hugin/xrc/data/help_en_EN/500px-Hugin2013_projection_tab.png -share/hugin/xrc/data/help_en_EN/57b9ca0ee21ce403038c5efcdc7c5eca.png -share/hugin/xrc/data/help_en_EN/5a12c95d04637539015c2d09b5002204.png -share/hugin/xrc/data/help_en_EN/5f558fa7e9b1567daca23dc3433f5cec.png +share/hugin/xrc/data/help_en_EN/566a3cea17751229daea11d526505235164b25df.png +share/hugin/xrc/data/help_en_EN/5b71f1d3fb01a7173133cf27840d65890345ba44.png share/hugin/xrc/data/help_en_EN/600px-Hugin2013_crop_tab.png share/hugin/xrc/data/help_en_EN/600px-Hugin2013_move_drag_tab.png share/hugin/xrc/data/help_en_EN/600px-Tuebingen_Neckarfront_small15_2006-06-11.jpg share/hugin/xrc/data/help_en_EN/600px-Tuebingen_Neckarfront_withdustspots_small15_2006-06-11.jpg -share/hugin/xrc/data/help_en_EN/687431209ed4a8feab0c151b622ef1e0.png +share/hugin/xrc/data/help_en_EN/6307c8a99dad7d0bcb712352ae0a748bd99a038b.png +share/hugin/xrc/data/help_en_EN/652e1fd9c3a2ca00e1a517783cdbb0e18e4181f8.png +share/hugin/xrc/data/help_en_EN/6969c411977839d7af14df4000f56edfba759aed.png +share/hugin/xrc/data/help_en_EN/6a4493e959276bb2365c2f4255a4749ed324d741.png +share/hugin/xrc/data/help_en_EN/6aea83a57db153f846b8b7b1a8306e59c4e43ef0.png +share/hugin/xrc/data/help_en_EN/6e5a86d56d252eb4d556c47ef65cbb3e9f5a9d2e.png +share/hugin/xrc/data/help_en_EN/6e5ab2664b422d53eb0c7df3b87e1360d75ad9af.png share/hugin/xrc/data/help_en_EN/700px-Autopano-done.png share/hugin/xrc/data/help_en_EN/700px-Hugin2013_photos_tab.png share/hugin/xrc/data/help_en_EN/700px-Hugin2013_preview_tab.png -share/hugin/xrc/data/help_en_EN/7a62f58ab1c3f78523eee522e71a9416.png +share/hugin/xrc/data/help_en_EN/73efd1f6493490b058097060a572606d2c550a06.png +share/hugin/xrc/data/help_en_EN/77b1d0af49406a510722c741051555ca7ae87b1b.png +share/hugin/xrc/data/help_en_EN/7a52a97d85628ff81bb576d212dcae925f38f1eb.png share/hugin/xrc/data/help_en_EN/800px-C_Marchi-GrandCentral-adj.jpg -share/hugin/xrc/data/help_en_EN/81b4c8dd7cbec41cae5ef37da5644e99.png -share/hugin/xrc/data/help_en_EN/89539baed8c394f4b6eea437f16b047d.png -share/hugin/xrc/data/help_en_EN/8dc4f8dfb753dc58e5cfaa70bb2add2e.png -share/hugin/xrc/data/help_en_EN/8fa14cdd754f91cc6554c9e71929cce7.png -share/hugin/xrc/data/help_en_EN/97f76ad87331fb0eebfa4c97bed26d8c.png -share/hugin/xrc/data/help_en_EN/98dda29ec0838b4a60698e962d90cd03.png -share/hugin/xrc/data/help_en_EN/990bd2a1181cb4840ca9ff6b710ca7ec.png +share/hugin/xrc/data/help_en_EN/8cf629bdcc90521bb174119ac00d2f82e66b6858.png +share/hugin/xrc/data/help_en_EN/8d3ef9dbe5e117eb5bb0de31eb3d72ae5ee9878c.png +share/hugin/xrc/data/help_en_EN/927996686539d9eacf2e62a8cf730cc117529091.png share/hugin/xrc/data/help_en_EN/Aliasing.html share/hugin/xrc/data/help_en_EN/AliasingPScubic.jpg share/hugin/xrc/data/help_en_EN/AliasingPScubic_2x.jpg @@ -346,6 +356,7 @@ share/hugin/xrc/data/help_en_EN/Hugin_Preferences.html share/hugin/xrc/data/help_en_EN/Hugin_Preview_tab.html share/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html share/hugin/xrc/data/help_en_EN/Hugin_Projection_tab.html +share/hugin/xrc/data/help_en_EN/Hugin_Raw_Import.html share/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html share/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html share/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html @@ -370,6 +381,7 @@ share/hugin/xrc/data/help_en_EN/Hugin_preview_show_all.png share/hugin/xrc/data/help_en_EN/Hugin_preview_show_none.png share/hugin/xrc/data/help_en_EN/Hugin_redo.png share/hugin/xrc/data/help_en_EN/Hugin_reload.png +share/hugin/xrc/data/help_en_EN/Hugin_stacker.html share/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html share/hugin/xrc/data/help_en_EN/Hugin_straighten_pano.png share/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html @@ -456,7 +468,7 @@ share/hugin/xrc/data/help_en_EN/TIFF.html share/hugin/xrc/data/help_en_EN/Tca_correct.html share/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html share/hugin/xrc/data/help_en_EN/Tone_mapping.html -share/hugin/xrc/data/help_en_EN/User_defined_output_sequence_and_user_defined_assistant.html +share/hugin/xrc/data/help_en_EN/User_defined_output_sequence.html share/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html share/hugin/xrc/data/help_en_EN/Verdandi.html share/hugin/xrc/data/help_en_EN/Vertical-fisheye.jpg @@ -467,26 +479,28 @@ share/hugin/xrc/data/help_en_EN/Vignetting.html share/hugin/xrc/data/help_en_EN/Wavy_distortion.html share/hugin/xrc/data/help_en_EN/Yaw.html share/hugin/xrc/data/help_en_EN/Zenith.html -share/hugin/xrc/data/help_en_EN/a0f45cb050ae05932d1495f15a13290e.png -share/hugin/xrc/data/help_en_EN/a98f19317c5b1baf19a11563189c874b.png -share/hugin/xrc/data/help_en_EN/ab807c8735d25a66b577b029bc0e568f.png -share/hugin/xrc/data/help_en_EN/b27abc434a11d07b390df859d7aa782a.png -share/hugin/xrc/data/help_en_EN/c398d95d4b6e864a2b448a53b5a245fd.png -share/hugin/xrc/data/help_en_EN/c3cc50179501003b73b0f3d8f02098dc.png -share/hugin/xrc/data/help_en_EN/ccf48cf728225d3dcecf1f74e74dafa3.png -share/hugin/xrc/data/help_en_EN/d4466e5ff97cd6bbdddc514f3a28fb88.png -share/hugin/xrc/data/help_en_EN/db71893e7683801204b25f076e7db8b3.png -share/hugin/xrc/data/help_en_EN/e1e1d3d40573127e9ee0480caf1283d6.png -share/hugin/xrc/data/help_en_EN/f10801280c8b36520b1a628171f25d8f.png -share/hugin/xrc/data/help_en_EN/f7bd60b75b29d79b660a2859395c1a24.png -share/hugin/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.png +share/hugin/xrc/data/help_en_EN/b46e7c5d2bb0d7e3dc91da9577785c32b9fe1c97.png +share/hugin/xrc/data/help_en_EN/b52d9f5b1cbad5408a6d13c40055d28513b7d515.png +share/hugin/xrc/data/help_en_EN/ba75cc7aa1514d3d82cf1cf2860b99a986f977c0.png +share/hugin/xrc/data/help_en_EN/be171a7c8c559cc35aaec70416b787efc4aebe31.png +share/hugin/xrc/data/help_en_EN/c31fdc58e559f2dcdf2cee6a137cc3db024f093c.png +share/hugin/xrc/data/help_en_EN/c3c9a2c7b599b37105512c5d570edc034056dd40.png +share/hugin/xrc/data/help_en_EN/c81f99c35740e0ae9e1602d890467f02f02ade21.png +share/hugin/xrc/data/help_en_EN/c92a8ec1cc630ea8f8f4f936688278d7636bb4e6.png +share/hugin/xrc/data/help_en_EN/cce47ef57ba2ee096573a3835e2e2f8a10be5480.png +share/hugin/xrc/data/help_en_EN/cfa11ce088a7a72cde469f7893eec012452e3c1d.png +share/hugin/xrc/data/help_en_EN/d1e5d518892671cb94ae0907a94eddf2f170438c.png +share/hugin/xrc/data/help_en_EN/dd7303c9e2a572c54f834b7ed72ba86e118153de.png +share/hugin/xrc/data/help_en_EN/df82df0e21914cbf47891bad4d167fe9063e9c87.png +share/hugin/xrc/data/help_en_EN/f08ce4d4c86c5b43f36c8435fb598da6471047c6.png +share/hugin/xrc/data/help_en_EN/f34c10f53deff61bbb851e44b35b6ba2e54191b3.png +share/hugin/xrc/data/help_en_EN/f351bd4263519281b738ce53c3b402823e9ab2ec.png +share/hugin/xrc/data/help_en_EN/faeac1d4d9b6f8b8fd4efba91c90f189a2e3089f.png share/hugin/xrc/data/help_en_EN/help_index_en.hhk share/hugin/xrc/data/help_en_EN/help_toc_en.hhc share/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp share/hugin/xrc/data/help_en_EN/license.html -share/hugin/xrc/data/help_en_EN/magnify-clip.png share/hugin/xrc/data/help_en_EN/manual.css -share/hugin/xrc/data/help_en_EN/panotoolsng.png share/hugin/xrc/data/hugin.ico share/hugin/xrc/data/hugin.png share/hugin/xrc/data/hugin_small.png @@ -540,6 +554,7 @@ share/hugin/xrc/dlg_warning.xrc share/hugin/xrc/edit_script_dialog.xrc share/hugin/xrc/image_variable_dlg.xrc share/hugin/xrc/images_panel.xrc +share/hugin/xrc/import_raw_dialog.xrc share/hugin/xrc/lenscal_frame.xrc share/hugin/xrc/lensdb_dialogs.xrc share/hugin/xrc/main_frame.xrc @@ -553,6 +568,18 @@ share/hugin/xrc/pref_dialog.xrc share/hugin/xrc/preview_frame.xrc share/hugin/xrc/reset_dialog.xrc share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png +share/icons/hicolor/128x128/apps/hugin.png +share/icons/hicolor/128x128/apps/ptbatcher.png +share/icons/hicolor/16x16/apps/hugin.png +share/icons/hicolor/16x16/apps/ptbatcher.png +share/icons/hicolor/256x256/apps/hugin.png +share/icons/hicolor/256x256/apps/ptbatcher.png +share/icons/hicolor/32x32/apps/hugin.png +share/icons/hicolor/32x32/apps/ptbatcher.png +share/icons/hicolor/48x48/apps/hugin.png +share/icons/hicolor/48x48/apps/ptbatcher.png +share/icons/hicolor/scalable/apps/hugin.svg +share/icons/hicolor/scalable/apps/ptbatcher.svg share/locale/ca_ES/LC_MESSAGES/hugin.mo share/locale/ca_ES@valencia/LC_MESSAGES/hugin.mo share/locale/cs_CZ/LC_MESSAGES/hugin.mo @@ -576,5 +603,3 @@ share/locale/sv/LC_MESSAGES/hugin.mo share/locale/zh_CN/LC_MESSAGES/hugin.mo share/locale/zh_TW/LC_MESSAGES/hugin.mo share/mime/packages/hugin.xml -share/pixmaps/hugin.png -share/pixmaps/ptbatcher.png diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index 6f85a504be4..4640e7850bf 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.20 2018/02/27 09:59:36 adam Exp $ +$NetBSD: distinfo,v 1.21 2019/04/30 09:19:25 adam Exp $ -SHA1 (hugin-2018.0.0.tar.bz2) = bf62cc597015f8fcbddb52590fe3f8eac497449f -RMD160 (hugin-2018.0.0.tar.bz2) = 0302957e8ed250c277f9b78d9604609c9919e8b9 -SHA512 (hugin-2018.0.0.tar.bz2) = 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc -Size (hugin-2018.0.0.tar.bz2) = 9838518 bytes -SHA1 (patch-CMakeLists.txt) = 9c7f017d8446e61b2cfffe7969f900c63cb229a1 +SHA1 (hugin-2019.0.0.tar.bz2) = 269efb3c3785b3b3fe86e73ab2ffcb1bb6e0498f +RMD160 (hugin-2019.0.0.tar.bz2) = 6d1d7e14a862879e5ac9bc2d9b75c5e9e4d0e15a +SHA512 (hugin-2019.0.0.tar.bz2) = 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5 +Size (hugin-2019.0.0.tar.bz2) = 10297887 bytes +SHA1 (patch-CMakeLists.txt) = ee4703122a37bf34958f857bbedd6c5e7a3843c7 SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f -SHA1 (patch-src_hugin1_base__wx_StitchingExecutor.cpp) = 15b22b2a098bcf644eb07943baa958c09d72a7f6 -SHA1 (patch-src_hugin1_base__wx_platform.cpp) = f0f544438a4818e9bbad9fd0f7fb0af06f1bdf4e SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182 SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5 diff --git a/graphics/hugin/patches/patch-CMakeLists.txt b/graphics/hugin/patches/patch-CMakeLists.txt index eeb1459cbb9..52672b530c8 100644 --- a/graphics/hugin/patches/patch-CMakeLists.txt +++ b/graphics/hugin/patches/patch-CMakeLists.txt @@ -1,8 +1,8 @@ -$NetBSD: patch-CMakeLists.txt,v 1.4 2017/07/03 20:48:03 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.5 2019/04/30 09:19:25 adam Exp $ Do not make an application bundle on OS X. ---- CMakeLists.txt.orig 2017-05-15 15:05:31.000000000 +0000 +--- CMakeLists.txt.orig 2019-03-23 07:16:59.000000000 +0000 +++ CMakeLists.txt @@ -2,10 +2,6 @@ # require at least cmake 3.1 @@ -15,20 +15,20 @@ Do not make an application bundle on OS X. if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -@@ -570,16 +566,6 @@ IF (APPLE) +@@ -595,16 +591,6 @@ IF (APPLE) ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) ENDIF (APPLE) --IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) +-IF (HUGIN_SHARED AND UNIX AND NOT APPLE) - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin") - SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal - libraries in private subdirectory" ) --ELSE (${HUGIN_SHARED} AND UNIX AND NOT APPLE) +-ELSE () - # On OS X files are moved around after make install, do not try to use - # rpath or CMAKE_INSTALL_NAME_DIR - SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal - libraries in private subdirectory" ) --ENDIF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) +-ENDIF() IF (UNIX) - IF (${HUGIN_SHARED}) + IF (HUGIN_SHARED) diff --git a/graphics/hugin/patches/patch-src_hugin1_base__wx_StitchingExecutor.cpp b/graphics/hugin/patches/patch-src_hugin1_base__wx_StitchingExecutor.cpp deleted file mode 100644 index 1f1eb797aea..00000000000 --- a/graphics/hugin/patches/patch-src_hugin1_base__wx_StitchingExecutor.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_hugin1_base__wx_StitchingExecutor.cpp,v 1.2 2017/07/03 20:48:03 adam Exp $ - -Re-order includes to fix building. - ---- src/hugin1/base_wx/StitchingExecutor.cpp.orig 2017-04-29 16:05:50.000000000 +0000 -+++ src/hugin1/base_wx/StitchingExecutor.cpp -@@ -34,9 +34,9 @@ - #include "hugin_base/panotools/PanoToolsUtils.h" - #include "hugin_base/panodata/PanoramaOptions.h" - #include "hugin_base/algorithms/basic/LayerStacks.h" -+#include "base_wx/LensTools.h" - #include "base_wx/platform.h" - #include "base_wx/wxPlatform.h" --#include "base_wx/LensTools.h" - #include "hugin/config_defaults.h" - - namespace HuginQueue diff --git a/graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp b/graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp deleted file mode 100644 index 003c7d9e02c..00000000000 --- a/graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_hugin1_base__wx_platform.cpp,v 1.1 2016/04/07 19:23:26 adam Exp $ - -Re-order includes to fix building. - ---- src/hugin1/base_wx/platform.cpp.orig 2016-02-19 22:26:02.000000000 +0000 -+++ src/hugin1/base_wx/platform.cpp -@@ -24,9 +24,9 @@ - * - */ - --#include "platform.h" - - #include <hugin_utils/utils.h> -+#include "platform.h" - - #if defined __WXMAC__ || defined __WXOSX_COCOA__ - |