Compare commits
No commits in common. "master" and "f28" have entirely different histories.
|
|
@ -37,9 +37,3 @@ gdalautotest-1.7.0.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
|
||||
|
|
|
|||
|
|
@ -1,6 +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
|
||||
Index: gdal-2.2.3-fedora/swig/java/java.opt
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/swig/java/java.opt
|
||||
+++ gdal-2.2.3-fedora/swig/java/java.opt
|
||||
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
|
||||
JAVAC=$(JAVA_HOME)/bin/javac
|
||||
JAVA=$(JAVA_HOME)/bin/java
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
Index: gdal-2.2.3-fedora/frmts/mrf/mrf_band.cpp
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/frmts/mrf/mrf_band.cpp
|
||||
+++ gdal-2.2.3-fedora/frmts/mrf/mrf_band.cpp
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
#include <vector>
|
||||
#include <assert.h>
|
||||
-#include "../zlib/zlib.h"
|
||||
+#include <zlib.h>
|
||||
|
||||
CPL_CVSID("$Id: mrf_band.cpp 37663 2017-03-09 20:42:19Z lplesea $");
|
||||
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
#!/bin/bash
|
||||
VERSION="3.0.4"
|
||||
# Volker Fröhlich
|
||||
VERSION="2.2.4"
|
||||
|
||||
tar xvf gdal-"${VERSION}".tar.xz
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
Index: gdal-2.2.3-fedora/frmts/grib/GNUmakefile
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/frmts/grib/GNUmakefile
|
||||
+++ gdal-2.2.3-fedora/frmts/grib/GNUmakefile
|
||||
@@ -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 ($(PNG_SETTING),internal)
|
||||
EXTRAFLAGS := $(EXTRAFLAGS) -I../png/libpng -DUSE_PNG
|
||||
@@ -20,7 +19,7 @@ endif
|
||||
|
||||
ifeq ($(PNG_SETTING),external)
|
||||
EXTRAFLAGS := $(EXTRAFLAGS) -DUSE_PNG
|
||||
-OBJ := $(OBJ) pngpack.o pngunpack.o enc_png.o dec_png.o
|
||||
+OBJ := $(OBJ)
|
||||
endif
|
||||
|
||||
CPPFLAGS := $(CPPFLAGS) $(EXTRAFLAGS)
|
||||
Index: gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/engribapi.c
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/frmts/grib/degrib18/degrib/engribapi.c
|
||||
+++ gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/engribapi.c
|
||||
@@ -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++) {
|
||||
Index: gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/grib2api.c
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/frmts/grib/degrib18/degrib/grib2api.c
|
||||
+++ gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/grib2api.c
|
||||
@@ -961,7 +961,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
|
||||
}
|
||||
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]);
|
||||
}
|
||||
@@ -1029,7 +1028,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
|
||||
}
|
||||
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]);
|
||||
}
|
||||
@@ -1047,7 +1045,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
|
||||
}
|
||||
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]);
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
Index: gdal-2.2.3-fedora/swig/include/java/gdalconst_java.i
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/swig/include/java/gdalconst_java.i
|
||||
+++ gdal-2.2.3-fedora/swig/include/java/gdalconst_java.i
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
static {
|
||||
try {
|
||||
- System.loadLibrary("gdalconstjni");
|
||||
+ System.load("/usr/lib/java/gdal/libgdalconstjni.so");
|
||||
available = true;
|
||||
} catch (UnsatisfiedLinkError e) {
|
||||
available = false;
|
||||
Index: gdal-2.2.3-fedora/swig/include/java/gdal_java.i
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/swig/include/java/gdal_java.i
|
||||
+++ gdal-2.2.3-fedora/swig/include/java/gdal_java.i
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
static {
|
||||
try {
|
||||
- System.loadLibrary("gdaljni");
|
||||
+ System.load("/usr/lib/java/gdal/libgdaljni.so");
|
||||
available = true;
|
||||
|
||||
if (gdal.HasThreadSupport() == 0)
|
||||
Index: gdal-2.2.3-fedora/swig/include/java/ogr_java.i
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/swig/include/java/ogr_java.i
|
||||
+++ gdal-2.2.3-fedora/swig/include/java/ogr_java.i
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
static {
|
||||
try {
|
||||
- System.loadLibrary("ogrjni");
|
||||
+ System.load("/usr/lib/java/gdal/libogrjni.so");
|
||||
available = true;
|
||||
|
||||
if (org.gdal.gdal.gdal.HasThreadSupport() == 0)
|
||||
Index: gdal-2.2.3-fedora/swig/include/java/osr_java.i
|
||||
===================================================================
|
||||
--- gdal-2.2.3-fedora.orig/swig/include/java/osr_java.i
|
||||
+++ gdal-2.2.3-fedora/swig/include/java/osr_java.i
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
static {
|
||||
try {
|
||||
- System.loadLibrary("osrjni");
|
||||
+ System.load("/usr/lib/java/gdal/libosrjni.so");
|
||||
available = true;
|
||||
} catch (UnsatisfiedLinkError e) {
|
||||
available = false;
|
||||
|
|
@ -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>
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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)
|
||||
|
|
@ -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))
|
||||
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
|
||||
SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
|
||||
SHA512 (gdalautotest-2.2.4.tar.gz) = c7dd8e007c84b112f7d6384d5e28981a929b81409b41bd02495c4d7b99a72aa4ee92884a90e0246c3b1c8c723b9272979a89f15b00794abebde97a36d6344ee9
|
||||
SHA512 (gdal-2.2.4-fedora.tar.xz) = a8c878c0b9ea56575eaa72434990a1473a9dfc40dc7794d0a752846b0f945e8f38da02b7a264f7450b44ba3d021ee7af6e1ec6be57e955594f4b33caa4d1ddd0
|
||||
|
|
|
|||
Loading…
Reference in New Issue