<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00c62d378a0c6a3ef304a60f60e18815d1ce62fa">https://github.com/macports/macports-ports/commit/00c62d378a0c6a3ef304a60f60e18815d1ce62fa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00c62d378a0c6a3ef304a60f60e18815d1ce62fa
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Mon Jul 29 10:39:22 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass: Update to 8.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add PostgreSQL 16 variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Due to packaging glitch, temporarily use GitHub as master site for this release.
</span>---
gis/grass/Portfile | 31 +++++---
gis/grass/files/01_patch-dyld-link.diff | 12 +--
gis/grass/files/03_patch_python312.diff | 13 ---
gis/grass/files/04_patch-pdal.diff | 135 --------------------------------
4 files changed, 24 insertions(+), 167 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/Portfile b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4533524977..d8ab69e65c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,17 @@
</span>
PortSystem 1.0
PortGroup debug 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name grass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Revert to https://grass.osgeo.org as master site with next point release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# name grass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup osgeo grass 8.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version 8.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
maintainers {yahoo.com:n_larsson @nilason} openmaintainer
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,12 +32,12 @@ long_description GRASS GIS offers powerful raster, vector, and geospatial \
</span> to enable graphical user interface.
homepage https://grass.osgeo.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/grass[join [lrange [split ${version} .] 0 1] {}]/source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname grass-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# master_sites ${homepage}/grass[join [lrange [split ${version} .] 0 1] {}]/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir grass
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1061cb30745d01a48264b9de617e18f1c0d2f910 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab924978c9d77dad9df9cdd8007955ef5ed6b377010e96f18bbfc85a99fba43c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 68662576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f8f4a671ad8b97a562a19c635b2577597decbebf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5669a217ba4cee3e7a514b2e45038a42795f0d9030c02cc741878dcb53360de8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 69895829
</span>
depends_build-append \
port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,16 +52,15 @@ depends_lib-append port:bzip2 \
</span> port:geos \
port:liblas \
port:libpng \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsvm \
</span> port:pdal \
port:readline \
port:sqlite3 \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
patchfiles 01_patch-dyld-link.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 02_grass-python.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 03_patch_python312.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 04_patch-pdal.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02_grass-python.diff
</span>
# c++17 needed for PDAL 2.4+
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +87,7 @@ configure.args-append \
</span> --with-geos=${prefix}/bin/geos-config \
--with-lapack=no \
--with-liblas=${prefix}/bin/liblas-config \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libsvm=yes \
</span> --with-mysql=no \
--with-opencl=no \
--with-opengl=osx \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,7 +152,7 @@ if {${subport} eq ${name}} {
</span> }
# PostGreSQL variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set postgresql_versions {12 13 14 15}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set postgresql_versions {12 13 14 15 16}
</span> set postgresql_variants {}
foreach pg_version ${postgresql_versions} {
lappend postgresql_variants postgresql${pg_version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/01_patch-dyld-link.diff b/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ca52222b44..20708291375 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> Use dynamic linking instead of hardcoded rpath.
lib/init/grass.py: Use LD_RUN_PATH instead of DYLD_LIBRARY_PATH to pass lib path to ctypesgen
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-06-24 12:01:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-06-24 18:05:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4327,10 +4327,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-07-27 15:32:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-07-29 10:02:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5240,10 +5240,10 @@
</span> *-apple-darwin*)
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ lib/init/grass.py: Use LD_RUN_PATH instead of DYLD_LIBRARY_PATH to pass lib path
</span> ;;
*-sun-solaris*)
# Note: If _REENTRANT isn't defined, then Solaris
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/init/grass.py.orig 2023-01-21 18:40:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/init/grass.py 2023-05-31 23:30:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/init/grass.py.orig 2024-07-27 15:32:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/init/grass.py 2024-07-29 10:01:46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@
</span> GRASS_VERSION = "@GRASS_VERSION_NUMBER@"
GRASS_VERSION_MAJOR = "@GRASS_VERSION_MAJOR@"
GRASS_VERSION_MINOR = "@GRASS_VERSION_MINOR@"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/03_patch_python312.diff b/gis/grass/files/03_patch_python312.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e9c904b78e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/03_patch_python312.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Added upstream with https://github.com/OSGeo/grass/commit/47aa6e13ce62076f77dcb4cadb452ca6a57a00c6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/init/grass.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- matches = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://docs.python.org/3/library/stdtypes.html#old-string-formatting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for m in re.finditer(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "%([#0 +-]*)([0-9]*)(\.[0-9]*)?([hlL]?[diouxXeEfFgGcrsa%])", fmt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r"%([#0 +-]*)([0-9]*)(\.[0-9]*)?([hlL]?[diouxXeEfFgGcrsa%])", fmt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- matches.append(m)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/04_patch-pdal.diff b/gis/grass/files/04_patch-pdal.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b973240b41f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/04_patch-pdal.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,135 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Addressed upstream: https://github.com/OSGeo/grass/commit/544a78044fb61d74ecac5683268dccbb1320bd38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2024-03-06 22:24:05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-04-09 10:47:08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9378,41 +9378,52 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ac_fn_cxx_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PDAL_LIBS="$PDAL_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "#define HAVE_PDAL 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PDAL NoFilenameWriter" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking whether to use PDAL NoFilenameWriter... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <pdal/PointTable.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <pdal/Streamable.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- class St:public pdal::Streamable {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <pdal/Writer.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ class St:public pdal::NoFilenameWriter {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--pdal::PointTable table;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ class NFWTest : public pdal::NoFilenameWriter {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ac_fn_cxx_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PDAL_LIBS="$PDAL_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "#define HAVE_PDAL_NOFILENAMEWRITER 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=${ac_save_libs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${ac_save_cflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "#define HAVE_PDAL 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2024-03-06 22:24:05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2024-04-09 10:39:46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1058,18 +1058,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$LIBS $PDAL_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="$CFLAGS $PDAL_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pdal/PointTable.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <pdal/Streamable.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_TRY_LINK([#include <pdal/PointTable.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pdal/Streamable.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- class St:public pdal::Streamable {};],[pdal::PointTable table;],PDAL_LIBS="$PDAL_LIBS",[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [PDAL_LIBS="$PDAL_LIBS"],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([*** Unable to locate suitable (>=1.7.1) PDAL library.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(HAVE_PDAL, 1, [Define to 1 if PDAL exists.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_CHECKING(whether to use PDAL NoFilenameWriter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pdal/Writer.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ class St:public pdal::NoFilenameWriter {};]], [[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ class NFWTest : public pdal::NoFilenameWriter {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(HAVE_PDAL_NOFILENAMEWRITER, 1, [Define to 1 if PDAL NoFilenameWriter is present.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],[AC_MSG_RESULT(no)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=${ac_save_libs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${ac_save_cflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE(HAVE_PDAL, 1, [Define to 1 if PDAL is to be used.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(PDAL_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/grass/config.h.in.orig 2024-03-06 22:24:05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/grass/config.h.in 2024-04-09 10:44:21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,6 +155,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if PDAL is to be used. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_PDAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Define to 1 if PDAL NoFilenameWriter is present. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_PDAL_NOFILENAMEWRITER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* define if glXCreateGLXPixmap exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_PIXMAPS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.in.pdal/grassrasterwriter.h.orig 2024-03-06 22:24:05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.in.pdal/grassrasterwriter.h 2024-04-09 10:45:31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pdal/Writer.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Binning code wrapped as a PDAL Writer class */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_PDAL_NOFILENAMEWRITER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class GrassRasterWriter : public pdal::NoFilenameWriter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public pdal::Streamable {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GrassRasterWriter() : n_processed(0) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>