Rebuild again for new armadillo

Solve BZ #1271906 (Build iso8211 and s57 utilities)
Support openjpeg2

.gitignore

@@ -15,31 +15,7 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-1.11.1.tar.gz
 /gdalautotest-1.11.2.tar.gz
 /gdal-1.11.2-fedora.tar.xz
-/gdal-2.0.0-fedora.tar.xz
-/gdalautotest-2.0.0.tar.gz
-/gdalautotest-2.0.1.tar.gz
-/gdal-2.0.1-fedora.tar.xz
-/gdalautotest-2.0.2.tar.gz
 /gdalautotest-1.11.3.tar.gz
-/gdal-2.0.2-fedora.tar.xz
-/gdalautotest-2.1.0.tar.gz
-/gdal-2.1.0-fedora.tar.xz
-/gdalautotest-2.1.1.tar.gz
-/gdal-2.1.1-fedora.tar.xz
-/gdal-2.1.2-fedora.tar.xz
-/gdalautotest-2.1.3.tar.gz
-/gdal-2.1.3-fedora.tar.xz
-/gdal-2.1.4-fedora.tar.xz
-/gdalautotest-2.1.4.tar.gz
-/gdal-2.2.2-fedora.tar.xz
-/gdalautotest-2.2.2.tar.gz
-/gdalautotest-2.2.3.tar.gz
-/gdal-2.2.3-fedora.tar.xz
-/gdalautotest-2.2.4.tar.gz
-/gdal-2.2.4-fedora.tar.xz
-/gdalautotest-2.3.1.tar.gz
-/gdal-2.3.1-fedora.tar.xz
-/gdalautotest-2.3.2.tar.gz
-/gdal-2.3.2-fedora.tar.xz
-/gdalautotest-3.0.1.zip
-/gdal-3.0.1-fedora.tar.xz
+/gdal-1.11.3-fedora.tar.xz
+/gdalautotest-1.11.4.tar.gz
+/gdal-1.11.4-fedora.tar.xz

gdal-1.9.0-java.patch

@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/swig/java/java.opt gdal-3.0.4-fedora-new/swig/java/java.opt
---- gdal-3.0.4-fedora/swig/java/java.opt	2020-01-28 11:13:12.000000000 +0100
-+++ gdal-3.0.4-fedora-new/swig/java/java.opt	2020-02-06 00:23:36.321286290 +0100
-@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
+diff -Nur gdal-1.9.0-fedora/swig/java/java.opt gdal-1.9.0-fedora-java/swig/java/java.opt
+--- gdal-1.9.0-fedora/swig/java/java.opt	2012-01-04 08:03:40.000000000 +0100
++++ gdal-1.9.0-fedora-java/swig/java/java.opt	2012-02-03 08:44:55.837978697 +0100
+@@ -5,6 +5,6 @@
  JAVAC=$(JAVA_HOME)/bin/javac
  JAVA=$(JAVA_HOME)/bin/java
  JAR=$(JAVA_HOME)/bin/jar

gdal-2.0.1-iso8211-include.patch

@@ -0,0 +1,11 @@
+diff -Nur gdal-2.0.1-fedora/frmts/iso8211/8211createfromxml.cpp gdal-2.0.1-fedora-iso8211/frmts/iso8211/8211createfromxml.cpp
+--- gdal-2.0.1-fedora/frmts/iso8211/8211createfromxml.cpp	2015-09-15 16:06:51.000000000 +0200
++++ gdal-2.0.1-fedora-iso8211/frmts/iso8211/8211createfromxml.cpp	2015-10-18 03:04:21.812446373 +0200
+@@ -28,6 +28,7 @@
+  ****************************************************************************/
+ 
+ #include "cpl_minixml.h"
++#include "cpl_conv.h"
+ #include "iso8211.h"
+ #include <map>
+ #include <string>

gdal-cleaner.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-VERSION="3.0.4"
+# Volker Fröhlich
+VERSION="1.11.4"
 
 tar xvf gdal-"${VERSION}".tar.xz
 
@@ -11,6 +12,8 @@ rm data/esri_Wisconsin_extra.wkt
 rm data/esri_StatePlane_extra.wkt
 rm data/ecw_cs.wkt
 
+rm -r frmts/bsb
+
 #Really necessary?
 rm -r swig/php
 

gdal-completion.patch

@@ -1,12 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/scripts/GNUmakefile gdal-3.0.4-fedora-new/scripts/GNUmakefile
---- gdal-3.0.4-fedora/scripts/GNUmakefile	2020-01-28 11:13:13.000000000 +0100
-+++ gdal-3.0.4-fedora-new/scripts/GNUmakefile	2020-02-06 00:23:36.089287463 +0100
-@@ -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

gdal-g2clib.patch

