[Git][debian-gis-team/grass][upstream] New upstream version 8.2.1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Jan 22 06:48:37 GMT 2023
Bas Couwenberg pushed to branch upstream at Debian GIS Project / grass
Commits:
b677f675 by Bas Couwenberg at 2023-01-22T06:29:59+01:00
New upstream version 8.2.1
- - - - -
30 changed files:
- Makefile
- REQUIREMENTS.html
- configure
- configure.ac
- docker/alpine/Dockerfile
- docker/debian/Dockerfile
- docker/ubuntu/Dockerfile
- grasslib.dox
- gui/wxpython/mapdisp/frame.py
- gui/wxpython/mapdisp/toolbars.py
- include/Make/Platform.make.in
- include/VERSION
- include/grass/gis.h
- lib/gis/env.c
- lib/gis/gislib_cmdline_parsing.dox
- lib/gis/parser_html.c
- lib/init/grass.py
- lib/init/grass.sh
- lib/vector/diglib/spindex_rw.c
- man/build_graphical_index.py
- man/build_html.py
- man/build_rest.py
- man/sphinx/conf.py
- python/grass/docs/conf.py
- python/grass/script/core.py
- python/grass/script/setup.py
- raster/r.in.pdal/Makefile
- raster/r.proj/r.proj.html
- utils/mkhtml.py
- vector/v.in.pdal/Makefile
Changes:
=====================================
Makefile
=====================================
@@ -9,7 +9,7 @@
# PURPOSE: It provides the commands necessary to compile, install,
# clean, and uninstall GRASS
# See INSTALL.md file for usage.
-# COPYRIGHT: (C) 2002-2022 by the GRASS Development Team
+# COPYRIGHT: (C) 2002-2023 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (>=v2). Read the file COPYING that comes with GRASS
=====================================
REQUIREMENTS.html
=====================================
@@ -234,7 +234,7 @@ MacOSX users may go here to download precompiled libraries etc.:
<p>
<hr width="100%">
-<i>© GRASS Development Team 1997-2022</i>
+<i>© GRASS Development Team 1997-2023</i>
<p>Please report bugs here:
<br><a href="https://grass.osgeo.org/contribute/">https://grass.osgeo.org/contribute/</a>
=====================================
configure
=====================================
@@ -9015,7 +9015,6 @@ fi
if test "$PDAL_CONFIG" != "" ; then
PDAL_LIBS=`"$PDAL_CONFIG" --libs`
- PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags`
PDAL_INC=`"$PDAL_CONFIG" --includes`
USE_PDAL=1
fi
@@ -9023,10 +9022,8 @@ fi
PDAL=
ac_save_libs="$LIBS"
ac_save_cflags="$CFLAGS"
- ac_save_cppflags="$CPPFLAGS"
LIBS="$LIBS $PDAL_LIBS"
CFLAGS="$CFLAGS $PDAL_CFLAGS"
- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9318,7 +9315,6 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=${ac_save_libs}
CFLAGS=${ac_save_cflags}
- CPPFLAGS=${ac_save_cppflags}
$as_echo "#define HAVE_PDAL 1" >>confdefs.h
=====================================
configure.ac
=====================================
@@ -9,7 +9,7 @@
# PURPOSE: This configure runs all the tests to determine what components
# are installed on the current system. It also defines certain
# configuration variables for compilation and installation.
-# COPYRIGHT: (C) 2000-2021 by the GRASS Development Team
+# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
@@ -992,7 +992,6 @@ else
if test "$PDAL_CONFIG" != "" ; then
PDAL_LIBS=`"$PDAL_CONFIG" --libs`
- PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags`
PDAL_INC=`"$PDAL_CONFIG" --includes`
USE_PDAL=1
fi
@@ -1000,10 +999,8 @@ else
PDAL=
ac_save_libs="$LIBS"
ac_save_cflags="$CFLAGS"
- ac_save_cppflags="$CPPFLAGS"
LIBS="$LIBS $PDAL_LIBS"
CFLAGS="$CFLAGS $PDAL_CFLAGS"
- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pdal/PointTable.hpp>
#include <pdal/Streamable.hpp>
class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[
@@ -1015,7 +1012,6 @@ else
])
LIBS=${ac_save_libs}
CFLAGS=${ac_save_cflags}
- CPPFLAGS=${ac_save_cppflags}
AC_DEFINE(HAVE_PDAL, 1, [define if PDAL exists])
fi
=====================================
docker/alpine/Dockerfile
=====================================
@@ -220,12 +220,16 @@ ENV GRASSBIN="/usr/local/bin/grass" \
SHELL="/bin/bash"
ENV PROJ_NETWORK="ON"
-
# show installed version
RUN grass --tmp-location XY --exec g.version -rge && \
pdal --version && \
python3 --version
+# test r.in.pdal in final image because test stage is not executed in github action
+COPY docker/testdata/simple.laz /tmp/simple.laz
+RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g
+
+
# Data workdir
WORKDIR /grassdb
VOLUME /grassdb
=====================================
docker/debian/Dockerfile
=====================================
@@ -226,9 +226,6 @@ WORKDIR /scripts
# install external GRASS GIS session Python API
RUN pip3 install grass-session
-# install GRASS GIS extensions
-RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal
-
# add GRASS GIS envs for python usage
ENV GISBASE "/usr/local/grass/"
ENV GRASSBIN "/usr/local/bin/grass"
@@ -242,7 +239,7 @@ COPY docker/testdata/test_grass_session.py .
## just scan the LAZ file
# Not yet ready for GRASS GIS 8:
#RUN /usr/bin/python3 /scripts/test_grass_session.py
-RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s
+RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g
WORKDIR /grassdb
VOLUME /grassdb
=====================================
docker/ubuntu/Dockerfile
=====================================
@@ -220,9 +220,6 @@ WORKDIR /scripts
# install external GRASS GIS session Python API
RUN pip3 install grass-session
-# install GRASS GIS extensions
-RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal
-
# add GRASS GIS envs for python usage
ENV GISBASE "/usr/local/grass/"
ENV GRASSBIN "/usr/local/bin/grass"
@@ -236,7 +233,7 @@ COPY docker/testdata/test_grass_session.py .
## just scan the LAZ file
# Not yet ready for GRASS GIS 8:
#RUN /usr/bin/python3 /scripts/test_grass_session.py
-RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s
+RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g
WORKDIR /grassdb
VOLUME /grassdb
=====================================
grasslib.dox
=====================================
@@ -1,7 +1,7 @@
/*! \mainpage GRASS GIS 8 Programmer's Manual
<!-- * doxygenized from "GRASS 5 Programmer's Manual"
by M. Neteler 2/2004
- * updated 8/2005, 2006-2008, 2010-2011, 2017-2022
+ * updated 8/2005, 2006-2008, 2010-2011, 2017-2023
-->
<a href="https://grass.osgeo.org">GRASS GIS</a> (<b>Geographic
@@ -23,7 +23,7 @@ Team</a>, an international team of programmers, GRASS module authors
are cited within their module's source code and the contributed manual
pages.
-© 2000-2022 by the GRASS Development Team
+© 2000-2023 by the GRASS Development Team
This manual is published under <a
href="http://www.fsf.org/copyleft/fdl.html">GNU Free Documentation
=====================================
gui/wxpython/mapdisp/frame.py
=====================================
@@ -621,6 +621,11 @@ class MapPanel(SingleMapPanel):
.BestSize((self.toolbars["map"].GetBestSize())),
)
+ # nviz
+ elif name == "nviz":
+ self.toolbars["map"].combo.SetValue(_("3D view"))
+ self.AddNviz()
+
# vector digitizer
elif name == "vdigit":
self.toolbars["map"].combo.SetValue(_("Vector digitizer"))
=====================================
gui/wxpython/mapdisp/toolbars.py
=====================================
@@ -294,12 +294,14 @@ class MapToolbar(BaseToolbar):
if tool == self.toolId["2d"]:
self.ExitToolbars()
self.Enable2D(True)
+ self.parent.MapWindow.SetFocus()
elif tool == self.toolId["3d"] and not (
self.parent.MapWindow3D and self.parent.IsPaneShown("3d")
):
self.ExitToolbars()
- self.parent.AddNviz()
+ self.parent.AddToolbar("nviz")
+ self.parent.MapWindow.SetFocus()
elif tool == self.toolId["vdigit"] and not self.parent.GetToolbar("vdigit"):
self.ExitToolbars()
@@ -308,7 +310,8 @@ class MapToolbar(BaseToolbar):
elif tool == self.toolId["rdigit"]:
self.ExitToolbars()
- self.parent.AddRDigit()
+ self.parent.AddToolbar("rdigit")
+ self.parent.MapWindow.SetFocus()
def OnAnalyze(self, event):
"""Analysis tools menu"""
=====================================
include/Make/Platform.make.in
=====================================
@@ -180,7 +180,6 @@ USE_LIBLAS = @USE_LIBLAS@
#LAS LiDAR through PDAL
PDALLIBS = @PDAL_LIBS@
-PDALCPPFLAGS = @PDAL_CPPFLAGS@
PDALINC = @PDAL_INC@
USE_PDAL = @USE_PDAL@
=====================================
include/VERSION
=====================================
@@ -1,4 +1,4 @@
8
2
-1RC1
-2022
+1
+2023
=====================================
include/grass/gis.h
=====================================
@@ -7,7 +7,7 @@
* PURPOSE: This file contains definitions of variables and data types
* for use with most, if not all, Grass programs. This file is
* usually included in every Grass program.
- * COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
+ * COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
=====================================
lib/gis/env.c
=====================================
@@ -3,7 +3,7 @@
\brief GIS library - environment routines
- (C) 2001-2022 by the GRASS Development Team
+ (C) 2001-2023 by the GRASS Development Team
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
=====================================
lib/gis/gislib_cmdline_parsing.dox
=====================================
@@ -4,7 +4,7 @@
<!--
extracted form gislib.dox and improved by Vaclav Petras, 2013
-Copyright 2004-2022 by the GRASS Development Team
+Copyright 2004-2023 by the GRASS Development Team
Published under GNU Free Documentation License
-->
=====================================
lib/gis/parser_html.c
=====================================
@@ -4,7 +4,7 @@
\brief GIS Library - Argument parsing functions (HTML output)
- (C) 2001-2022 by the GRASS Development Team
+ (C) 2001-2023 by the GRASS Development Team
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
=====================================
lib/init/grass.py
=====================================
@@ -18,7 +18,7 @@
# command line options for setting the GISDBASE, LOCATION,
# and/or MAPSET. Finally it starts GRASS with the appropriate
# user interface and cleans up after it is finished.
-# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
+# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
=====================================
lib/init/grass.sh
=====================================
@@ -13,7 +13,7 @@
# setting the GISDBASE, LOCATION, and/or MAPSET.
# Finally it starts GRASS with the appropriate user
# interface and cleans up after it is finished.
-# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
+# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
=====================================
lib/vector/diglib/spindex_rw.c
=====================================
@@ -58,18 +58,19 @@ int dig_Wr_spidx_head(struct gvfile * fp, struct Plus_head *ptr)
unsigned char buf[6];
long length = 81; /* header length in bytes */
struct RTree *t;
- size_t size;
dig_rewind(fp);
dig_set_cur_port(&(ptr->spidx_port));
/* use ptr->off_t_size = 4 if possible */
if (sizeof(off_t) > 4) {
+ off_t size;
+
size = 145; /* max header size, see below */
- size += ptr->Node_spidx->n_nodes * ptr->Node_spidx->nodesize;
- size += ptr->Line_spidx->n_nodes * ptr->Line_spidx->nodesize;
- size += ptr->Area_spidx->n_nodes * ptr->Area_spidx->nodesize;
- size += ptr->Isle_spidx->n_nodes * ptr->Isle_spidx->nodesize;
+ size += (off_t)ptr->Node_spidx->n_nodes * ptr->Node_spidx->nodesize;
+ size += (off_t)ptr->Line_spidx->n_nodes * ptr->Line_spidx->nodesize;
+ size += (off_t)ptr->Area_spidx->n_nodes * ptr->Area_spidx->nodesize;
+ size += (off_t)ptr->Isle_spidx->n_nodes * ptr->Isle_spidx->nodesize;
if (size < PORT_INT_MAX)
ptr->spidx_port.off_t_size = 4;
=====================================
man/build_graphical_index.py
=====================================
@@ -5,7 +5,7 @@
# MODULE: build_graphical_index
# AUTHOR(S): Vaclav Petras <wenzeslaus gmail com>
# PURPOSE: Build graphical index
-# COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team
+# COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (>=v2). Read the file COPYING that comes with GRASS
=====================================
man/build_html.py
=====================================
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# utilities for generating HTML indices
-# (C) 2003-2022 Markus Neteler and the GRASS Development Team
+# (C) 2003-2023 Markus Neteler and the GRASS Development Team
# Authors:
# Markus Neteler
# Glynn Clements
=====================================
man/build_rest.py
=====================================
@@ -9,7 +9,7 @@ Created on Thu Aug 9 14:04:12 2012
"""
# utilities for generating REST indices
# utilities for generating HTML indices
-# (C) 2003-2022 by Luca Delucchi and the GRASS Development Team
+# (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
import os
import string
@@ -169,7 +169,7 @@ footer_tmpl = string.Template(
--------------
:doc:`Manual main page <index>` \| :doc:`Full Index <full_index>`
- 2003-2022 `GRASS Development Team <https://grass.osgeo.org>`_, GRASS GIS ${grass_version} Reference Manual
+ 2003-2023 `GRASS Development Team <https://grass.osgeo.org>`_, GRASS GIS ${grass_version} Reference Manual
"""
)
=====================================
man/sphinx/conf.py
=====================================
@@ -38,7 +38,7 @@ master_doc = "index"
# General information about the project.
project = "GRASS GIS 8.2 Documentation"
-copyright = "2022, GRASS Development Team"
+copyright = "2023, GRASS Development Team"
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -259,7 +259,7 @@ texinfo_documents = [
epub_title = "GRASS GIS 8.2 Documentation"
epub_author = "GRASS Development Team"
epub_publisher = "GRASS Development Team"
-epub_copyright = "2022, GRASS Development Team"
+epub_copyright = "2023, GRASS Development Team"
# The language of the text. It defaults to the language option
# or en if the language is not set.
=====================================
python/grass/docs/conf.py
=====================================
@@ -124,7 +124,7 @@ master_doc = "index"
# General information about the project.
project = "Python library documentation"
-copyright = "2022, GRASS Development Team"
+copyright = "2023, GRASS Development Team"
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -359,7 +359,7 @@ texinfo_documents = [
epub_title = "PythonLib"
epub_author = "GRASS Development Team"
epub_publisher = "GRASS Development Team"
-epub_copyright = "2022, GRASS Development Team"
+epub_copyright = "2023, GRASS Development Team"
# The basename for the epub file. It defaults to the project name.
# epub_basename = u'wxGUI'
=====================================
python/grass/script/core.py
=====================================
@@ -8,7 +8,7 @@ Usage:
from grass.script import core as grass
grass.parser()
-(C) 2008-2022 by the GRASS Development Team
+(C) 2008-2023 by the GRASS Development Team
This program is free software under the GNU General Public
License (>=v2). Read the file COPYING that comes with GRASS
for details.
=====================================
python/grass/script/setup.py
=====================================
@@ -65,7 +65,7 @@ Usage::
gsetup.finish()
-(C) 2010-2021 by the GRASS Development Team
+(C) 2010-2022 by the GRASS Development Team
This program is free software under the GNU General Public
License (>=v2). Read the file COPYING that comes with GRASS
for details.
=====================================
raster/r.in.pdal/Makefile
=====================================
@@ -10,12 +10,6 @@ EXTRA_CFLAGS = $(VECT_CFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
-$(OBJDIR)/main.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
-$(OBJDIR)/info.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
-$(OBJDIR)/grasslidarfilter.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
LINK = $(CXX)
ifneq ($(strip $(CXX)),)
=====================================
raster/r.proj/r.proj.html
=====================================
@@ -102,7 +102,7 @@ cells. The <b>method=bilinear</b> method determines the new value of
the cell based on a weighted distance average of the 4 surrounding
cells in the input map. The <b>method=bicubic</b> method determines the
new value of the cell based on a weighted distance average of the 16
-surrounding cells in the input map. The <b>method=lanzcos</b> method
+surrounding cells in the input map. The <b>method=lanczos</b> method
determines the new value of the cell based on a weighted distance
average of the 25 surrounding cells in the input map. Compared to
bicubic, lanczos puts a higher weight on cells close to the center and a
=====================================
utils/mkhtml.py
=====================================
@@ -7,7 +7,7 @@
# Glynn Clements
# Martin Landa <landa.martin gmail.com>
# PURPOSE: Create HTML manual page snippets
-# COPYRIGHT: (C) 2007-2022 by Glynn Clements
+# COPYRIGHT: (C) 2007-2023 by Glynn Clements
# and the GRASS Development Team
#
# This program is free software under the GNU General
=====================================
vector/v.in.pdal/Makefile
=====================================
@@ -10,8 +10,6 @@ EXTRA_CFLAGS = $(VECT_CFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
-$(OBJDIR)/main.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
LINK = $(CXX)
ifneq ($(strip $(CXX)),)
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/commit/b677f675ed34bf55a85ce5c49448a24d79020b0b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/commit/b677f675ed34bf55a85ce5c49448a24d79020b0b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230122/c4b6cea1/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list