[110277] trunk/dports/graphics/hugin-app
mojca at macports.org
mojca at macports.org
Thu Aug 29 06:36:09 PDT 2013
Revision: 110277
https://trac.macports.org/changeset/110277
Author: mojca at macports.org
Date: 2013-08-29 06:36:09 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
hugin-app: upgrade to version 2012.0.0, use the new wxWidgets ports (#38375); experimental and broken due to boost compiler issues, please FIXME
Modified Paths:
--------------
trunk/dports/graphics/hugin-app/Portfile
Added Paths:
-----------
trunk/dports/graphics/hugin-app/files/
trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
trunk/dports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
Modified: trunk/dports/graphics/hugin-app/Portfile
===================================================================
--- trunk/dports/graphics/hugin-app/Portfile 2013-08-29 13:30:16 UTC (rev 110276)
+++ trunk/dports/graphics/hugin-app/Portfile 2013-08-29 13:36:09 UTC (rev 110277)
@@ -1,12 +1,14 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
+# 2013 RC is out, but this port is broken anyway because of boost incompatibilities with Apple
+
PortSystem 1.0
PortGroup cmake 1.0
+PortGroup wxWidgets 1.0
name hugin-app
-version 2011.0.0
-revision 5
+version 2012.0.0
categories graphics
maintainers gmail.com:hvdwolf \
auckland.ac.nz:p.schmiedeskamp
@@ -19,7 +21,6 @@
homepage http://hugin.sourceforge.net
platforms darwin
-supported_archs i386 ppc
master_sites sourceforge:hugin
distname hugin-${version}
@@ -28,20 +29,84 @@
depends_build-append port:pkgconfig
depends_lib port:boost \
port:exiv2 \
+ port:gettext \
port:glew \
+ port:ilmbase \
+ port:jpeg \
+ port:lensfun \
port:libpano13 \
+ port:libpng \
port:libxml2 \
port:openexr \
- port:wxWidgets
-
+ port:swig-python \
+ port:tclap \
+ port:tiff \
+ port:python27
+
+
+# TODO dependencies:
+# - freeglut or glut, the OpenGL utility toolkit
+# - optionally, lapack
+# - for the optional Python Scripting Interface (currently functional and tested only on Linux and Windows)
+# Python version >=2.6
+# SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4
+#
+# NOTE: maybe the problem was that if swig is installed,
+# it gets detected and then requires swig-python
+# and additional python definitions, else it fails to bulid
+
+# TODO: try to see where MAC_SELF_CONTAINED_BUNDLE gets defined
+
+# patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch - https://bugs.launchpad.net/bugs/1213586
+# patch-src-foreign-zthread-include-zthread-Guard.h.diff - https://bugs.launchpad.net/bugs/1213585
+# patch-src-hugin1-hugin1.pch.diff - moderately helps with compiler issues
+# patch-src-hugin1-base_wx-platform.h.diff - fixed upstream
+patchfiles patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch \
+ patch-src-foreign-zthread-include-zthread-Guard.h.diff \
+ patch-src-hugin1-hugin1.pch.diff \
+ patch-src-hugin1-base_wx-platform.h.diff
+
depends_run port:enblend \
port:p5.12-image-exiftool
-checksums md5 ac8a129b4c3021233df6d9368c8164cf \
- sha1 22e1ad3846291a9bbe58570683e213921a6f0116 \
- rmd160 1388980580ecba70a0d47597ddf06df9b85ab2b5
+checksums md5 6a4fb2585eb3539ba6769cf4557f6e88 \
+ sha1 53f97d030716e66dc5a49c7e786686a9d5262b8d \
+ rmd160 703c01d6d3f35b4cb9fdeeaf25c2b321157e925f
-# As we are dependent on wxWidgets we can't build universal even though
-# hugin itself does allow it
-universal_variant no
-use_parallel_build no
+# TODO: fix this
+configure.args-append -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python \
+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
+ -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib
+
+# prevents some compiler errors
+configure.cxxflags-append -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
+
+# if this option works ok, others may be removed
+variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxWidgets 2.9 (experimental)} {
+ wxWidgets.use wxWidgets-3.0
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
+ -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc}
+}
+
+variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxWidgets 2.8} {
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
+ -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc}
+}
+
+variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use wxWidgets 2.8 with GTK} {
+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
+ -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc}
+}
+
+if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
+ default_variants +wxwidgets30
+}
+
+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex Hugin-(\[.0-9\]+) released
Added: trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch (rev 0)
+++ trunk/dports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch 2013-08-29 13:36:09 UTC (rev 110277)
@@ -0,0 +1,12 @@
+wrong patch, but a temporary workaround for clang
+--- src/foreign/vigra/vigra/cachedfileimage.hxx
++++ src/foreign/vigra/vigra/cachedfileimage.hxx
+@@ -555,7 +555,7 @@ template <class T, class Notify>
+ class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify>
+ {
+ #ifdef __GNUC__
+-friend class Notify::self_type;
++friend typename Notify::self_type;
+ #else
+ friend typename Notify::self_type;
+ #endif
Added: trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff (rev 0)
+++ trunk/dports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff 2013-08-29 13:36:09 UTC (rev 110277)
@@ -0,0 +1,12 @@
+report this bug upstream
+--- src/foreign/zthread/include/zthread/Guard.h
++++ src/foreign/zthread/include/zthread/Guard.h
+@@ -108,7 +108,7 @@ class CompoundScope {
+ }
+
+ template <class LockType>
+- static void createScope(LockHolder<LockType>& l, unsigned long ms) {
++ static bool createScope(LockHolder<LockType>& l, unsigned long ms) {
+
+ if(Scope1::createScope(l, ms))
+ if(!Scope2::createScope(l, ms)) {
Added: trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff (rev 0)
+++ trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff 2013-08-29 13:36:09 UTC (rev 110277)
@@ -0,0 +1,15 @@
+report upstream
+--- src/hugin1/base_wx/platform.h
++++ src/hugin1/base_wx/platform.h
+@@ -42,7 +42,11 @@
+ #if defined __WXMAC__
+
+ #include <CoreFoundation/CFString.h>
++#if wxCHECK_VERSION(2, 9, 0)
++#include <wx/osx/private.h>
++#else
+ #include <wx/mac/private.h>
++#endif
+
+ CFStringRef MacCreateCFStringWithWxString(const wxString& string);
+
Added: trunk/dports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
===================================================================
--- trunk/dports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff (rev 0)
+++ trunk/dports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff 2013-08-29 13:36:09 UTC (rev 110277)
@@ -0,0 +1,12 @@
+--- src/hugin1/hugin1.pch.orig
++++ src/hugin1/hugin1.pch
+@@ -31,6 +31,9 @@
+ #ifndef _HUGIN1_PCH
+ #define _HUGIN1_PCH
+
++#if defined(__cplusplus) && defined(__APPLE__)
++#include <boost/random.hpp>
++#endif
+
+ #ifdef HUGIN_PRECOMP
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/bbe04453/attachment.html>
More information about the macports-changes
mailing list