@@ -0,0 +1,67 @@
+diff -up gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c.g2clib gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c
+--- gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c.g2clib	2012-01-04 00:03:34.000000000 -0700
++++ gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c	2012-03-09 12:54:58.582531620 -0700
+@@ -419,7 +419,6 @@ int fillSect3 (enGribMeta *en, uShort2 t
+                double meshLat, double orientLon, double scaleLat1,
+                double scaleLat2, double southLat, double southLon)
+ {
+-   const struct gridtemplate *templatesgrid = get_templatesgrid();
+    int i;               /* loop counter over number of GDS templates. */
+    double unit;         /* Used to convert from stored value to degrees
+                          * lat/lon. See GRIB2 Regulation 92.1.6 */
+@@ -641,7 +640,6 @@ int fillSect4_0 (enGribMeta *en, uShort2
+                  double dSurfVal2)
+ {
+    int i;               /* loop counter over number of PDS templates. */
+-   const struct pdstemplate *templatespds = get_templatespds();
+ 
+    /* analysis template (0) */
+    /* In addition templates (1, 2, 5, 8, 9, 12) begin with 4.0 info. */
+@@ -1197,7 +1195,6 @@ int fillSect5 (enGribMeta *en, uShort2 t
+                uChar orderOfDiff)
+ {
+    int i;               /* loop counter over number of DRS templates. */
+-   const struct drstemplate *templatesdrs = get_templatesdrs();
+ 
+    /* Find NCEP's template match */
+    for (i = 0; i < MAXDRSTEMP; i++) {
+diff -up gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c.g2clib gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c
+--- gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c.g2clib	2012-01-04 00:03:34.000000000 -0700
++++ gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c	2012-03-09 12:55:38.686097396 -0700
+@@ -958,7 +958,6 @@ void unpk_g2ncep (sInt4 * kfildo, float
+    }
+    curIndex = 14;
+    for (i = 0; i < gfld->igdtlen; i++) {
+-      const struct gridtemplate *templatesgrid = get_templatesgrid();
+       is3[curIndex] = gfld->igdtmpl[i];
+       curIndex += abs (templatesgrid[gridIndex].mapgrid[i]);
+    }
+@@ -1026,7 +1025,6 @@ void unpk_g2ncep (sInt4 * kfildo, float
+    }
+    curIndex = 9;
+    for (i = 0; i < gfld->ipdtlen; i++) {
+-      const struct pdstemplate *templatespds = get_templatespds();
+       is4[curIndex] = gfld->ipdtmpl[i];
+       curIndex += abs (templatespds[pdsIndex].mappds[i]);
+    }
+@@ -1044,7 +1042,6 @@ void unpk_g2ncep (sInt4 * kfildo, float
+    }
+    curIndex = 11;
+    for (i = 0; i < gfld->idrtlen; i++) {
+-      const struct drstemplate *templatesdrs = get_templatesdrs();
+       is5[curIndex] = gfld->idrtmpl[i];
+       curIndex += abs (templatesdrs[drsIndex].mapdrs[i]);
+    }
+diff -up gdal-1.9.0-fedora/frmts/grib/GNUmakefile.g2clib gdal-1.9.0-fedora/frmts/grib/GNUmakefile
+--- gdal-1.9.0-fedora/frmts/grib/GNUmakefile.g2clib	2012-01-04 00:03:34.000000000 -0700
++++ gdal-1.9.0-fedora/frmts/grib/GNUmakefile	2012-03-09 12:05:14.050311275 -0700
+@@ -7,8 +7,7 @@ include ../../GDALmake.opt
+ OBJ	=	gribdataset.o \
+                 clock.o \
+                 degrib1.o \
+-                degrib2.o inventory.o metaname.o myerror.o tdlpack.o filedatasource.o memorydatasource.o grib1tab.o myutil.o metaparse.o weather.o metaprint.o engribapi.o grib2api.o myassert.o scan.o memendian.o fileendian.o gridtemplates.o drstemplates.o pdstemplates.o gbits.o g2_free.o g2_unpack1.o g2_unpack2.o g2_unpack3.o g2_unpack4.o g2_unpack5.o g2_unpack6.o g2_unpack7.o g2_info.o g2_getfld.o simunpack.o comunpack.o pack_gp.o reduce.o specpack.o specunpack.o rdieee.o mkieee.o int_power.o simpack.o compack.o cmplxpack.o misspack.o g2_create.o g2_addlocal.o g2_addgrid.o g2_addfield.o g2_gribend.o getdim.o g2_miss.o getpoly.o seekgb.o \
+-		dec_jpeg2000.o jpcunpack.o jpcpack.o enc_jpeg2000.o
++                degrib2.o inventory.o metaname.o myerror.o tdlpack.o filedatasource.o memorydatasource.o grib1tab.o myutil.o metaparse.o weather.o metaprint.o engribapi.o grib2api.o myassert.o scan.o memendian.o fileendian.o 
+ 
+ ifeq ($(HAVE_JASPER),yes)
+ EXTRAFLAGS	:= 	$(EXTRAFLAGS) -DHAVE_JASPER

gdal-jni.patch

@@ -0,0 +1,48 @@
+diff -up gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i
+--- gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni	2012-10-08 18:58:28.000000000 -0600
++++ gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i	2013-06-12 14:40:22.858828066 -0600
+@@ -22,7 +22,7 @@
+ 
+   static {
+     try {
+-      System.loadLibrary("gdalconstjni");
++      System.load("/usr/lib/java/gdal/libgdalconstjni.so");
+       available = true;
+     } catch (UnsatisfiedLinkError e) {
+       available = false;
+diff -up gdal-1.9.2-fedora/swig/include/java/gdal_java.i.jni gdal-1.9.2-fedora/swig/include/java/gdal_java.i
+--- gdal-1.9.2-fedora/swig/include/java/gdal_java.i.jni	2012-10-08 18:58:28.000000000 -0600
++++ gdal-1.9.2-fedora/swig/include/java/gdal_java.i	2013-06-12 14:40:39.142749339 -0600
+@@ -22,7 +22,7 @@
+ 
+   static {
+     try {
+-      System.loadLibrary("gdaljni");
++      System.load("/usr/lib/java/gdal/libgdaljni.so");
+       available = true;
+       
+       if (gdal.HasThreadSupport() == 0)
+diff -up gdal-1.9.2-fedora/swig/include/java/ogr_java.i.jni gdal-1.9.2-fedora/swig/include/java/ogr_java.i
+--- gdal-1.9.2-fedora/swig/include/java/ogr_java.i.jni	2012-10-08 18:58:28.000000000 -0600
++++ gdal-1.9.2-fedora/swig/include/java/ogr_java.i	2013-06-12 14:39:47.946997388 -0600
+@@ -24,7 +24,7 @@
+ 
+   static {
+     try {
+-      System.loadLibrary("ogrjni");
++      System.load("/usr/lib/java/gdal/libogrjni.so");
+       available = true;
+       
+       if (org.gdal.gdal.gdal.HasThreadSupport() == 0)
+diff -up gdal-1.9.2-fedora/swig/include/java/osr_java.i.jni gdal-1.9.2-fedora/swig/include/java/osr_java.i
+--- gdal-1.9.2-fedora/swig/include/java/osr_java.i.jni	2012-10-08 18:58:28.000000000 -0600
++++ gdal-1.9.2-fedora/swig/include/java/osr_java.i	2013-06-12 14:41:10.097554983 -0600
+@@ -26,7 +26,7 @@
+ 
+   static {
+     try {
+-      System.loadLibrary("osrjni");
++      System.load("/usr/lib/java/gdal/libosrjni.so");
+       available = true;
+     } catch (UnsatisfiedLinkError e) {
+       available = false;

gdal.pom

@@ -0,0 +1,6 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.gdal</groupId>
+  <artifactId>gdal-java-bindings</artifactId>
+  <version></version>
+</project>

gdal_installapps.patch

@@ -1,11 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
---- gdal-3.0.4-fedora/apps/GNUmakefile	2020-01-28 11:13:12.000000000 +0100
-+++ gdal-3.0.4-fedora-new/apps/GNUmakefile	2020-03-03 23:17:41.032487778 +0100
-@@ -216,6 +216,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
- 
- install: default
- 	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+	for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
- 	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
- 	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
- 

gdal_iso8211.patch

@@ -1,13 +0,0 @@
-diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
---- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile	2020-02-06 00:24:10.382117696 +0100
-@@ -23,8 +23,7 @@ dist-clean:	clean
- 	rm -rf $(DISTDIR)
- 
- $(ISOLIB):	$(OBJ:.o=.$(OBJ_EXT))
--	$(AR) r $(ISOLIB) $?
--	$(RANLIB) $(ISOLIB)
-+	$(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
- 
- 8211createfromxml$(EXE):	8211createfromxml.$(OBJ_EXT)
- 	$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)

gdal_tirpcinc.patch

@@ -1,24 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
---- gdal-3.0.4-fedora/frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
-@@ -4,7 +4,7 @@ include ../../GDALmake.opt
- 
- OBJ	=	dodsdataset2.o
- 
--CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC)
-+CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
- 
- default:	$(OBJ:.o=.$(OBJ_EXT))
- 
-diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
---- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
-@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
- OBJ	=	ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
- 		ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
- 
--CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
-+CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
- 
- default:	$(O_OBJ:.o=.$(OBJ_EXT))
- 

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
-SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
+8b63eaff1df4d8ccd1a17b497b189282  gdalautotest-1.11.4.tar.gz
+4003b0a4c6c3eb603cd63e61fb9416e2  gdal-1.11.4-fedora.tar.xz