From f165c100224f17d02afbcf2eace2dcbf7e0d25a7 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 7 Feb 2019 14:43:36 +0300 Subject: [PATCH] gdal:rebuild --- science/gis/gdal/actions.py | 3 ++- science/gis/gdal/files/fix-extra-libs.patch | 20 ------------------- .../files/gdal-1.5.1-python-install.patch | 14 ------------- .../gis/gdal/files/gdal-1.6.0-swig-fix.patch | 20 ------------------- .../gis/gdal/files/gdal-1.9.2-typecast.patch | 11 ++++++++++ .../gis/gdal/files/gdal-2.3.1-libname.patch | 11 ++++++++++ science/gis/gdal/files/gdal-2.3.1-zlib.patch | 11 ++++++++++ .../gis/gdal/files/gdal-python-install.patch | 10 ---------- .../gis/gdal/files/gdal-sqlite-3.8.7.patch | 17 ---------------- science/gis/gdal/files/libtool.patch | 11 ---------- science/gis/gdal/pspec.xml | 9 ++++++--- 11 files changed, 41 insertions(+), 96 deletions(-) delete mode 100644 science/gis/gdal/files/fix-extra-libs.patch delete mode 100644 science/gis/gdal/files/gdal-1.5.1-python-install.patch delete mode 100644 science/gis/gdal/files/gdal-1.6.0-swig-fix.patch create mode 100644 science/gis/gdal/files/gdal-1.9.2-typecast.patch create mode 100644 science/gis/gdal/files/gdal-2.3.1-libname.patch create mode 100644 science/gis/gdal/files/gdal-2.3.1-zlib.patch delete mode 100644 science/gis/gdal/files/gdal-python-install.patch delete mode 100644 science/gis/gdal/files/gdal-sqlite-3.8.7.patch delete mode 100644 science/gis/gdal/files/libtool.patch diff --git a/science/gis/gdal/actions.py b/science/gis/gdal/actions.py index 072bcdd17a..f2ee057ac9 100644 --- a/science/gis/gdal/actions.py +++ b/science/gis/gdal/actions.py @@ -18,7 +18,6 @@ def setup(): autotools.configure("--disable-static \ --enable-shared \ --datadir=/usr/share/gdal \ - --with-ogdi \ --with-threads \ --with-jasper \ --with-odbc=/usr/lib/unixODBC \ @@ -65,6 +64,8 @@ def setup(): --without-sde \ --mandir=/usr/share/man \ --without-ruby") + #--with-ogdi error: rpc/rpc.h + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") diff --git a/science/gis/gdal/files/fix-extra-libs.patch b/science/gis/gdal/files/fix-extra-libs.patch deleted file mode 100644 index fe1bda0d13..0000000000 --- a/science/gis/gdal/files/fix-extra-libs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2011-01-28 15:27:41.522000144 +0200 -+++ configure 2011-02-11 17:11:08.468000061 +0200 -@@ -15470,7 +15470,7 @@ - #define HAVE_LIBRT 1 - _ACEOF - -- LIBS="-lrt $LIBS" -+ LIBS="$LIBS" - - fi - -@@ -20537,7 +20537,7 @@ - - MYSQL_INC=$MYSQL_INC - --MYSQL_LIB=$MYSQL_LIB -+MYSQL_LIB="-L/usr/lib/mysql -lmysqlclient" - - - diff --git a/science/gis/gdal/files/gdal-1.5.1-python-install.patch b/science/gis/gdal/files/gdal-1.5.1-python-install.patch deleted file mode 100644 index fd1b7e488c..0000000000 --- a/science/gis/gdal/files/gdal-1.5.1-python-install.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- swig/python/GNUmakefile.orig 2008-02-02 17:00:52.000000000 -0800 -+++ swig/python/GNUmakefile 2008-02-02 17:02:03.000000000 -0800 -@@ -51,9 +51,9 @@ - install: - - ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install -+ $(PYTHON) setup.py install --root=$(DESTDIR) - else -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) - endif - - for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done diff --git a/science/gis/gdal/files/gdal-1.6.0-swig-fix.patch b/science/gis/gdal/files/gdal-1.6.0-swig-fix.patch deleted file mode 100644 index 38c94da52f..0000000000 --- a/science/gis/gdal/files/gdal-1.6.0-swig-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- swig/include/gdal.i.orig 2009-04-24 21:55:06.315863023 -0700 -+++ swig/include/gdal.i 2009-04-24 22:10:28.806611326 -0700 -@@ -176,6 +176,17 @@ - %include "gdal_typemaps.i" - #endif - -+/* Default memberin typemaps required to support SWIG 1.3.39 and above */ -+%typemap(memberin) char *Info %{ -+/* char* Info memberin typemap */ -+$1; -+%} -+ -+%typemap(memberin) char *Id %{ -+/* char* Info memberin typemap */ -+$1; -+%} -+ - //************************************************************************ - // - // Define the exposed CPL functions. diff --git a/science/gis/gdal/files/gdal-1.9.2-typecast.patch b/science/gis/gdal/files/gdal-1.9.2-typecast.patch new file mode 100644 index 0000000000..6418f3c118 --- /dev/null +++ b/science/gis/gdal/files/gdal-1.9.2-typecast.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000000..8d4390afb1 --- /dev/null +++ b/science/gis/gdal/files/gdal-2.3.1-libname.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000000..204df538fc --- /dev/null +++ b/science/gis/gdal/files/gdal-2.3.1-zlib.patch @@ -0,0 +1,11 @@ +--- 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-python-install.patch b/science/gis/gdal/files/gdal-python-install.patch deleted file mode 100644 index 03bf6da4ba..0000000000 --- a/science/gis/gdal/files/gdal-python-install.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- swig/python/GNUmakefile.orig 2015-06-14 21:06:33.000000000 +0200 -+++ swig/python/GNUmakefile 2015-06-27 22:02:07.805035411 +0200 -@@ -70,5 +70,5 @@ - ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install -+ $(PYTHON) setup.py install --root=$(DESTDIR) - else -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) - endif diff --git a/science/gis/gdal/files/gdal-sqlite-3.8.7.patch b/science/gis/gdal/files/gdal-sqlite-3.8.7.patch deleted file mode 100644 index 308cf7a95c..0000000000 --- a/science/gis/gdal/files/gdal-sqlite-3.8.7.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp -index a30b452..d45f3ff 100644 ---- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp -+++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp -@@ -2451,6 +2451,12 @@ int OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg, - /* OGR2SQLITE_Register() */ - /************************************************************************/ - -+#ifdef sqlite3_auto_extension -+// Sqlite 3.8.7 defines sqlite3_auto_extension via sqlite3_api -+// which is not initialized at this moment -+#undef sqlite3_auto_extension -+#endif -+ - /* We call this function so that each time a db is created, */ - /* OGR2SQLITE_static_register is called, to initialize the sqlite3_api */ - /* structure with the right pointers. */ diff --git a/science/gis/gdal/files/libtool.patch b/science/gis/gdal/files/libtool.patch deleted file mode 100644 index e4d0c363fd..0000000000 --- a/science/gis/gdal/files/libtool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- GNUmakefile.orig 2010-12-27 15:37:19.715000013 +0200 -+++ GNUmakefile 2010-12-27 15:37:35.036000014 +0200 -@@ -176,7 +176,7 @@ - (cd swig; $(MAKE) install) - endif - for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done -- $(LIBTOOL_FINISH) $(INST_LIB) -+ $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB) - - - ifeq ($(HAVE_LIBTOOL),yes) diff --git a/science/gis/gdal/pspec.xml b/science/gis/gdal/pspec.xml index 7a15cad03d..0a33d090f0 100644 --- a/science/gis/gdal/pspec.xml +++ b/science/gis/gdal/pspec.xml @@ -19,7 +19,7 @@ geos-devel hdf5-devel - ogdi-devel + tiff-devel webp-devel giflib-devel @@ -42,8 +42,11 @@ libxml2-devel - gdal-completion.patch - man.patch + gdal-1.9.2-typecast.patch + gdal-2.3.1-libname.patch + gdal-2.3.1-zlib.patch + gdal-completion.patch + man.patch