Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdal : major upgrade

Browse Source
This commit is contained in:
bluedevil
2020-09-28 23:12:58 +02:00
parent 9618530a31
commit c18e332890
8 changed files with 115 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
science/gis/gdal/actions.py
+41 -66
View File
@@ -9,83 +9,58 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
from pisi.actionsapi import perlmodules from pisi.actionsapi import perlmodules
from pisi.actionsapi import pythonmodules
def setup(): def setup():
# autotools.autoreconf("-vfi") options_cfg = ''.join([
# autotools.aclocal() '--with-png ',
'--with-curl ',
'--with-geos ',
'--with-hdf5 ',
'--with-perl ',
'--with-expat ',
'--with-mysql ',
'--with-netcdf ',
'--with-geotiff ',
'--with-libtiff ',
'--with-sqlite3 ',
'--enable-shared ',
'--with-openjpeg ',
'--with-spatialite'])
pisitools.cflags.add("-fno-strict-aliasing") pisitools.cflags.add("-fno-strict-aliasing")
autotools.configure("%s" % options_cfg)
autotools.configure("--disable-static \ # fix unused direct dependency analysis
--enable-shared \
--datadir=/usr/share/gdal \
--with-threads \
--with-jasper \
--with-odbc=/usr/lib/unixODBC \
--with-expat \
--with-cfitsio \
--with-hdf5 \
--with-netcdf \
--with-png \
--with-geos \
--without-mysql \
--with-curl \
--with-perl \
--with-jpeg \
--with-jpeg12=no \
--with-libtiff \
--with-sqlite3 \
--with-geotiff=external \
--with-podofo \
--with-spatialite \
--with-ogr \
--with-grib \
--with-curl \
--with-webp \
--with-python \
--without-poppler \
--with-xerces \
--with-openjpeg \
--without-libtool \
--without-hdf4 \
--without-fme \
--without-pcraster \
--without-kakadu \
--without-mrsid \
--without-jp2mrsid \
--without-msg \
--without-bsb \
--without-dods-root \
--without-oci \
--without-ingres \
--without-spatialite \
--without-dwgdirect \
--without-epsilon \
--without-idb \
--without-sde \
--mandir=/usr/share/man \
--without-ruby")
#--with-ogdi error: rpc/rpc.h
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
#for bug 13646
#pisitools.dosed("GDALmake.opt", "PY_HAVE_SETUPTOOLS=1 ", "PY_HAVE_SETUPTOOLS= ")
#pisitools.dosed("apps/GNUmakefile", "EXE_DEP_LIBS ", "KILL_EXE_DEP_LIBS ")
def build(): def build():
autotools.make() autotools.make()
# FIXME build man pages
#autotools.make("man")
# build python bindings
shelltools.cd("swig/python")
pythonmodules.compile()
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#remove egg
# pisitools.removeDir("/usr/lib/python2.7/site-packages/GDAL-*") # install python bindings
shelltools.cd("swig/python")
#pisitools.domove("/usr/man/man3/*", "/usr/share/man/man3") pythonmodules.install()
#pisitools.removeDir("/usr/man/") shelltools.cd("../..")
#pisitools.domove("/usr/etc/bash_completion.d/*", "/etc/bash_completion.d")
#pisitools.removeDir("/usr/etc")
perlmodules.removePodfiles() perlmodules.removePodfiles()
# fix rpath
shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GDAL/Const/Const.so" % get.installDIR())
shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GDAL/GDAL.so" % get.installDIR())
shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GNM/GNM.so" % get.installDIR())
shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/OSR/OSR.so" % get.installDIR())
shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/OGR/OGR.so" % get.installDIR())
pisitools.dodoc("LICENSE*")
science/gis/gdal/files/gdal-1.9.2-typecast.patch
-11
View File
@@ -1,11 +0,0 @@
--- swig/php/gdal_wrap.cpp~ 2012-10-09 08:58:28.000000000 +0800
+++ swig/php/gdal_wrap.cpp 2012-10-12 12:19:02.201201302 +0800
@@ -932,7 +932,7 @@
p = value->ptr;
if (type==-1) return NULL;
- type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
+ type_name=(char *)zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
return SWIG_ZTS_ConvertResourceData(p, type_name, ty TSRMLS_CC);
}
science/gis/gdal/files/gdal-2.3.1-libname.patch
-11
View File
@@ -1,11 +0,0 @@
--- gdal-2.3.1/ogr/ogrct.cpp~ 2018-06-23 17:09:11.000000000 +0200
+++ gdal-2.3.1/ogr/ogrct.cpp 2018-07-30 15:55:10.059763422 +0200
@@ -124,7 +124,7 @@
#elif defined(__APPLE__)
# define LIBNAME "libproj.dylib"
#else
-# define LIBNAME "libproj.so"
+# define LIBNAME "libproj.so.13"
#endif
#endif // PROJ_VERSION == 4
science/gis/gdal/files/gdal-2.3.1-zlib.patch
-11
View File
@@ -1,11 +0,0 @@
--- gdal-2.3.1/frmts/mrf/mrf_band.cpp.ext_zlib 2018-07-30 16:12:26.034881517 +0200
+++ gdal-2.3.1/frmts/mrf/mrf_band.cpp 2018-07-30 16:13:09.023430106 +0200
@@ -49,7 +49,7 @@
#include <vector>
#include <assert.h>
-#include "../zlib/zlib.h"
+#include <zlib.h>
CPL_CVSID("$Id: mrf_band.cpp 7e07230bbff24eb333608de4dbd460b7312839d0 2017-12-11 19:08:47Z Even Rouault $")
science/gis/gdal/files/gdal-completion.patch
-13
View File
@@ -1,13 +0,0 @@
Index: gdal-2.2.3-fedora/scripts/GNUmakefile
===================================================================
--- gdal-2.2.3-fedora.orig/scripts/GNUmakefile
+++ gdal-2.2.3-fedora/scripts/GNUmakefile
@@ -5,6 +5,6 @@ completion:
install:
if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
fi
science/gis/gdal/files/man.patch
-12
View File
@@ -1,12 +0,0 @@
diff -Nuar a/configure b/configure
--- a/configure 2018-06-23 18:05:47.000000000 +0300
+++ b/configure 2018-09-07 15:07:36.398094137 +0300
@@ -35383,7 +35383,7 @@
datarootdir='${prefix}/share/gdal'
fi
-mandir='${prefix}/man'
+mandir='${prefix}/share/man'
if test "$prefix" = "NONE" ; then
science/gis/gdal/pspec.xml
+66 -80
View File
@@ -1,89 +1,65 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>gdal</Name> <Name>gdal</Name>
<Homepage>https://www.gdal.org/</Homepage> <Homepage>https://gdal.org/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<PartOf>science.gis</PartOf>
<License>MIT</License> <License>MIT</License>
<IsA>library</IsA> <IsA>library</IsA>
<Summary>A translator library for raster geospatial data formats (includes OGR support)</Summary> <Summary>A translator library for raster geospatial data formats (includes OGR support)</Summary>
<Description>GDAL is a translator library for raster geospatial data formats which presents a single abstract data model to the calling application for all supported formats.</Description> <Description>GDAL is a translator library for raster geospatial data formats which presents a single abstract data model to the calling application for all supported formats.</Description>
<Archive sha1sum="f5cb70b5b17db25b9cebeea20ef081a8c1ee951f" type="targz">http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz</Archive> <Archive sha1sum="e6d137304fc188e536dec7f1353786d8306510f1" type="targz">http://download.osgeo.org/gdal/3.1.3/gdal-3.1.3.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>bash-completion</Dependency>
<Dependency>python-numpy</Dependency>
<!--Dependency>perl-ExtUtils-MakeMaker</Dependency-->
<Dependency>geos-devel</Dependency>
<Dependency>hdf5-devel</Dependency>
<!-- <Dependency>ogdi-devel</Dependency> --> <!--error: rpc/rpc.h-->
<Dependency>tiff-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>openjpeg2-devel</Dependency>
<Dependency>netcdf-devel</Dependency>
<Dependency>podofo-devel</Dependency>
<Dependency>cfitsio-devel</Dependency>
<Dependency>unixODBC-devel</Dependency>
<Dependency>xerces-c-devel</Dependency>
<Dependency>libfreexl-devel</Dependency>
<Dependency>libgeotiff-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>postgresql-lib</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>curl-devel</Dependency> <Dependency>curl-devel</Dependency>
<Dependency>hdf5-devel</Dependency>
<Dependency>geos-devel</Dependency>
<Dependency>proj-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>netcdf-devel</Dependency>
<Dependency>sqlite-devel</Dependency> <Dependency>sqlite-devel</Dependency>
<Dependency>libpcre-devel</Dependency> <Dependency>openjpeg2-devel</Dependency>
<!--Dependency>poppler-devel</Dependency--> <Dependency>libgeotiff-devel</Dependency>
<Dependency>libxml2-devel</Dependency> <Dependency>libspatialite-devel</Dependency>
<!-- for python bindings-->
<Dependency>python-devel</Dependency>
<Dependency>python-setuptools</Dependency>
<!-- for building man files
<Dependency>python3-devel</Dependency>
<Dependency>python3-breathe</Dependency>
<Dependency>python3-sphinx_rtd_theme</Dependency>
-->
</BuildDependencies> </BuildDependencies>
<Patches>
<Patch>gdal-1.9.2-typecast.patch</Patch>
<Patch level="1">gdal-2.3.1-libname.patch</Patch>
<Patch level="1">gdal-2.3.1-zlib.patch</Patch>
<Patch level="1">gdal-completion.patch</Patch>
<Patch level="1">man.patch</Patch>
</Patches>
</Source> </Source>
<Package> <Package>
<Name>gdal</Name> <Name>gdal</Name>
<Summary>A translator library for raster geospatial data formats (includes OGR support)</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>geos</Dependency> <Dependency>geos</Dependency>
<Dependency>hdf5</Dependency> <Dependency>hdf5</Dependency>
<Dependency>ogdi</Dependency> <Dependency>proj</Dependency>
<Dependency>swig</Dependency>
<Dependency>tiff</Dependency> <Dependency>tiff</Dependency>
<Dependency>webp</Dependency> <Dependency>expat</Dependency>
<Dependency>giflib</Dependency> <Dependency>libpng</Dependency>
<!--Dependency>jasper</Dependency-->
<Dependency>netcdf</Dependency> <Dependency>netcdf</Dependency>
<Dependency>podofo</Dependency>
<Dependency>cfitsio</Dependency>
<Dependency>unixODBC</Dependency>
<Dependency>xerces-c</Dependency>
<Dependency>libfreexl</Dependency> <Dependency>libfreexl</Dependency>
<Dependency>openjpeg2</Dependency> <Dependency>openjpeg2</Dependency>
<Dependency>libgeotiff</Dependency> <Dependency>libgeotiff</Dependency>
<Dependency>libjpeg-turbo</Dependency> <Dependency>libjpeg-turbo</Dependency>
<Dependency>postgresql-lib</Dependency> <Dependency>libspatialite</Dependency>
<Dependency>curl</Dependency>
<Dependency>zlib</Dependency>
<Dependency>expat</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>libxml2</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="data">/etc/bash_completion.d</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="executable">/usr/bin</Path>
</Files> </Files>
</Package> </Package>
@@ -91,12 +67,37 @@
<Name>python-gdal</Name> <Name>python-gdal</Name>
<Summary>gdal python bindings</Summary> <Summary>gdal python bindings</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">gdal</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>python</Dependency> <Dependency>python</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency release="current">gdal</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/epsg_tr.py</Path>
<Path fileType="executable">/usr/bin/pct2rgb.py</Path>
<Path fileType="executable">/usr/bin/rgb2pct.py</Path>
<Path fileType="executable">/usr/bin/esri2wkt.py</Path>
<Path fileType="executable">/usr/bin/gcps2vec.py</Path>
<Path fileType="executable">/usr/bin/gcps2wld.py</Path>
<Path fileType="executable">/usr/bin/gdal2xyz.py</Path>
<Path fileType="executable">/usr/bin/gdalmove.py</Path>
<Path fileType="executable">/usr/bin/ogrmerge.py</Path>
<Path fileType="executable">/usr/bin/gdal_auth.py</Path>
<Path fileType="executable">/usr/bin/gdal_calc.py</Path>
<Path fileType="executable">/usr/bin/gdal_edit.py</Path>
<Path fileType="executable">/usr/bin/gdalident.py</Path>
<Path fileType="executable">/usr/bin/gdal2tiles.py</Path>
<Path fileType="executable">/usr/bin/gdal_merge.py</Path>
<Path fileType="executable">/usr/bin/gdal_sieve.py</Path>
<Path fileType="executable">/usr/bin/gdalchksum.py</Path>
<Path fileType="executable">/usr/bin/gdalimport.py</Path>
<Path fileType="executable">/usr/bin/gdal_retile.py</Path>
<Path fileType="executable">/usr/bin/gdalcompare.py</Path>
<Path fileType="executable">/usr/bin/mkgraticule.py</Path>
<Path fileType="executable">/usr/bin/gdal_proximity.py</Path>
<Path fileType="executable">/usr/bin/gdal_fillnodata.py</Path>
<Path fileType="executable">/usr/bin/gdal_pansharpen.py</Path>
<Path fileType="executable">/usr/bin/gdal_polygonize.py</Path>
<Path fileType="header">/usr/lib/python2.7</Path> <Path fileType="header">/usr/lib/python2.7</Path>
</Files> </Files>
</Package> </Package>
@@ -106,28 +107,6 @@
<Summary>Development files for gdal</Summary> <Summary>Development files for gdal</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">gdal</Dependency> <Dependency release="current">gdal</Dependency>
<Dependency>geos-devel</Dependency>
<Dependency>hdf5-devel</Dependency>
<Dependency>ogdi-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<!--Dependency>jasper-devel</Dependency-->
<Dependency>netcdf-devel</Dependency>
<Dependency>podofo-devel</Dependency>
<Dependency>cfitsio-devel</Dependency>
<Dependency>unixODBC-devel</Dependency>
<Dependency>xerces-c-devel</Dependency>
<Dependency>libfreexl-devel</Dependency>
<Dependency>libgeotiff-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>postgresql-lib</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
@@ -136,6 +115,13 @@
</Package> </Package>
<History> <History>
<Update release="7">
<Date>2020-09-24</Date>
<Version>3.1.3</Version>
<Comment>Major version bump.</Comment>
<Name>Blue Devil</Name>
<Email>bluedevil@sctzine.com</Email>
</Update>
<Update release="6"> <Update release="6">
<Date>2019-02-07</Date> <Date>2019-02-07</Date>
<Version>2.3.1</Version> <Version>2.3.1</Version>
@@ -179,4 +165,4 @@
<Email>ertugrulerata@gmail.com</Email> <Email>ertugrulerata@gmail.com</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
science/gis/gdal/translations.xml
+8 -1
View File
@@ -9,5 +9,12 @@
<Package> <Package>
<Name>gdal-devel</Name> <Name>gdal-devel</Name>
<Summary xml:lang="tr">gdal için geliştirme dosyaları</Summary> <Summary xml:lang="tr">gdal için geliştirme dosyaları</Summary>
<Description xml:lang="tr">gdal-devel, gdal için geliştirme dosyalarını içerir.</Description>
</Package> </Package>
</PISI>
<Package>
<Name>python-gdal</Name>
<Summary xml:lang="tr">gdal için python bağlayıcıları</Summary>
<Description xml:lang="tr">python-gdal, gdal için python bağlayıcıları içerir.</Description>
</Package>
</PISI>