Re: git: f776ecb14ef3 - main - graphics/gdal: Update to 3.8.2

From: Rainer Hurling <rhurlin_at_gwdg.de>
Date: Mon, 25 Dec 2023 11:11:04 UTC
Hi Sunpoet,

Am 25.12.23 um 10:08 schrieb Po-Chuan Hsieh:
> The branch main has been updated by sunpoet:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=f776ecb14ef338ffe0ecb0d649c5513001ef31f0
> 
> commit f776ecb14ef338ffe0ecb0d649c5513001ef31f0
> Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> AuthorDate: 2023-12-25 08:59:50 +0000
> Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> CommitDate: 2023-12-25 08:59:50 +0000
> 
>      graphics/gdal: Update to 3.8.2
>      
>      - Add AEC option
>      
>      Changes:        https://github.com/OSGeo/gdal/releases
>                      https://github.com/OSGeo/gdal/blob/release/3.8/NEWS.md
> ---
>   graphics/gdal/Makefile | 14 ++++++++++----
>   graphics/gdal/distinfo |  6 +++---
>   2 files changed, 13 insertions(+), 7 deletions(-)
> 
> diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
> index 0a7dbde46ac1..e7ae9aadedf3 100644
> --- a/graphics/gdal/Makefile
> +++ b/graphics/gdal/Makefile
> @@ -1,6 +1,5 @@
>   PORTNAME=	gdal
> -PORTVERSION=	3.8.1
> -PORTREVISION=	1
> +PORTVERSION=	3.8.2
>   CATEGORIES=	graphics geography
>   MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
>   		LOCAL/sunpoet
> @@ -30,6 +29,7 @@ CMAKE_OFF=	BUILD_CSHARP_BINDINGS \
>   		BUILD_JAVA_BINDINGS \
>   		BUILD_PYTHON_BINDINGS \
>   		BUILD_TESTING \
> +		BUILD_VSIPRELOAD \
>   		CLANG_TIDY_ENABLED \
>   		CSHARP_MONO \
>   		ENABLE_DEFLATE64 \
> @@ -61,10 +61,12 @@ CMAKE_ON=	BUILD_APPS \
>   		ENABLE_GNM \
>   		ENABLE_IPO \
>   		ENABLE_PAM \
> +		GDAL_AUTOLOAD_PLUGINS \
>   		GDAL_BUILD_OPTIONAL_DRIVERS \
>   		GDAL_HIDE_INTERNAL_SYMBOLS \
>   		GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE \
>   		GDAL_SPLIT_EXPORTED_LIBS \
> +		GDAL_USE_CPL_MULTIPROC_PTHREAD \
>   		GDAL_USE_EXTERNAL_LIBS \
>   		GDAL_USE_GEOTIFF \
>   		GDAL_USE_GIF \
> @@ -82,6 +84,7 @@ CMAKE_ON=	BUILD_APPS \
>   		GDAL_USE_ZLIB \
>   		OGR_BUILD_OPTIONAL_DRIVERS \
>   		OGR_SQLITE_ALLOW_LOAD_EXTENSIONS \
> +		RENAME_INTERNAL_SHAPELIB_SYMBOLS \
>   		USE_CCACHE
>   USE_CXXSTD=	c++17
>   USE_LDCONFIG=	yes
> @@ -107,14 +110,15 @@ HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
>   		port/cpl_vsil_curl_priv.h \
>   		port/cpl_worker_thread_pool.h
>   
> -OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
> +OPTIONS_DEFINE=	AEC ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
>   OPTIONS_RADIO=	PDF
>   OPTIONS_RADIO_PDF=	PODOFO POPPLER
> -OPTIONS_DEFAULT=CURL DEFLATE EXPAT FREEXL GEOS LERC LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
> +OPTIONS_DEFAULT=AEC CURL DEFLATE EXPAT FREEXL GEOS LERC LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
>   		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
>   OPTIONS_EXCLUDE_powerpc=	LERC
>   OPTIONS_EXCLUDE_powerpc64=	LERC
>   OPTIONS_SUB=	yes
> +AEC_DESC=	Adaptive entropy coding library
>   BRUNSLI_DESC=	Brunsli support via libbrunsli library
>   CRYPTOPP_DESC=	Cryptopp support
>   DEFLATE_DESC=	Faster deflate support via libdeflate library
> @@ -125,6 +129,8 @@ PCRE2_DESC=	Regular expression support for SQLite
>   RASTERLITE2_DESC=	RasterLite2 support
>   TILEDB_DESC=	TileDB support
>   
> +AEC_CMAKE_BOOL=		GDAL_USE_LIBAEC
> +AEC_LIB_DEPENDS=	libaec.so:science/libaec
>   ARMADILLO_CMAKE_BOOL=	GDAL_USE_ARMADILLO
>   ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
>   BRUNSLI_CMAKE_BOOL=	GDAL_USE_BRUNSLI
> diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
> index 2d81121c4c14..854fed07f38a 100644
> --- a/graphics/gdal/distinfo
> +++ b/graphics/gdal/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1701363656
> -SHA256 (gdal-3.8.1.tar.xz) = 75a20b23879bfa3d8c0db68e1d6f8b924f7f9d97f5fed089b01a72e404293900
> -SIZE (gdal-3.8.1.tar.xz) = 8860344
> +TIMESTAMP = 1703227828
> +SHA256 (gdal-3.8.2.tar.xz) = dc2921ee1cf7a5c0498e94d15fb9ab9c9689c296363a1d021fc3293dd242b4db
> +SIZE (gdal-3.8.2.tar.xz) = 8862380


