<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/708b6295b9fb3abf71687c8815f40c5a45d764e9">https://github.com/macports/macports-ports/commit/708b6295b9fb3abf71687c8815f40c5a45d764e9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 708b629 liblas: Update to 1.8.1-20200508
</span>708b629 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 708b6295b9fb3abf71687c8815f40c5a45d764e9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 8 19:35:57 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> liblas: Update to 1.8.1-20200508
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60366
</span>---
gis/liblas/Portfile | 24 +++++++++------------
gis/liblas/files/no-rpath.patch | 33 +++++++++++++++++++++++++++++
gis/liblas/files/patch-gt_citation_cpp.diff | 33 -----------------------------
gis/liblas/files/patch-gt_wkt_srs_cpp.diff | 18 +++++++++-------
4 files changed, 53 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/Portfile b/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7de29a4..475d81d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,17 @@
</span> #-*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libLAS libLAS 8c7f310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libLAS libLAS e12742f4152146d3a71f9b2de573257e91736c93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.1-20200508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 821d42764b5233beedc1772f0bb8ca69da3f35af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a2e007246148e631b38e3afe6c4f3058751cdc894260ab6b1ce7f5380b13de70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10742250
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name liblas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.1.99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span> license BSD
categories gis
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,15 +25,10 @@ long_description \
</span> interchange and archival.
homepage https://liblas.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c6622541324b2483cdc0e4e3db459c4c9400fda0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 327aea3d248d3921ec36a2866cbf98f940542ad1fe8b64079f7041a7e8005330 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10734404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname libLAS-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-gt_wkt_srs_cpp.diff
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,10 +36,7 @@ configure.args-append \
</span> -DWITH_GDAL=ON \
-DWITH_LASZIP=OFF \
-DPROJ4_INCLUDE_DIR=${prefix}/lib/proj6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_LIBRARY=${prefix}/lib/proj6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_LIBRARY=${prefix}/lib/proj6
</span>
depends_lib-append port:boost \
port:gdal \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/files/no-rpath.patch b/gis/liblas/files/no-rpath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0e41e10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/liblas/files/no-rpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use rpath.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libLAS/libLAS/pull/185
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,6 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Path to additional CMake modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MODULE_PATH "${libLAS_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_MACOSX_RPATH OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # General build settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -248,17 +248,6 @@ target_include_directories(las_c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${libLAS_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<INSTALL_INTERFACE:${LIBLAS_INCLUDE_DIR}>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- las_c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_NAME_DIR "@rpath" BUILD_WITH_INSTALL_RPATH ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- las
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_NAME_DIR "@rpath" BUILD_WITH_INSTALL_RPATH ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Targets installation. The EXPORT clause specifies a depends target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which packages up information about the libraries for
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/files/patch-gt_citation_cpp.diff b/gis/liblas/files/patch-gt_citation_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index abad32a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/liblas/files/patch-gt_citation_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gt_citation.cpp.old 2016-08-22 15:06:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gt_citation.cpp 2018-10-16 14:08:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +155,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p1 --;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p2 = p1 - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while( p2>(char *)0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p2--;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(p2 != p1 - 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p1 = p2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,7 +198,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p1 --;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* p2 = p1 - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while( p2>(char *)0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p2--;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(p2 != p1 - 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p1 = p2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,10 +387,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- osCitation += primemName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bRewriteGeogCitation = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double primemValue = poSRS->GetPrimeMeridian(NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double primemValue = poSRS->GetPrimeMeridian((char **)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(angUnitName && !EQUAL(angUnitName, "Degree"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double aUnit = poSRS->GetAngularUnits(NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double aUnit = poSRS->GetAngularUnits((char **)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- primemValue *= aUnit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GTIFKeySet( psGTIF, GeogPrimeMeridianLongGeoKey, TYPE_DOUBLE, 1,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/files/patch-gt_wkt_srs_cpp.diff b/gis/liblas/files/patch-gt_wkt_srs_cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 22c8b00..e78df7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/liblas/files/patch-gt_wkt_srs_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/liblas/files/patch-gt_wkt_srs_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gt_wkt_srs.cpp.old 2019-09-03 14:09:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gt_wkt_srs.cpp 2019-09-03 14:09:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+FixupOrdering was removed in gdal 2.5.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libLAS/libLAS/issues/164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: no member named 'FixupOrdering' in 'OGRSpatialReference'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gt_wkt_srs.cpp.orig 2020-05-08 15:45:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gt_wkt_srs.cpp 2020-06-08 19:25:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +299,6 @@
</span> oSRS.SetFromUserInput(pszWKT);
oSRS.SetExtension( "PROJCS", "PROJ4",
"+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs" );
- oSRS.FixupOrdering();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //oSRS.FixupOrdering();
</span> CPLFree(pszWKT);
pszWKT = NULL;
oSRS.exportToWkt(&pszWKT);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -505,7 +505,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -505,7 +504,6 @@
</span> {
char *pszWKT;
oSRS.morphFromESRI();
- oSRS.FixupOrdering();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //oSRS.FixupOrdering();
</span> if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
return pszWKT;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1107,7 +1107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1107,7 +1105,6 @@
</span> /* ==================================================================== */
char *pszWKT;
- oSRS.FixupOrdering();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //oSRS.FixupOrdering();
</span>
if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
return pszWKT;
</pre><pre style='margin:0'>
</pre>