diff options
| -rw-r--r-- | graphics/hugin/Makefile | 8 | ||||
| -rw-r--r-- | graphics/hugin/PLIST | 4 | ||||
| -rw-r--r-- | graphics/hugin/distinfo | 15 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-CMakeLists.txt | 22 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp | 4 | ||||
| -rw-r--r-- | graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp | 15 |
6 files changed, 30 insertions, 38 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 431a2385b27..edc3b7a671e 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2016/09/17 21:46:11 wiedi Exp $ +# $NetBSD: Makefile,v 1.60 2016/11/06 16:08:00 adam Exp $ -DISTNAME= hugin-2016.0.0 -PKGREVISION= 1 +DISTNAME= hugin-2016.2.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/} EXTRACT_SUFX= .tar.bz2 @@ -25,8 +24,9 @@ SUBST_CLASSES+= apple SUBST_MESSAGE.apple= Avoiding Mac OS X application bundles SUBST_STAGE.apple= pre-configure SUBST_FILES.apple= src/hugin1/hugin/CMakeLists.txt -SUBST_FILES.apple+= src/hugin1/ptbatcher/CMakeLists.txt +SUBST_FILES.apple+= src/hugin1/calibrate_lens/CMakeLists.txt SUBST_FILES.apple+= src/hugin1/icpfind/CMakeLists.txt +SUBST_FILES.apple+= src/hugin1/ptbatcher/CMakeLists.txt SUBST_FILES.apple+= src/hugin1/stitch_project/CMakeLists.txt SUBST_SED.apple= -e 's,(APPLE),(ELPPA),g' diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST index e199ec41dbd..9490b5a8818 100644 --- a/graphics/hugin/PLIST +++ b/graphics/hugin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2016/04/07 19:23:26 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/11/06 16:08:00 adam Exp $ bin/PTBatcherGUI bin/align_image_stack bin/autooptimiser @@ -90,7 +90,7 @@ share/hugin/xrc/batch_toolbar.xrc share/hugin/xrc/cp_editor_panel.xrc share/hugin/xrc/cp_list_frame.xrc share/hugin/xrc/cpdetector_dialog.xrc -share/hugin/xrc/data/COPYING +share/hugin/xrc/data/COPYING.txt share/hugin/xrc/data/about.htm share/hugin/xrc/data/add_project.png share/hugin/xrc/data/add_projects.png diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index da24586d403..61598771cf5 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2016/04/07 19:23:26 adam Exp $ +$NetBSD: distinfo,v 1.17 2016/11/06 16:08:00 adam Exp $ -SHA1 (hugin-2016.0.0.tar.bz2) = 6811e19f1c10da163e1c4228779beb4c12448db9 -RMD160 (hugin-2016.0.0.tar.bz2) = 9d73e78accbfae2194b347d3d7f7c3932adc018a -SHA512 (hugin-2016.0.0.tar.bz2) = 029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1 -Size (hugin-2016.0.0.tar.bz2) = 10508576 bytes -SHA1 (patch-CMakeLists.txt) = 54f11138438c2650673a4056f85fa7e6bf869d00 +SHA1 (hugin-2016.2.0.tar.bz2) = 9d28609d973fa72b95b1e2506cf1de7d24578e67 +RMD160 (hugin-2016.2.0.tar.bz2) = 9eaf5f5c3f68a5bbc1a86272488c2821a63db83e +SHA512 (hugin-2016.2.0.tar.bz2) = 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510 +Size (hugin-2016.2.0.tar.bz2) = 10386216 bytes +SHA1 (patch-CMakeLists.txt) = e30ad71ef5abe0efcf113278ae85f5d33a0a4ccd SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f SHA1 (patch-src_hugin1_base__wx_StitchingExecutor.cpp) = c30a62b1da413fce9524d7d558ec5bb1f21eb65e @@ -12,8 +12,7 @@ SHA1 (patch-src_hugin1_base__wx_platform.cpp) = f0f544438a4818e9bbad9fd0f7fb0af0 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 -SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = 47bae7f5c57f8c7028dee4451840dcb2a2bb1f39 -SHA1 (patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp) = 2016aec03f6ef24fc7e70b289702a87df48b382a +SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = fda8db4abf3ab10332d4309c90f0ef4f845c76a6 SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171 SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71 SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104 diff --git a/graphics/hugin/patches/patch-CMakeLists.txt b/graphics/hugin/patches/patch-CMakeLists.txt index 906196f4d5e..7657012fda6 100644 --- a/graphics/hugin/patches/patch-CMakeLists.txt +++ b/graphics/hugin/patches/patch-CMakeLists.txt @@ -1,13 +1,13 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2016/04/07 19:23:26 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2016/11/06 16:08:00 adam Exp $ Correct 'man' path. Do not make an application bundle on OS X. ---- CMakeLists.txt.orig 2016-01-23 08:37:46.000000000 +0000 +--- CMakeLists.txt.orig 2016-07-09 07:25:44.000000000 +0000 +++ CMakeLists.txt -@@ -2,10 +2,6 @@ - # require at least cmake 2.8 - cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR ) +@@ -2,18 +2,12 @@ + # require at least cmake 3.1 + cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR ) -# prevent in-tree building -if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") @@ -16,7 +16,15 @@ Do not make an application bundle on OS X. if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -@@ -518,7 +514,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STRE + endif(COMMAND cmake_policy) + + if(APPLE) +- set(CMAKE_OSX_SYSROOT macosx10.11) +- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") + if (MAC_SELF_CONTAINED_BUNDLE) + set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/lib) + set(CMAKE_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/include ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/bin) +@@ -538,7 +532,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 "") @@ -25,7 +33,7 @@ Do not make an application bundle on OS X. ENDIF(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") SET(LOCALEDIR share/locale) -@@ -543,16 +539,6 @@ IF (APPLE) +@@ -563,16 +557,6 @@ IF (APPLE) ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) ENDIF (APPLE) diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp index d355d469d5f..df960703cda 100644 --- a/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp +++ b/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.1 2016/04/07 19:23:26 adam Exp $ +$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.2 2016/11/06 16:08:00 adam Exp $ Re-order includes to fix building. ---- src/hugin1/hugin/GLPreviewFrame.cpp.orig 2016-02-19 22:31:49.000000000 +0000 +--- src/hugin1/hugin/GLPreviewFrame.cpp.orig 2016-02-28 08:18:00.000000000 +0000 +++ src/hugin1/hugin/GLPreviewFrame.cpp @@ -41,6 +41,8 @@ #include "panoinc_WX.h" diff --git a/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp b/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp deleted file mode 100644 index 3013379fcbb..00000000000 --- a/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp,v 1.3 2016/04/07 19:23:26 adam Exp $ - -Fix building with Clang. - ---- src/hugin1/icpfind/AutoCtrlPointCreator.cpp.orig 2016-02-19 22:03:11.000000000 +0000 -+++ src/hugin1/icpfind/AutoCtrlPointCreator.cpp -@@ -28,7 +28,7 @@ - #include "panoinc.h" - - #include <fstream> --#if defined (__GNUC__) && !defined (__FreeBSD__) -+#if defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__clang__) - #include <ext/stdio_filebuf.h> - #endif - |