gdal:rebuild

2019-02-07 14:43:36 +03:00
parent ed218ce8a4
commit f165c10022
11 changed files with 41 additions and 96 deletions
@@ -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 ")
    
@@ -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"
- 
- 
- 
@@ -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
@@ -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.
@@ -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);
+ }
@@ -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
@@ -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 <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 $")
+ 
@@ -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
@@ -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. */
@@ -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)
@@ -19,7 +19,7 @@
            <!--Dependency>perl-ExtUtils-MakeMaker</Dependency-->
            <Dependency>geos-devel</Dependency>
            <Dependency>hdf5-devel</Dependency>
-            <Dependency>ogdi-devel</Dependency>
+<!--             <Dependency>ogdi-devel</Dependency> --> <!--error: rpc/rpc.h-->
            <Dependency>tiff-devel</Dependency>
            <Dependency>webp-devel</Dependency>
            <Dependency>giflib-devel</Dependency>
@@ -42,8 +42,11 @@
            <Dependency>libxml2-devel</Dependency>
        </BuildDependencies>
        <Patches>
-            <Patch>gdal-completion.patch</Patch>
-            <Patch>man.patch</Patch>
+            <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>