diff --git a/science/gis/gdal/actions.py b/science/gis/gdal/actions.py index f2ee057ac9..6d20c1220f 100644 --- a/science/gis/gdal/actions.py +++ b/science/gis/gdal/actions.py @@ -9,83 +9,58 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import perlmodules +from pisi.actionsapi import pythonmodules + def setup(): -# autotools.autoreconf("-vfi") -# autotools.aclocal() + options_cfg = ''.join([ + '--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") + autotools.configure("%s" % options_cfg) - autotools.configure("--disable-static \ - --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 - - + # fix unused direct dependency analysis 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(): autotools.make() + # FIXME build man pages + #autotools.make("man") + + # build python bindings + shelltools.cd("swig/python") + pythonmodules.compile() + def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - #remove egg -# pisitools.removeDir("/usr/lib/python2.7/site-packages/GDAL-*") - - #pisitools.domove("/usr/man/man3/*", "/usr/share/man/man3") - #pisitools.removeDir("/usr/man/") - #pisitools.domove("/usr/etc/bash_completion.d/*", "/etc/bash_completion.d") - #pisitools.removeDir("/usr/etc") + + # install python bindings + shelltools.cd("swig/python") + pythonmodules.install() + shelltools.cd("../..") 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*") diff --git a/science/gis/gdal/files/gdal-1.9.2-typecast.patch b/science/gis/gdal/files/gdal-1.9.2-typecast.patch deleted file mode 100644 index 6418f3c118..0000000000 --- a/science/gis/gdal/files/gdal-1.9.2-typecast.patch +++ /dev/null @@ -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); - } diff --git a/science/gis/gdal/files/gdal-2.3.1-libname.patch b/science/gis/gdal/files/gdal-2.3.1-libname.patch deleted file mode 100644 index 8d4390afb1..0000000000 --- a/science/gis/gdal/files/gdal-2.3.1-libname.patch +++ /dev/null @@ -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 diff --git a/science/gis/gdal/files/gdal-2.3.1-zlib.patch b/science/gis/gdal/files/gdal-2.3.1-zlib.patch deleted file mode 100644 index 204df538fc..0000000000 --- a/science/gis/gdal/files/gdal-2.3.1-zlib.patch +++ /dev/null @@ -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 - #include --#include "../zlib/zlib.h" -+#include - - CPL_CVSID("$Id: mrf_band.cpp 7e07230bbff24eb333608de4dbd460b7312839d0 2017-12-11 19:08:47Z Even Rouault $") - diff --git a/science/gis/gdal/files/gdal-completion.patch b/science/gis/gdal/files/gdal-completion.patch deleted file mode 100644 index f68acad731..0000000000 --- a/science/gis/gdal/files/gdal-completion.patch +++ /dev/null @@ -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 diff --git a/science/gis/gdal/files/man.patch b/science/gis/gdal/files/man.patch deleted file mode 100644 index 1bff3a2088..0000000000 --- a/science/gis/gdal/files/man.patch +++ /dev/null @@ -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 diff --git a/science/gis/gdal/pspec.xml b/science/gis/gdal/pspec.xml index fba5d9300c..29802d282e 100644 --- a/science/gis/gdal/pspec.xml +++ b/science/gis/gdal/pspec.xml @@ -1,89 +1,65 @@ - + gdal - https://www.gdal.org/ + https://gdal.org/ PisiLinux Community admins@pisilinux.org + science.gis MIT library A translator library for raster geospatial data formats (includes OGR support) 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. - http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz + http://download.osgeo.org/gdal/3.1.3/gdal-3.1.3.tar.gz - bash-completion - python-numpy - - geos-devel - hdf5-devel - - tiff-devel - webp-devel - giflib-devel - openjpeg2-devel - netcdf-devel - podofo-devel - cfitsio-devel - unixODBC-devel - xerces-c-devel - libfreexl-devel - libgeotiff-devel - libjpeg-turbo-devel - postgresql-lib - libpng-devel - expat-devel curl-devel + hdf5-devel + geos-devel + proj-devel + tiff-devel + expat-devel + libpng-devel + netcdf-devel sqlite-devel - libpcre-devel - - libxml2-devel + openjpeg2-devel + libgeotiff-devel + libspatialite-devel + + python-devel + python-setuptools + - - gdal-1.9.2-typecast.patch - gdal-2.3.1-libname.patch - gdal-2.3.1-zlib.patch - gdal-completion.patch - man.patch - gdal + A translator library for raster geospatial data formats (includes OGR support) geos hdf5 - ogdi + proj + swig tiff - webp - giflib - + expat + libpng netcdf - podofo - cfitsio - unixODBC - xerces-c libfreexl openjpeg2 libgeotiff libjpeg-turbo - postgresql-lib - curl - zlib - expat - libpcre - libgcc - libpng - sqlite - libxml2 + libspatialite - /usr/bin - /usr/lib /usr/share - /etc/bash_completion.d + /usr/lib + /usr/bin @@ -91,12 +67,37 @@ python-gdal gdal python bindings - gdal - python-numpy - libgcc python + libgcc + python-numpy + gdal + /usr/bin/epsg_tr.py + /usr/bin/pct2rgb.py + /usr/bin/rgb2pct.py + /usr/bin/esri2wkt.py + /usr/bin/gcps2vec.py + /usr/bin/gcps2wld.py + /usr/bin/gdal2xyz.py + /usr/bin/gdalmove.py + /usr/bin/ogrmerge.py + /usr/bin/gdal_auth.py + /usr/bin/gdal_calc.py + /usr/bin/gdal_edit.py + /usr/bin/gdalident.py + /usr/bin/gdal2tiles.py + /usr/bin/gdal_merge.py + /usr/bin/gdal_sieve.py + /usr/bin/gdalchksum.py + /usr/bin/gdalimport.py + /usr/bin/gdal_retile.py + /usr/bin/gdalcompare.py + /usr/bin/mkgraticule.py + /usr/bin/gdal_proximity.py + /usr/bin/gdal_fillnodata.py + /usr/bin/gdal_pansharpen.py + /usr/bin/gdal_polygonize.py /usr/lib/python2.7 @@ -106,28 +107,6 @@ Development files for gdal gdal - geos-devel - hdf5-devel - ogdi-devel - tiff-devel - webp-devel - giflib-devel - - netcdf-devel - podofo-devel - cfitsio-devel - unixODBC-devel - xerces-c-devel - libfreexl-devel - libgeotiff-devel - libjpeg-turbo-devel - postgresql-lib - libpng-devel - expat-devel - curl-devel - sqlite-devel - libpcre-devel - libxml2-devel /usr/include @@ -136,6 +115,13 @@ + + 2020-09-24 + 3.1.3 + Major version bump. + Blue Devil + bluedevil@sctzine.com + 2019-02-07 2.3.1 @@ -179,4 +165,4 @@ ertugrulerata@gmail.com - + \ No newline at end of file diff --git a/science/gis/gdal/translations.xml b/science/gis/gdal/translations.xml index bc6240f4e4..1bf7aa3473 100644 --- a/science/gis/gdal/translations.xml +++ b/science/gis/gdal/translations.xml @@ -9,5 +9,12 @@ gdal-devel gdal için geliştirme dosyaları + gdal-devel, gdal için geliştirme dosyalarını içerir. - + + + python-gdal + gdal için python bağlayıcıları + python-gdal, gdal için python bağlayıcıları içerir. + + \ No newline at end of file