[127765] trunk/dports/gis/gdal
vince at macports.org
vince at macports.org
Mon Nov 3 08:57:06 PST 2014
Revision: 127765
https://trac.macports.org/changeset/127765
Author: vince at macports.org
Date: 2014-11-03 08:57:05 -0800 (Mon, 03 Nov 2014)
Log Message:
-----------
Bump to 1.11.1
Modified Paths:
--------------
trunk/dports/gis/gdal/Portfile
Added Paths:
-----------
trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff
trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff
Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile 2014-11-03 14:01:21 UTC (rev 127764)
+++ trunk/dports/gis/gdal/Portfile 2014-11-03 16:57:05 UTC (rev 127765)
@@ -4,8 +4,8 @@
PortSystem 1.0
name gdal
-version 1.11.0
-revision 1
+version 1.11.1
+#revision 1
categories gis
license MIT BSD
platforms darwin
@@ -27,8 +27,8 @@
http://download.osgeo.org/gdal/ \
http://download.osgeo.org/gdal/CURRENT/
-checksums rmd160 0a522a145131b65103d0e6c02e52651069005e48 \
- sha256 989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe
+checksums rmd160 9ebfbebeaff99a533bb4f4cf33b3f747e1ced9b4 \
+ sha256 f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340
depends_lib-append port:zlib \
port:libpng \
@@ -99,8 +99,25 @@
# Patch to ensure that the python installation respects DESTDIR
patchfiles patch-swig_python_GNUmakefile \
patch-gdalwarpkernel_opencl_c.diff \
- patch-gdalwarpkernel_opencl_h.diff
+ patch-gdalwarpkernel_opencl_h.diff \
+ patch-pdfcreatecopy_h.diff \
+ patch-pdfcreatecopy_cpp.diff
+# local cpl_port.h is masked by ${prefix} one
+
+post-extract {
+ file copy ${worksrcpath}/port/cpl_port.h ${worksrcpath}/port/Cpl_port.h
+ set files_to_patch [exec find ${worksrcpath} -type f -exec grep -l "cpl_port.h" \{\} \;]
+ foreach file ${files_to_patch} {
+ puts ${file}
+ reinplace -locale C "s|cpl_port.h|Cpl_port.h|" ${file}
+ }
+}
+
+post-build {
+ file delete ${worksrcpath}/port/Cpl_port.h
+}
+
# Patches for universal build
post-configure {
reinplace -E "s|(INST_PYMOD).*|\\1\t=\t${PYINST}|" \
@@ -227,18 +244,7 @@
configure.args-append --with-expat=${prefix}
}
-# Python variants
-variant python26 conflicts python27 \
- description {Enable Python 2.6 support} {
- depends_lib-append port:python26 \
- port:py26-numpy
- configure.args-delete --without-python
- configure.args-append --with-python
- set PYINST ${frameworks_dir}/Python.framework/Versions/2.6
- build.args-append PYTHON=python2.6
- use_parallel_build no
-}
-
+# Python variant
variant python27 conflicts python26 \
description {Enable Python 2.7 support} {
depends_lib-append port:python27 \
@@ -321,7 +327,6 @@
# Perf variant to optimize code
variant perf description {Optimize for speed} {
- configure.compiler macports-clang-3.4
configure.cflags -O3 -pipe -march=native
configure.cxxflags -O3 -pipe -march=native
}
@@ -337,6 +342,7 @@
}
reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${worksrcpath}/GDALmake.opt
+ reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I/opt/local -I/opt/local/include|" ${worksrcpath}/GDALmake.opt
}
post-destroot {
Added: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff
===================================================================
--- trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff 2014-11-03 16:57:05 UTC (rev 127765)
@@ -0,0 +1,20 @@
+--- frmts/pdf/pdfcreatecopy.cpp.orig 2014-11-03 16:38:24.000000000 +0100
++++ frmts/pdf/pdfcreatecopy.cpp 2014-11-03 16:39:00.000000000 +0100
+@@ -1895,8 +1895,6 @@
+ return TRUE;
+ }
+
+-#ifdef OGR_ENABLED
+-
+ /************************************************************************/
+ /* WriteOGRDataSource() */
+ /************************************************************************/
+@@ -2960,8 +2958,6 @@
+ return TRUE;
+ }
+
+-#endif
+-
+ /************************************************************************/
+ /* EndPage() */
+ /************************************************************************/
Added: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff
===================================================================
--- trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff 2014-11-03 16:57:05 UTC (rev 127765)
@@ -0,0 +1,28 @@
+--- frmts/pdf/pdfcreatecopy.h.orig 2014-11-03 16:40:58.000000000 +0100
++++ frmts/pdf/pdfcreatecopy.h 2014-11-03 16:41:20.000000000 +0100
+@@ -35,9 +35,7 @@
+ #include <vector>
+ #include <map>
+
+-#ifdef OGR_ENABLED
+ #include "ogr_api.h"
+-#endif
+
+ typedef enum
+ {
+@@ -235,7 +233,6 @@
+ int nBlockXSize, int nBlockYSize,
+ GDALProgressFunc pfnProgress,
+ void * pProgressData);
+-#ifdef OGR_ENABLED
+ int WriteOGRDataSource(const char* pszOGRDataSource,
+ const char* pszOGRDisplayField,
+ const char* pszOGRDisplayLayerNames,
+@@ -262,7 +259,6 @@
+ int bWriteOGRAttributes,
+ int& iObj,
+ int& iObjLayer);
+-#endif
+
+ int WriteJavascript(const char* pszJavascript);
+ int WriteJavascriptFile(const char* pszJavascriptFile);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141103/62f08764/attachment.html>
More information about the macports-changes
mailing list