[145303] trunk/dports/science/magicspp
takeshi at macports.org
takeshi at macports.org
Sun Jan 31 00:04:21 PST 2016
Revision: 145303
https://trac.macports.org/changeset/145303
Author: takeshi at macports.org
Date: 2016-01-31 00:04:21 -0800 (Sun, 31 Jan 2016)
Log Message:
-----------
magicspp: update to 2.26.7
Modified Paths:
--------------
trunk/dports/science/magicspp/Portfile
Added Paths:
-----------
trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff
trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff
Removed Paths:
-------------
trunk/dports/science/magicspp/files/patch-src-decoders-GribSatelliteInterpretor.cc.diff
Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile 2016-01-31 06:01:57 UTC (rev 145302)
+++ trunk/dports/science/magicspp/Portfile 2016-01-31 08:04:21 UTC (rev 145303)
@@ -9,8 +9,7 @@
perl5.branches 5.22
name magicspp
-version 2.24.7
-revision 2
+version 2.26.2
platforms darwin
maintainers takeshi
license Apache-2
@@ -19,8 +18,8 @@
homepage http://software.ecmwf.int/wiki/display/MAGP/Magics
master_sites https://software.ecmwf.int/wiki/download/attachments/3473464/
distname Magics-${version}-Source
-checksums sha1 4e6c0523b2c038a830ecac08507f9d994c67f9eb \
- rmd160 98461d18f6a504077628b264e28267c7d2d0e251
+checksums rmd160 6645fae67dedaee821ce4a5a8a9d3878a279f4e0 \
+ sha256 176f95e46552cf52f43c2084b11c72df9749c843a981081d8c50af4419d4edc4
long_description \
Magics++ is the latest generation of the ECMWF's Meteorological plotting \
software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
@@ -38,11 +37,14 @@
depends_build-append \
port:flex \
- port:pkgconfig
+ port:pkgconfig \
+ port:swig-python
depends_lib port:libemos \
+ port:tiff \
port:libgeotiff \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:grib_api \
+ port:netcdf \
port:netcdf-cxx \
port:mesa \
port:xorg-libXau \
@@ -53,14 +55,25 @@
port:ghostscript \
port:boost \
port:proj \
- port:swig-python
+ port:libpng \
+ port:zlib \
+ port:jasper \
+ port:jpeg \
+ port:openjpeg \
+ port:expat \
+ port:hdf5 \
+ port:cairo \
+ port:gettext \
+ port:fftw-3 \
+ port:glib2
require_active_variants cairo x11
universal_variant no
default_variants-append +python27
-patchfiles patch-src-decoders-GribSatelliteInterpretor.cc.diff
+patchfiles patch-CMakeLists.txt.diff \
+ patch-src-drivers-CairoDriver.cc.diff
configure.args-append -DBOOST_ROOT=${prefix} \
-DCMAKE_Fortran_COMPILER=${configure.fc} \
@@ -89,17 +102,17 @@
-DPROJ4_LIBRARY=${prefix}/lib/libproj.dylib \
-DSWIG_EXECUTABLE=${prefix}/bin/swig
post-configure {
- reinplace "s|-lcairo|-lcairo -lX11 -ltiff|" ${workpath}/build/src/CMakeFiles/MagPlusShared.dir/link.txt
+ foreach d {"" Single Double} {
+ reinplace "s|-lcairo|-lcairo -lX11 -ltiff|" ${workpath}/build/src/CMakeFiles/MagPlus${d}.dir/link.txt
+ }
foreach d {bufr grib} {
reinplace "s|${configure.fc}|${configure.cxx}|" ${workpath}/build/test/CMakeFiles/${d}_fortran.dir/link.txt
}
- reinplace "s|-I${prefix}/include ||g" ${workpath}/build/src/magics.pc
}
cmake.out_of_source yes
post-destroot {
- xinstall -m 644 ${worksrcpath}/src/common/magics_api.h ${destroot}${prefix}/include
file rename ${destroot}${prefix}/share/templates ${destroot}${prefix}/share/magics
if {[variant_isset python27]} {
file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/${pyver}/lib/python${pyver}/site-packages
Added: trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/science/magicspp/files/patch-CMakeLists.txt.diff 2016-01-31 08:04:21 UTC (rev 145303)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2015-12-15 18:31:27.000000000 +0900
++++ CMakeLists.txt 2016-01-31 15:48:44.000000000 +0900
+@@ -265,7 +265,7 @@
+ if( HAVE_GEOTIFF )
+ list( APPEND MAGICS_EXTRA_INCLUDE_DIRS ${GEOTIFF_INCLUDE_DIR} )
+ list( APPEND MAGICS_EXTRA_LIBRARIES ${GEOTIFF_LIBRARY} )
+- list( APPEND MAGICS_EXTRA_DEFINITIONS HAVE_GEOTIFF )
++# list( APPEND MAGICS_EXTRA_DEFINITIONS HAVE_GEOTIFF )
+ endif()
+
+ list( APPEND MAGICS_EXTRA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
Deleted: trunk/dports/science/magicspp/files/patch-src-decoders-GribSatelliteInterpretor.cc.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-src-decoders-GribSatelliteInterpretor.cc.diff 2016-01-31 06:01:57 UTC (rev 145302)
+++ trunk/dports/science/magicspp/files/patch-src-decoders-GribSatelliteInterpretor.cc.diff 2016-01-31 08:04:21 UTC (rev 145303)
@@ -1,13 +0,0 @@
---- src/decoders/GribSatelliteInterpretor.cc.orig 2015-04-23 00:35:55.000000000 +0900
-+++ src/decoders/GribSatelliteInterpretor.cc 2015-06-30 21:50:25.000000000 +0900
-@@ -223,8 +223,8 @@
- /* page 28, Ref. [1]. And finding nearest integer value for them. */
-
-
-- cc = coff + xx * pow(2,-16) * cfac ;
-- ll = loff + yy * pow(2,-16) * lfac ;
-+ cc = coff + xx * pow(2.,-16) * cfac ;
-+ ll = loff + yy * pow(2.,-16) * lfac ;
-
-
- ccc=nint(cc);
Added: trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff (rev 0)
+++ trunk/dports/science/magicspp/files/patch-src-drivers-CairoDriver.cc.diff 2016-01-31 08:04:21 UTC (rev 145303)
@@ -0,0 +1,10 @@
+--- src/drivers/CairoDriver.cc.orig 2015-12-15 18:33:04.000000000 +0900
++++ src/drivers/CairoDriver.cc 2016-01-31 15:10:53.000000000 +0900
+@@ -539,6 +539,7 @@
+
+ // DPI
+ TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);
++ const double resolution_ = 72.;
+ TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float) resolution_);
+ TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float) resolution_);
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160131/b2328af8/attachment.html>
More information about the macports-changes
mailing list