From 743c2d9c33a064c8f4338df43666562608fd931a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 11 May 2018 01:02:49 +0200 Subject: [PATCH] - updated patches, removed obsolete --- gdal-armadillo.patch | 4 ++-- gdal-dds.patch | 4 ++-- gdal-fyba.patch | 30 --------------------------- gdal-grass.patch | 43 --------------------------------------- gdal-link.patch | 29 -------------------------- gdal-pluginsdir.patch | 4 ++-- gdal-python_install.patch | 16 --------------- gdal-rasdaman.patch | 4 ++-- gdal-sh.patch | 4 ++-- gdal-uchar.patch | 12 ----------- gdal.spec | 16 +++------------ 11 files changed, 13 insertions(+), 153 deletions(-) delete mode 100644 gdal-fyba.patch delete mode 100644 gdal-grass.patch delete mode 100644 gdal-link.patch delete mode 100644 gdal-python_install.patch delete mode 100644 gdal-uchar.patch diff --git a/gdal-armadillo.patch b/gdal-armadillo.patch index 6236e3a..6824e3d 100644 --- a/gdal-armadillo.patch +++ b/gdal-armadillo.patch @@ -1,6 +1,6 @@ Kill warnings in Armadillo detection code to make compiler output empty ---- gdal-1.11.0/configure.in.orig 2014-06-14 15:45:50.005039893 +0200 -+++ gdal-1.11.0/configure.in 2014-06-14 16:46:47.261630331 +0200 +--- gdal-1.11.0/configure.ac.orig 2014-06-14 15:45:50.005039893 +0200 ++++ gdal-1.11.0/configure.ac 2014-06-14 16:46:47.261630331 +0200 @@ -4227,7 +4227,7 @@ rm -f testarmadillo.* rm -f testarmadillo diff --git a/gdal-dds.patch b/gdal-dds.patch index 1fb71fc..c8c31f7 100644 --- a/gdal-dds.patch +++ b/gdal-dds.patch @@ -1,5 +1,5 @@ ---- gdal-1.11.0/configure.in.orig 2014-05-18 11:22:22.873992206 +0200 -+++ gdal-1.11.0/configure.in 2014-05-18 12:20:58.637252259 +0200 +--- gdal-1.11.0/configure.ac.orig 2014-05-18 11:22:22.873992206 +0200 ++++ gdal-1.11.0/configure.ac 2014-05-18 12:20:58.637252259 +0200 @@ -941,6 +941,11 @@ echo "dds support disabled." diff --git a/gdal-fyba.patch b/gdal-fyba.patch deleted file mode 100644 index 5822011..0000000 --- a/gdal-fyba.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- gdal-1.11.0/configure.in.orig 2014-05-12 21:49:57.910679098 +0200 -+++ gdal-1.11.0/configure.in 2014-05-18 11:22:22.873992206 +0200 -@@ -1480,23 +1480,11 @@ - - elif test "$with_sosi" = "yes" -o "$with_sosi" = "" ; then - -- AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in /usr/local/lib]) -- if test -r /usr/local/lib/libfyba.a -a -r /usr/local/lib/libfygm.a -a -r /usr/local/lib/libfyut.a ; then -- AC_MSG_RESULT([found]) -+ AC_CHECK_LIB([fyba], [main], [ - SOSI_ENABLED=yes -- SOSI_LIB="/usr/local/lib/libfyba.a /usr/local/lib/libfygm.a /usr/local/lib/libfyut.a" -- else -- AC_MSG_ERROR([not found.]) -- fi -- -- AC_MSG_CHECKING([for fyba.h, fygm.h and fyut.h in /usr/local/include/fyba]) -- if test -r /usr/local/include/fyba/fyba.h -a -r /usr/local/include/fyba/fygm.h -a -r /usr/local/include/fyba/fyut.h ; then -- AC_MSG_RESULT([found]) -- SOSI_ENABLED=yes -- SOSI_INC="-I/usr/local/include/fyba" -- else -- AC_MSG_ERROR([not found.]) -- fi -+ SOSI_INC="-I/usr/include/fyba" -+ SOSI_LIB="-lfyba -lfygm -lfyut" -+ ], [AC_MSG_ERROR([not found.])]) - - else - diff --git a/gdal-grass.patch b/gdal-grass.patch deleted file mode 100644 index a27c814..0000000 --- a/gdal-grass.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- gdal-1.11.0/configure.in.orig 2014-05-11 06:25:06.870303219 +0200 -+++ gdal-1.11.0/configure.in 2014-05-11 09:17:12.103421341 +0200 -@@ -718,25 +718,33 @@ - - # Check for GRASS 5.7.0 or later library use. - # TODO: separate libs for rasters and vectors --if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then -+if test "$with_grass" != "no" ; then - -- AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) -+ if test "$with_grass" = "yes" ; then -+ GRASS_I= -+ GRASS_L= -+ GRASS_GISBASE="$prefix" -+ else -+ GRASS_I="-I$with_grass/include" -+ GRASS_L="-L$with_grass/lib" -+ GRASS_GISBASE="$with_grass" -+ fi -+ AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,$GRASS_L -lgrass_datetime) - if test "$GRASS_SETTING" = "no" ; then -- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) -+ AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,$GRASS_L -lgrass_datetime) - fi - - if test "$GRASS_SETTING" != "no" ; then - if test "$GRASS_SETTING" = "grass70+" ; then - G_RASTLIBS="-lgrass_raster -lgrass_imagery" - G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" -- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" -+ LIBS="$GRASS_L $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" - else - G_RASTLIBS="-lgrass_I" - G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" -- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" -+ LIBS="$GRASS_L $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" - fi -- GRASS_INCLUDE="-I$with_grass/include" -- GRASS_GISBASE="$with_grass" -+ GRASS_INCLUDE="$GRASS_I" - HAVE_GRASS=yes - else - AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found!]) diff --git a/gdal-link.patch b/gdal-link.patch deleted file mode 100644 index 9a9f7e6..0000000 --- a/gdal-link.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gdal-1.11.0/swig/ruby/RubyMakefile.mk.orig 2014-05-11 22:02:00.429131553 +0200 -+++ gdal-1.11.0/swig/ruby/RubyMakefile.mk 2014-05-12 19:26:05.824192351 +0200 -@@ -64,10 +64,10 @@ - for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done - - $(RUBY_MODULES_MAC): %.bundle: %_wrap.o -- $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ -+ $(LD) $(LDFLAGS) $(GDAL_SLIB_LINK) $(LIBS) $(RUBY_LIB) $< -o $@ - - $(RUBY_MODULES_LIN): %.so: %_wrap.o -- $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ -+ $(LD) $(LDFLAGS) $(GDAL_SLIB_LINK) $(LIBS) $(RUBY_LIB) $< -o $@ - - %.o: %.cpp - $(CXX) $(CFLAGS) -fPIC $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< ---- gdal-1.11.0/GDALmake.opt.in.orig 2014-04-16 22:04:49.000000000 +0200 -+++ gdal-1.11.0/GDALmake.opt.in 2014-05-12 19:25:43.287526155 +0200 -@@ -100,7 +100,11 @@ - - GDAL_LIB = $(GDAL_ROOT)/libgdal.a - GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) -+ifeq ($(HAVE_LIBTOOL), yes) -+GDAL_SLIB_LINK = $(GDAL_ROOT)/libgdal.la -+else - GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal -+endif - - # Mac OS X Framework definition - MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ diff --git a/gdal-pluginsdir.patch b/gdal-pluginsdir.patch index e2b0613..bf19499 100644 --- a/gdal-pluginsdir.patch +++ b/gdal-pluginsdir.patch @@ -15,8 +15,8 @@ #endif #else char szExecPath[1024]; ---- gdal-1.11.2/configure.in.orig 2015-03-01 09:07:33.069445871 +0100 -+++ gdal-1.11.2/configure.in 2015-03-01 21:13:55.727616880 +0100 +--- gdal-1.11.2/configure.ac.orig 2015-03-01 09:07:33.069445871 +0100 ++++ gdal-1.11.2/configure.ac 2015-03-01 21:13:55.727616880 +0100 @@ -3812,12 +3812,16 @@ if test "$prefix" = "NONE" ; then diff --git a/gdal-python_install.patch b/gdal-python_install.patch deleted file mode 100644 index 91cc4e3..0000000 --- a/gdal-python_install.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gdal-1.5.4/swig/python/GNUmakefile.bak 2008-07-26 21:04:24.000000000 +0200 -+++ gdal-1.5.4/swig/python/GNUmakefile 2009-05-18 20:14:35.000000000 +0200 -@@ -53,12 +53,7 @@ - $(PYTHON) setup.py bdist_egg - - install: -- --ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install --else -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --endif -+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) - - for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done - diff --git a/gdal-rasdaman.patch b/gdal-rasdaman.patch index 5d5d9c0..daa5983 100644 --- a/gdal-rasdaman.patch +++ b/gdal-rasdaman.patch @@ -1,5 +1,5 @@ ---- gdal-1.11.0/configure.in.orig 2014-06-14 20:12:03.704706951 +0200 -+++ gdal-1.11.0/configure.in 2014-06-14 20:53:44.987988150 +0200 +--- gdal-1.11.0/configure.ac.orig 2014-06-14 20:12:03.704706951 +0200 ++++ gdal-1.11.0/configure.ac 2014-06-14 20:53:44.987988150 +0200 @@ -4182,7 +4182,7 @@ AC_CHECK_LIB(raslib,main,RASDAMAN_ENABLED=yes,,,) diff --git a/gdal-sh.patch b/gdal-sh.patch index 6b5a0b4..79fd60c 100644 --- a/gdal-sh.patch +++ b/gdal-sh.patch @@ -1,5 +1,5 @@ ---- gdal-1.9.0/configure.in.orig 2012-01-04 08:03:42.000000000 +0100 -+++ gdal-1.9.0/configure.in 2012-01-19 20:50:08.902476176 +0100 +--- gdal-1.9.0/configure.ac.orig 2012-01-04 08:03:42.000000000 +0100 ++++ gdal-1.9.0/configure.ac 2012-01-19 20:50:08.902476176 +0100 @@ -1493,7 +1493,7 @@ AC_MSG_CHECKING([libnetcdf version with $ncdump]) netcdf_version=`$ncdump 2>&1 | grep "netcdf library version" | awk '{gsub(/"/,"");print $4}'` diff --git a/gdal-uchar.patch b/gdal-uchar.patch deleted file mode 100644 index db56b9c..0000000 --- a/gdal-uchar.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp.uchar~ gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp ---- gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp.uchar~ 2016-12-01 09:14:51.768247534 -0700 -+++ gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-12-01 09:15:14.503375681 -0700 -@@ -209,7 +209,7 @@ static void JPEG2000_VSIL_jas_stream_ini - /* The buffer must be large enough to accommodate maximum - putback. */ - assert(bufsize > JAS_STREAM_MAXPUTBACK); -- stream->bufbase_ = JAS_CAST(uchar *, buf); -+ stream->bufbase_ = JAS_CAST(unsigned char *, buf); - stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK; - } - } else { diff --git a/gdal.spec b/gdal.spec index fae25e3..4daa99f 100644 --- a/gdal.spec +++ b/gdal.spec @@ -56,17 +56,12 @@ Group: Libraries Source0: http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz # Source0-md5: 51b1df61dbdf81473689fab3075e7a5e Patch0: %{name}-perl.patch -Patch1: %{name}-python_install.patch Patch2: %{name}-php.patch Patch3: %{name}-fpic.patch -Patch5: %{name}-grass.patch -Patch7: %{name}-link.patch -Patch8: %{name}-fyba.patch Patch9: %{name}-dds.patch Patch11: %{name}-armadillo.patch Patch12: %{name}-rasdaman.patch Patch13: %{name}-pluginsdir.patch -Patch14: %{name}-uchar.patch Patch15: libx32.patch URL: http://www.gdal.org/ %{?with_php:BuildRequires: %{php_name}-devel} @@ -285,17 +280,12 @@ osr. %prep %setup -q %patch0 -p1 -#%patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch5 -p1 -#%patch7 -p1 -#%patch8 -p1 -#%patch9 -p1 -#%patch11 -p1 -#%patch12 -p1 +%patch9 -p1 +%patch11 -p1 +%patch12 -p1 #%patch13 -p1 -#%patch14 -p1 %patch15 -p1 # need to regenerate (old ones don't support perl 5.10 or php 5.5) -- 2.43.0