[109591] users/mojca/wxports/graphics
mojca at macports.org
mojca at macports.org
Sun Aug 18 00:01:26 PDT 2013
Revision: 109591
https://trac.macports.org/changeset/109591
Author: mojca at macports.org
Date: 2013-08-18 00:01:26 -0700 (Sun, 18 Aug 2013)
Log Message:
-----------
mojca/hugin-app: upgrade to 2012.0.0, support for new wxWidgets, not working with clang & boost yet
Added Paths:
-----------
users/mojca/wxports/graphics/hugin-app/
users/mojca/wxports/graphics/hugin-app/Portfile
users/mojca/wxports/graphics/hugin-app/files/
users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
Removed Paths:
-------------
users/mojca/wxports/graphics/hugin-app/Portfile
Deleted: users/mojca/wxports/graphics/hugin-app/Portfile
===================================================================
--- trunk/dports/graphics/hugin-app/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
+++ users/mojca/wxports/graphics/hugin-app/Portfile 2013-08-18 07:01:26 UTC (rev 109591)
@@ -1,46 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-PortGroup cmake 1.0
-
-name hugin-app
-version 2011.0.0
-revision 5
-categories graphics
-maintainers gmail.com:hvdwolf \
- auckland.ac.nz:p.schmiedeskamp
-description Panorama photo stitcher
-long_description An easy to use cross-platform panoramic imaging \
- toolchain based on Panorama Tools. With hugin you \
- can assemble a mosaic of photographs into a complete \
- immersive panorama, stitch any series of overlapping \
- pictures and much more.
-
-homepage http://hugin.sourceforge.net
-platforms darwin
-supported_archs i386 ppc
-
-master_sites sourceforge:hugin
-distname hugin-${version}
-use_bzip2 yes
-
-depends_build-append port:pkgconfig
-depends_lib port:boost \
- port:wxWidgets \
- port:openexr \
- port:exiv2 \
- port:libpano13 \
- port:glew \
- port:libxml2
-
-depends_run port:enblend \
- port:p5.12-image-exiftool
-
-checksums md5 ac8a129b4c3021233df6d9368c8164cf \
- sha1 22e1ad3846291a9bbe58570683e213921a6f0116 \
- rmd160 1388980580ecba70a0d47597ddf06df9b85ab2b5
-
-# 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
Copied: users/mojca/wxports/graphics/hugin-app/Portfile (from rev 109583, trunk/dports/graphics/hugin-app/Portfile)
===================================================================
--- users/mojca/wxports/graphics/hugin-app/Portfile (rev 0)
+++ users/mojca/wxports/graphics/hugin-app/Portfile 2013-08-18 07:01:26 UTC (rev 109591)
@@ -0,0 +1,107 @@
+# -*- 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$
+
+PortSystem 1.0
+PortGroup cmake 1.0
+PortGroup wxwidgets 1.0
+
+name hugin-app
+version 2012.0.0
+categories graphics
+maintainers gmail.com:hvdwolf \
+ auckland.ac.nz:p.schmiedeskamp
+description Panorama photo stitcher
+long_description An easy to use cross-platform panoramic imaging \
+ toolchain based on Panorama Tools. With hugin you \
+ can assemble a mosaic of photographs into a complete \
+ immersive panorama, stitch any series of overlapping \
+ pictures and much more.
+
+homepage http://hugin.sourceforge.net
+platforms darwin
+
+master_sites sourceforge:hugin
+distname hugin-${version}
+use_bzip2 yes
+
+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: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 I already had swig installed,
+# but after it has been detected, it required swig-python
+# and additional python definitions, else it failed to bulid
+
+# TODO: try to define or see where MAC_SELF_CONTAINED_BUNDLE gets defined
+
+patchfiles patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch \
+ patch-src-foreign-zthread-include-zthread-Guard.h.diff \
+ patch-src-hugin1-base_wx-platform.h.diff
+
+depends_run port:enblend \
+ port:p5.12-image-exiftool
+
+checksums md5 6a4fb2585eb3539ba6769cf4557f6e88 \
+ sha1 53f97d030716e66dc5a49c7e786686a9d5262b8d \
+ rmd160 703c01d6d3f35b4cb9fdeeaf25c2b321157e925f
+
+# 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
+
+
+# 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]} {
+ if {[vercmp $xcodeversion 4.4] >= 0} {
+ default_variants +wxgtk28
+ } else {
+ default_variants +wxwidgets28
+ }
+}
+
+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex Hugin-(\[.0-9\]+) released
Added: users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
===================================================================
--- users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch (rev 0)
+++ users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch 2013-08-18 07:01:26 UTC (rev 109591)
@@ -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: users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
===================================================================
--- users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff (rev 0)
+++ users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff 2013-08-18 07:01:26 UTC (rev 109591)
@@ -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: users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
===================================================================
--- users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff (rev 0)
+++ users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff 2013-08-18 07:01:26 UTC (rev 109591)
@@ -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);
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130818/a030d4fd/attachment.html>
More information about the macports-changes
mailing list