Mercurial > mxe-octave

changeset 6043:e435b7ef350b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GDAL: Update to version 3.2.3. * src/gdal.mk: Update version and checksum. Remove unsupported configure option. * src/gdal-1-gcc11.patch: Remove file. * dist-files.mk: Remove deleted file from dist.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 08 Jan 2022 15:21:15 +0100
parents eb62db3251f3
children b07676fd56db
files dist-files.mk src/gdal-1-gcc11.patch src/gdal.mk
diffstat 3 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Jan 08 14:31:23 2022 +0100
+++ b/dist-files.mk	Sat Jan 08 15:21:15 2022 +0100
@@ -121,7 +121,6 @@
   gd-1-libpng15.patch \
   gd-test.c \
   gd.mk \
-  gdal-1-gcc11.patch \
   gdal-2-ucrt.patch \
   gdal.mk \
   gdb.mk \
--- a/src/gdal-1-gcc11.patch	Sat Jan 08 14:31:23 2022 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- ./ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp.orig	2020-01-28 11:13:43.000000000 +0100
-+++ ./ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp	2021-08-09 21:20:52.610437353 +0200
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
- 
--- a/src/gdal.mk	Sat Jan 08 14:31:23 2022 +0100
+++ b/src/gdal.mk	Sat Jan 08 15:21:15 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := gdal
 $(PKG)_IGNORE   :
-$(PKG)_VERSION  := 3.1.4
-$(PKG)_CHECKSUM := 798e8f0c53684f5bf24921abf155f2c9345cad98
+$(PKG)_VERSION  := 3.2.3
+$(PKG)_CHECKSUM := 092eaa2194bceb63b4d8a42e8ca8154abf32918c
 $(PKG)_SUBDIR   := gdal-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdal-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -23,6 +23,7 @@
 	$(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
+        --with-cpp14 \
         --with-pam \
         --with-libz='$(HOST_PREFIX)' \
         --with-png='$(HOST_PREFIX)' \
@@ -61,7 +62,6 @@
         --without-ingres \
         --without-dods-root \
         --without-idb \
-        --without-sde \
         --without-epsilon \
         --without-perl \
         --without-python \