[110687] trunk/dports/graphics/vigra
cal at macports.org
cal at macports.org
Tue Sep 3 15:34:34 PDT 2013
Revision: 110687
https://trac.macports.org/changeset/110687
Author: cal at macports.org
Date: 2013-09-03 15:34:34 -0700 (Tue, 03 Sep 2013)
Log Message:
-----------
vigra: update to 1.9.0, closes #38062, maintainer
Modified Paths:
--------------
trunk/dports/graphics/vigra/Portfile
Added Paths:
-----------
trunk/dports/graphics/vigra/files/patch-include-vigra-accumulator-grammar.hxx.diff
Modified: trunk/dports/graphics/vigra/Portfile
===================================================================
--- trunk/dports/graphics/vigra/Portfile 2013-09-03 21:55:41 UTC (rev 110686)
+++ trunk/dports/graphics/vigra/Portfile 2013-09-03 22:34:34 UTC (rev 110687)
@@ -3,9 +3,12 @@
PortSystem 1.0
+PortGroup active_variants 1.1
+PortGroup compiler_blacklist_versions 1.0
+PortGroup cmake 1.0
+
name vigra
-version 1.8.0
-revision 5
+version 1.9.0
categories graphics
platforms darwin
maintainers gmail.com:benjamin.seppke
@@ -24,50 +27,42 @@
#universal_variant no
worksrcdir ${name}-${version}
-checksums rmd160 99d781da6e0ca94ce3404e1bcb3adeb9e43a2017 \
- sha256 fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214
+checksums rmd160 84e3f1bc985df1ea928e9aa5adc6e0c153cbdd40 \
+ sha256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01
-depends_build port:cmake
+depends_build port:cmake
depends_lib port:jpeg \
port:tiff \
port:libpng \
port:zlib \
port:openexr \
- port:fftw-3 \
- port:hdf5-18
+ port:fftw-3-single \
+ port:hdf5-18
-# correct the INSTALL_NAME_DIR for Python .so modules
-patchfiles patch-config-VIGRA_ADD_NUMPY_MODULE.cmake.diff
+# Correct the INSTALL_NAME_DIR for Python .so modules
+# and patch template names in the accumulator-grammar.
+patchfiles patch-config-VIGRA_ADD_NUMPY_MODULE.cmake.diff \
+ patch-include-vigra-accumulator-grammar.hxx.diff
-configure.cmd cmake
+# Some additional parameters for cmake. All other params have already been set
+# by the cmake PortGroup
+configure.args-append -DCMAKE_INSTALL_PREFIX=${prefix} \
+ -DWITH_OPENEXR=ON \
+ -DBUILD_SHARED_LIBS=ON
-configure.args -DSKIP_BUILD_RPATH=TRUE \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\" \
- -DCMAKE_INSTALL_PREFIX=${prefix} \
- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
- -DCMAKE_INCLUDE_PATH=${prefix}/include \
- -DCMAKE_LIBRARY_PATH=${prefix}/lib \
- -DJPEG_INCLUDE_DIR=${prefix}/include \
- -DPNG_PNG_INCLUDE_DIR=${prefix}/include \
- -DTIFF_INCLUDE_DIR=${prefix}/include \
- -Wno-dev \
- -DBUILD_SHARED_LIBS=ON
-configure.post_args .
+# Restrict the usable compilers to clang and llvm (either XCode >4.0 or
+# MacPorts) and select the macports-clang-3.2 if no appropriate compiler is
+# present:
+compiler.blacklist *gcc* *dragonegg* {clang < 211.10.1}
destroot.env-append DESTDIR=${destroot}
post-destroot {
- # fix location of documentation to include version.
- # remove documentation if no variant is set.
- # for now since NumPy variant does not work, just
- # move what can be moved and delete the rest.
if {[variant_isset docs]} {
- # move documentation to a versioned directory
+ # move documentation to a unversioned directory
xinstall -m 755 -d ${destroot}${prefix}/share/doc
move ${destroot}${prefix}/doc/${name} \
- ${destroot}${prefix}/share/doc/${name}-${version}
+ ${destroot}${prefix}/share/doc/${name}
}
# delete whatever is left in the doc directory
delete ${destroot}${prefix}/doc
@@ -77,13 +72,11 @@
if {[variant_isset docs]} {
depends_lib-append port:doxygen
} else {
- configure.args-append \
- -DBUILD_doc=OFF \
- -DDOXYGEN_DOT_EXECUTABLE= \
- -DDOXYGEN_DOT_PATH= \
- -DDOXYGEN_EXECUTABLE=
+ configure.args-append -DDOXYGEN_DOT_EXECUTABLE= \
+ -DDOXYGEN_EXECUTABLE=
}
+
variant valgrind description "Include support for VALGRIND" {}
if {[variant_isset valgrind]} {
depends_lib-append port:valgrind
@@ -91,41 +84,30 @@
configure.args-append -DWITH_VALGRIND=NO
}
-# just like it's done in games/PlasmaClient and other ports that
-# require Boost::Python.
-if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
- # just disable NUMPY bindings via a CMake flag
- configure.args-append -DWITH_VIGRANUMPY=NO
+variant python26 conflicts python27 description "Also build vigranumpy ptyhon26 bindings" {
+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
+ -DPYTHON_SPHINX=${prefix}/bin/sphinx-build-2.6
+ depends_lib-append port:boost \
+ port:python26 \
+ port:py26-numpy \
+ port:py26-sphinx
+ require_active_variants boost python26
+}
- pre-fetch {
- ui_msg "
-****
-**** To get NUMPY bindings, ${name} requires the port 'boost' to
-**** be installed with the variant +python26. If you want NUMPY
-**** bindings, then please do the following first:
-****
-**** sudo port install boost +python26
-****
-**** and then try installing ${name} again.
-****
-"
- }
-} else {
- # assume Python version 2.6, no matter what the user has actually
- # installed via "port install boost +pythonXY".
- set python_version "2.6"
+variant python27 conflicts python26 description "Also build vigranumpy ptyhon27 bindings" {
+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
+ -DPYTHON_SPHINX=${prefix}/bin/sphinx-build-2.7
+ depends_lib-append port:boost \
+ port:python27 \
+ port:py27-numpy \
+ port:py27-sphinx
+ require_active_variants boost python27
+}
- # append cmake flags
- configure.args-append \
- -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_version} \
- -DPYTHON_SPHINX=${prefix}/bin/sphinx-build-${python_version}
+default_variants +python27
- # make sure dependencies are installed
- set python_version_join [join [split ${python_version} "."] ""]
- depends_lib-append port:boost \
- port:python${python_version_join} \
- port:py${python_version_join}-numpy \
- port:py${python_version_join}-sphinx
+if { ![variant_isset python26] && ![variant_isset python27] } {
+ configure.args-append -DWITH_VIGRANUMPY=NO
}
livecheck.type regex
Added: trunk/dports/graphics/vigra/files/patch-include-vigra-accumulator-grammar.hxx.diff
===================================================================
--- trunk/dports/graphics/vigra/files/patch-include-vigra-accumulator-grammar.hxx.diff (rev 0)
+++ trunk/dports/graphics/vigra/files/patch-include-vigra-accumulator-grammar.hxx.diff 2013-09-03 22:34:34 UTC (rev 110687)
@@ -0,0 +1,34 @@
+--- include/vigra/accumulator-grammar.hxx.orig 2012-11-06 13:34:42.000000000 +0100
++++ include/vigra/accumulator-grammar.hxx 2013-02-07 10:17:15.000000000 +0100
+@@ -679,22 +679,22 @@
+ typedef B type;
+ };
+
+-template <class A0, template <class> class A1, class B0, template <class> class B1>
+-struct SubstituteModifiers<A1<A0>, B1<B0>, true>
++template <class A, template <class> class AA, class B, template <class> class BB>
++struct SubstituteModifiers<AA<A>, BB<B>, true>
+ {
+- typedef A1<typename SubstituteModifiers<A0, B0>::type> type;
++ typedef AA<typename SubstituteModifiers<A, B>::type> type;
+ };
+
+-template <class A0, class B0, template <class> class B1>
+-struct SubstituteModifiers<DefaultModifier<A0>, B1<B0>, true>
++template <class A, class B, template <class> class BB>
++struct SubstituteModifiers<DefaultModifier<A>, BB<B>, true>
+ {
+- typedef B1<typename SubstituteModifiers<A0, B0>::type> type;
++ typedef BB<typename SubstituteModifiers<A, B>::type> type;
+ };
+
+-template <class A0, template <class> class A1, class B0, template <class> class B1>
+-struct SubstituteModifiers<A1<A0>, B1<B0>, false>
++template <class A, template <class> class AA, class B, template <class> class BB>
++struct SubstituteModifiers<AA<A>, BB<B>, false>
+ {
+- typedef B1<typename SubstituteModifiers<A0, B0>::type> type;
++ typedef BB<typename SubstituteModifiers<A, B>::type> type;
+ };
+
+ } // namespace detail
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130903/95e2d780/attachment.html>
More information about the macports-changes
mailing list