Commit 6a79318a authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch 'release-8.0' into 'develop'

Backport Release 8.0.1 to develop

See merge request !913
parents b7e25935 c3473ba3
Pipeline #10832 passed with stage
in 21 minutes
......@@ -47,7 +47,7 @@ if(EXISTS "${MUPARSER_INCLUDE_DIR}/muParserDef.h")
MUPARSER_VERSION_OLD_STYLE "${_muParserDef_h_CONTENTS}")
# Try to find the version for muparser >= 2.3
string(REGEX REPLACE ".*static *const *string_type *ParserVersion *= *string_type\\(_T\\(\"([0-9.]+)\"\\)\\);.*"
string(REGEX REPLACE ".*static *const *string_type *ParserVersion *= *string_type\\(_T\\(\"([0-9.]+)([^0-9.]+)?\"\\)\\);.*"
"\\1" MUPARSER_VERSION "${MUPARSER_VERSION_OLD_STYLE}")
if(MUPARSER_VERSION MATCHES "^[0-9]+\$")
......
......@@ -153,7 +153,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
# OTB version number.
set(OTB_VERSION_MAJOR "8")
set(OTB_VERSION_MINOR "0")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_PATCH "1")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
get_package_name(${OTB_SOURCE_DIR} ${PROJECT_NAME} OTB_VERSION_STRING2)
......
......@@ -9,11 +9,11 @@ instructions from the :doc:`Installation` section.
OTB is known to work on:
* Visual Studio 2017/2019 on Windows
* Visual Studio 2019 on Windows 10
* GCC 5 or higher, Clang 3.4 or higher on GNU/Linux
* AppleClang on macOS (10.8 or higher)
* AppleClang on macOS 10.8 or higher (intel, no ARM like the M1)
The C++14 standard is required since version 6.2.0.
......@@ -27,13 +27,13 @@ process:
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| **Library** | **Mandatory** | **Minimum version** | **Superbuild Version** |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `ITK <http://www.itk.org>`_ | Yes | 4.6.0 | 4.13.1 |
| `ITK <http://www.itk.org>`_ | Yes | 4.6.0 | 4.13.3 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `GDAL <http://www.gdal.org>`_ | Yes | 2.4.1 | 3.2.2 |
| `GDAL <http://www.gdal.org>`_ | Yes | 2.4.1 | 3.4.2 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.4.2 |
| `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.0 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `boost <http://www.boost.org>`_ | Yes | | 1.69 |
| `boost <http://www.boost.org>`_ | Yes | | 1.72.0 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `tinyXML <http://www.grinninglizard.com/tinyxml>`_ | Yes | | 2.6.2 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
......@@ -55,7 +55,7 @@ process:
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `MPI <https://www.open-mpi.org/>`_ | No | | |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.2.5 |
| `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.3.2 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.8 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
......@@ -63,7 +63,7 @@ process:
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `OPENGL <https://www.opengl.org/>`_ | No | | |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `Qt <https://www.qt.io/developers/>`_ | No | 5 | 5.11.3 |
| `Qt <https://www.qt.io/developers/>`_ | No | 5 | 5.15.2 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `QWT <http://qwt.sourceforge.net>`_ | No | 6 | 6.1.6 |
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
......
......@@ -32,6 +32,29 @@ MacOS X
.. include:: Installation_Macos.rst
Docker image
------------
A Docker image is available on `DockerHub <https://hub.docker.com/r/orfeotoolbox/otb>`__. It
can be used on any device running Docker, and provides python 3.8.
::
docker pull orfeotoolbox/otb
To run CLI tools, you can launch the docker image with:
::
docker run -it orfeotoolbox/otb
If you are planning on using the GUI applications, you have to call
docker with the following arguments:
::
docker run -it -e DISPLAY=$DISPLAY -v /tmp/.X11-unix/:/tmp/.X11-unix/ --device=/dev/dri:/dev/dri orfeotoolbox/otb monteverdi
Conda package
-------------
......
......@@ -165,7 +165,7 @@ The following commands can be executed on Ubuntu 18.04 or Ubuntu 20.04, for exam
CENTOS 7
++++++++
..code-block:: bash
.. code-block:: bash
#Add the SCL repositories to install python 3.8 and gcc 8
yum -y install epel-release centos-release-scl
......
We provide for MacOS X through a standalone package. This package is a
self-extractible archive, quite similar to the Linux one. You may
uncompress it with the command line:
self-extractible archive, quite similar to the Linux one.
This package was compiled using an Intel processor, and won't be
compatible with ARM processors found in the most recent MacOS
computers. If you want to use OTB on such a device, we recommend using
the Docker image (see below).
You may uncompress it with the command line:
.. parsed-literal::
......
......@@ -29,8 +29,8 @@ python_version_check() {
python_check_failed() {
printf %s\\n "*****Error occurred during installation******"
printf %s\\n "OTB python bindings normally require python 3.8 (or 3.7 for windows users) but current \
detected python version is $python_version"
printf %s\\n "OTB python bindings normally require python 3.8 on Linux and MacOS and 3.7 on windows, \
but current detected python version is $python_version"
printf %s\\n "If you have python 3.8 (or 3.7 for win users) installed in your system you should \
set OTB_PYTHON_EXE and re-run this installation script."
printf %s\\n "eg: OTB_PYTHON_EXE=/path/to/python3 ./OTB-X.Y-Linux64.run"
......@@ -61,15 +61,15 @@ python_version_check
if [ ! $CUSTOM_PYTHON ]
then
if [ ! "$python_major_version" -eq 3 ] && [ ! "$python_minor_version" -eq 5 ]
if [ ! "$python_major_version" -eq 3 ] && [ ! "$python_minor_version" -eq 8 ]
then
python_check_failed
fi
else # case where user provides an OTB_PYTHON_EXE
if [ ! "$python_major_version" -eq 3 ] || [ ! "$python_minor_version" -eq 5 ]
if [ ! "$python_major_version" -eq 3 ] || [ ! "$python_minor_version" -eq 8 ]
then
printf %s\\n "*****Warning******"
printf %s\\n "OTB python bindings normally require python3.5."
printf %s\\n "OTB python bindings normally require python3.8 on Linux and MacOS and 3.7 on Microsoft Windows."
printf %s\\n "The version of OTB_PYTHON_EXE ($OTB_PYTHON_EXE) is \
$python_version."
printf %s\\n "This case is undefined unless you are sure the packages were \
......
OTB-v 8.0.1 - Changes since version 8.0.0 (April 27th, 2022)
---------------------------------------------------------------------
Bugs fixed:
* !906: Add missing parts of python API by Julien Osman
CI:
* !911: Upgrade zlib to version 1.2.12 and GDAL to version 3.4.2 by Julien Osman
Documentation:
* !911: Fix formating issue by Julien Osman
* !911: Update warning message about python version by Julien Osman
OTB-v 8.0.0 - Changes since version 7.4.0 (March 22th, 2022)
---------------------------------------------------------------------
......
......@@ -151,8 +151,8 @@ if(WIN32)
set(GDAL_URL "https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz")
set(GDAL_MD5 c656be582f7beb528c66486cd1fca7a2)
else()
set(GDAL_URL "https://download.osgeo.org/gdal/3.4.0/gdal-3.4.0.tar.xz")
set(GDAL_MD5 aae5f3394dcd3ad6ddbe1137121b624b)
set(GDAL_URL "https://download.osgeo.org/gdal/3.4.2/gdal-3.4.2.tar.xz")
set(GDAL_MD5 4b6ac60068a60059a31e125b2a169d86)
endif()
ExternalProject_Add(GDAL
......
......@@ -26,8 +26,8 @@ SETUP_SUPERBUILD(ZLIB)
# Try official release 1.2.11
ExternalProject_Add(ZLIB
PREFIX ZLIB
URL "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz"
URL_MD5 1c9f62f0778697a09d36121ead88e08e
URL "https://zlib.net/zlib-1.2.12.tar.gz"
URL_MD5 5fc414a9726be31427b440b434d05f78
BINARY_DIR ${ZLIB_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment