Commit 0164c61f authored by Carlos Ramos Carreño's avatar Carlos Ramos Carreño

component/gdal: upgrade to last version with Python 2 support

The upgrade is done to version 3.2.3, as this is the last version which
still supports Python 2.

This fixes the following compilation bug:

```c
gdalwmsdataset.cpp:383:37: error: ISO C++ forbids comparison between
pointer and integer [-fpermissive]
	if(pszHttpZeroBlockCodes == '\0') {
```

Jasper is no longer a dependency, and openjpeg is used instead.

See merge request nexedi/slapos!1586.
parent f9f31786
[buildout] [buildout]
extends = extends =
../numpy/buildout.cfg ../numpy/buildout.cfg
../cmake/buildout.cfg
../curl/buildout.cfg ../curl/buildout.cfg
../geos/buildout.cfg ../geos/buildout.cfg
../giflib/buildout.cfg ../giflib/buildout.cfg
../jasper/buildout.cfg
../libexpat/buildout.cfg ../libexpat/buildout.cfg
../libjpeg/buildout.cfg
../libtiff/buildout.cfg
../libxml2/buildout.cfg
../openjpeg/buildout.cfg
../pcre/buildout.cfg ../pcre/buildout.cfg
../proj4/buildout.cfg ../pkgconfig/buildout.cfg
../proj/buildout.cfg
../sqlite3/buildout.cfg ../sqlite3/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
...@@ -16,27 +21,30 @@ parts = ...@@ -16,27 +21,30 @@ parts =
[gdal] [gdal]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
version = 1.11.1 shared = true
version = 3.2.3
url = http://download.osgeo.org/gdal/${:version}/gdal-${:version}.tar.xz url = http://download.osgeo.org/gdal/${:version}/gdal-${:version}.tar.xz
md5sum = 2e126d7c6605691d38f3e71b945f5c73 md5sum = 6c276978d625d23a091bac9fdddb99db
location = @@LOCATION@@
configure-options = configure-options =
--with-curl=${curl:location}/bin/curl-config --with-curl=${curl:location}/bin/curl-config
--with-expat=${libexpat:location} --with-expat=${libexpat:location}
--with-geos=${geos:location}/bin/geos-config --with-geos=${geos:location}/bin/geos-config
--with-gif=${giflib:location} --with-gif=${giflib:location}
--with-jasper=${jasper:location} --with-openjpeg=${openjpeg:location}
--with-jpeg=${libjpeg:location} --with-jpeg=${libjpeg:location}
--with-libtiff=${libtiff:location} --with-libtiff=${libtiff:location}
--with-libz=${zlib:location} --with-libz=${zlib:location}
--with-png=${libpng:location} --with-png=${libpng:location}
--with-static-proj4=${proj4:location} --with-proj=${proj:location}
--with-sqlite3=${sqlite3:location} --with-sqlite3=${sqlite3:location}
--with-xml2=${libxml2:location}/bin/xml2-config --with-xml2=yes
--without-webp --without-webp
environment = environment =
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${pcre:location}/include CPPFLAGS=-I${pcre:location}/include
LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${geos:location}/lib -Wl,-rpath=${giflib:location}/lib -Wl,-rpath=${jasper:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${:location}/lib -Wl,-rpath=${proj:location}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${geos:location}/lib -Wl,-rpath=${giflib:location}/lib -Wl,-rpath=${openjpeg:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
[gdal-python] [gdal-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
......
Markdown is supported
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