Thanks again for the patch!

But hmm, on my box (recent 115.0-CURRENT amd64) I can't build it because 
of a problem with finding lz4 in the configure phase:

# make configure
[..snip..]
-- Looking for BZ2_bzCompressInit - found
CMake Warning at 
/usr/local/share/cmake/Modules/CMakeFindDependencyMacro.cmake:76 
(find_package):
   By not providing "Findlz4.cmake" in CMAKE_MODULE_PATH this project has
   asked CMake to find a package configuration file provided by "lz4", but
   CMake did not find one.

   Could not find a package configuration file provided by "lz4" with any of
   the following names:

     lz4Config.cmake
     lz4-config.cmake

   Add the installation prefix of "lz4" to CMAKE_PREFIX_PATH or set 
"lz4_DIR"
   to a directory containing one of the above files.  If "lz4" provides a
   separate development package or SDK, be sure it has been installed.
Call Stack (most recent call first):
   /usr/local/lib/cmake/TileDB/TileDBConfig.cmake:41 (find_dependency)
   cmake/helpers/CheckDependentLibraries.cmake:145 (find_package)
   cmake/helpers/CheckDependentLibraries.cmake:721 (gdal_check_package)
   gdal.cmake:265 (include)
   CMakeLists.txt:246 (include)

CMake Warning at cmake/helpers/CheckDependentLibraries.cmake:145 
(find_package):
   Found package configuration file:

     /usr/local/lib/cmake/TileDB/TileDBConfig.cmake

   but it set TileDB_FOUND to FALSE so package "TileDB" is considered to be
   NOT FOUND.  Reason given by package:

   TileDB could not be found because dependency lz4 could not be found.

Call Stack (most recent call first):
   cmake/helpers/CheckDependentLibraries.cmake:721 (gdal_check_package)
   gdal.cmake:265 (include)
   CMakeLists.txt:246 (include)

CMake Error at cmake/helpers/CheckDependentLibraries.cmake:202 (message):
   Configured to use TILEDB, but not found
Call Stack (most recent call first):
   cmake/helpers/CheckDependentLibraries.cmake:721 (gdal_check_package)
   gdal.cmake:265 (include)
   CMakeLists.txt:246 (include)

-- Configuring incomplete, errors occurred!
*** Error code 1


archivers/liblz4 is installed, but obviously not found from this version 
of GDAL?
Do you have any idea what's going wrong here? Thanks for any help.

Best wishes,
Rainer