[113119] trunk/dports/graphics/hugin-app
mojca at macports.org
mojca at macports.org
Sat Nov 9 06:53:37 PST 2013
Revision: 113119
https://trac.macports.org/changeset/113119
Author: mojca at macports.org
Date: 2013-11-09 06:53:37 -0800 (Sat, 09 Nov 2013)
Log Message:
-----------
hugin-app: upgrade to 2013.0.0, depend just on wxWidgets-3.0
Modified Paths:
--------------
trunk/dports/graphics/hugin-app/Portfile
Removed Paths:
-------------
trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
Modified: trunk/dports/graphics/hugin-app/Portfile
===================================================================
--- trunk/dports/graphics/hugin-app/Portfile 2013-11-09 10:33:54 UTC (rev 113118)
+++ trunk/dports/graphics/hugin-app/Portfile 2013-11-09 14:53:37 UTC (rev 113119)
@@ -1,14 +1,12 @@
# -*- 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 2012.0.0
+version 2013.0.0
categories graphics
maintainers nomaintainer
description Panorama photo stitcher
@@ -25,6 +23,8 @@
distname hugin-${version}
use_bzip2 yes
+wxWidgets.use wxWidgets-3.0
+
depends_build-append port:pkgconfig
depends_lib port:boost \
port:exiv2 \
@@ -40,7 +40,8 @@
port:swig-python \
port:tclap \
port:tiff \
- port:python27
+ port:python27 \
+ port:${wxWidgets.port}
# TODO dependencies:
@@ -59,54 +60,27 @@
# 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
+ patch-src-hugin1-hugin1.pch.diff
depends_run port:enblend \
port:p5.12-image-exiftool
-checksums md5 6a4fb2585eb3539ba6769cf4557f6e88 \
- sha1 53f97d030716e66dc5a49c7e786686a9d5262b8d \
- rmd160 703c01d6d3f35b4cb9fdeeaf25c2b321157e925f
+checksums md5 cc6c768df2aedc24a9a081754de05f39 \
+ sha1 0e0689cf2ca0c4a2730cffe06380eda976b6772d \
+ rmd160 73261aa925d6284c6950c84fbfdd77e8b0a2ee7d
# 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
+ -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
+ -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
+ -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc}
# prevents some compiler errors
-configure.cxxflags-append -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
+configure.cxxflags-append -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
-# version 2013.0.0 most probably works OK with wxWidgets 2.9,
-# so all these wxWidgets-related options can probably be removed once tested
-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
Deleted: 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 2013-11-09 10:33:54 UTC (rev 113118)
+++ trunk/dports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff 2013-11-09 14:53:37 UTC (rev 113119)
@@ -1,15 +0,0 @@
-quick workaround; upstream has this fixed in 2013.0.0 and later
---- 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/20131109/b4d36e61/attachment-0001.html>
More information about the macports-changes
mailing list