Compare commits
172 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4015c908dd | ||
|
|
fc760216de | ||
|
|
dcd61ee050 | ||
|
|
c006213de0 | ||
|
|
2665a7f24c | ||
|
|
b7e01d9917 |
||
|
|
4fc48a16c4 | ||
|
|
f810f3bd7c | ||
|
|
38126bb718 | ||
|
|
d85d81a7bf | ||
|
|
b1f662fa46 | ||
|
|
d354dcf08c | ||
|
|
d0879d3353 | ||
|
|
53a4cd4851 | ||
|
|
e145220ec5 | ||
|
|
136d07b83f | ||
|
|
377f8594e7 | ||
|
|
bf3daf0173 | ||
|
|
bc3cea3402 | ||
|
|
66ce787be2 | ||
|
|
0086087c35 | ||
|
|
a06f118545 | ||
|
|
196ae48f05 | ||
|
|
c4cc55a181 | ||
|
|
698a044082 | ||
|
|
e95684c34e | ||
|
|
1bfaf55274 | ||
|
|
20fd14c6be | ||
|
|
1eca685c25 | ||
|
|
e70fc9f76d | ||
|
|
8df52d19a3 | ||
|
|
424b52eaac | ||
|
|
1a3603cd22 | ||
|
|
7e82750251 | ||
|
|
529be833d4 | ||
|
|
770433fc76 | ||
|
|
899461ad98 | ||
|
|
db98046d34 | ||
|
|
00acea5160 | ||
|
|
2f7e4bef1f | ||
|
|
8c749deb75 | ||
|
|
c666a69311 | ||
|
|
bf35e9cb08 | ||
|
|
b75d0ec0d4 | ||
|
|
93adb52b9f | ||
|
|
565ce6e053 | ||
|
|
2bc527eb6a | ||
|
|
637386cf97 | ||
|
|
ad3453eb76 | ||
|
|
098b14e214 | ||
|
|
b8e3c555f6 | ||
|
|
394eed33aa | ||
|
|
25d1347aae | ||
|
|
136e7f4f64 | ||
|
|
6bcb0f2a16 | ||
|
|
9db09212f6 | ||
|
|
d0886d734b | ||
|
|
ed075d832d | ||
|
|
71ad4bc0e5 | ||
|
|
69b2dc04ab | ||
|
|
ad17a9315a | ||
|
|
bb308c7369 | ||
|
|
3019ac08e3 | ||
|
|
f23205c745 | ||
|
|
116814cf3e | ||
|
|
6e6c24f595 | ||
|
|
24441e8c23 | ||
|
|
cc57ed2f4c | ||
|
|
146fa34935 | ||
|
|
cbf2ff081e | ||
|
|
a3a71f65ed | ||
|
|
969ceac62c | ||
|
|
dba74755ea | ||
|
|
42bea94400 | ||
|
|
b969229332 | ||
|
|
d6fb33fcd4 | ||
|
|
3d314501ed | ||
|
|
eb4a188f4f | ||
|
|
e9a4e4940e | ||
|
|
d4112b5ee2 | ||
|
|
eec2045095 | ||
|
|
428abb70df | ||
|
|
eea08ba9a5 | ||
|
|
9ce1912766 | ||
|
|
9c83057c02 | ||
|
|
dbdf7b71de | ||
|
|
203b15df02 | ||
|
|
04fad8ce0a | ||
|
|
fdbad445a7 | ||
|
|
72e2f007d3 | ||
|
|
9fa8f6a6dd | ||
|
|
a574d8277a | ||
|
|
4f960b66cc | ||
|
|
adeb164c34 | ||
|
|
df64a19909 | ||
|
|
2bd4654b97 | ||
|
|
a4c5376006 | ||
|
|
a1088f112f | ||
|
|
f9675a7ba2 | ||
|
|
c0901e5ae7 | ||
|
|
6c1f1b153a | ||
|
|
5e63728f69 | ||
|
|
538b78ae4b | ||
|
|
6ee8448d69 | ||
|
|
3b9ef5046a | ||
|
|
84674d8354 | ||
|
|
0ad5990efa | ||
|
|
ffdd3ca417 | ||
|
|
f95f749e5e | ||
|
|
f9c99ced77 | ||
|
|
3fbb4fa80a | ||
|
|
261b3f6f09 | ||
|
|
dd5e0052fc | ||
|
|
e58fcd24f0 | ||
|
|
1c6e0056f7 | ||
|
|
0f6f27c7ae |
||
|
|
8cea7c92f8 | ||
|
|
5ddff3bb69 | ||
|
|
28e52779b5 | ||
|
|
af4294a6a6 |
||
|
|
a3dfc6afde | ||
|
|
4bad91032e | ||
|
|
e5a8e31edd | ||
|
|
cdc2c17277 | ||
|
|
f2db417532 | ||
|
|
60f867e15f | ||
|
|
33a6cfdf66 | ||
|
|
e8cede5ed1 | ||
|
|
f68d007402 | ||
|
|
237ae061cc | ||
|
|
7eab992acd | ||
|
|
5406afbc89 | ||
|
|
0632849332 | ||
|
|
8d385588cf | ||
|
|
0c0a9d2f7b | ||
|
|
4bde9e154e | ||
|
|
a625e0934f | ||
|
|
024ed5a815 | ||
|
|
b39c5fed7c | ||
|
|
9133862397 | ||
|
|
ab64b86043 | ||
|
|
7e04f460b2 | ||
|
|
25e2169437 | ||
|
|
66fa4e0505 | ||
|
|
8ca3f7888d | ||
|
|
1afc975964 | ||
|
|
ff794792ae | ||
|
|
51eca1bf7b | ||
|
|
0232d4b243 | ||
|
|
74c97a98c3 | ||
|
|
0b81415efd | ||
|
|
6ff18a28cc | ||
|
|
dcc248aeef | ||
|
|
5b7635b54a | ||
|
|
24b9641de7 | ||
|
|
d2a9bdefc9 | ||
|
|
35e7c63e8b | ||
|
|
fd018d2f1a | ||
|
|
6aeff86eb7 | ||
|
|
53151cf9ac | ||
|
|
ca7574ff6f | ||
|
|
1b155f18db | ||
|
|
3708118613 | ||
|
|
3e685b82b4 | ||
|
|
2add6bb7cb | ||
|
|
b9037a9bc1 | ||
|
|
26b8c01dd0 | ||
|
|
b23e54713a | ||
|
|
6379af6307 |
||
|
|
d225d9d53e | ||
|
|
d4edddc39f | ||
|
|
ec7c5d35ff |
15 changed files with 1243 additions and 674 deletions
80
.gitignore
vendored
80
.gitignore
vendored
|
|
@ -61,3 +61,83 @@ gdalautotest-1.7.0.tar.gz
|
|||
/gdal-3.2.2-fedora.tar.xz
|
||||
/gdalautotest-3.3.0.tar.gz
|
||||
/gdal-3.3.0-fedora.tar.xz
|
||||
/gdal-3.3.1-fedora.tar.xz
|
||||
/gdalautotest-3.3.1.tar.gz
|
||||
/gdal-3.3.2-fedora.tar.xz
|
||||
/gdalautotest-3.3.2.tar.gz
|
||||
/gdal-3.3.3-fedora.tar.xz
|
||||
/gdalautotest-3.3.3.tar.gz
|
||||
/gdal-3.4.0-fedora.tar.xz
|
||||
/gdalautotest-3.4.0.tar.gz
|
||||
/gdal-3.4.1-fedora.tar.xz
|
||||
/gdalautotest-3.4.1.tar.gz
|
||||
/gdal-3.4.2-fedora.tar.xz
|
||||
/gdalautotest-3.4.2.tar.gz
|
||||
/gdal-3.4.3-fedora.tar.xz
|
||||
/gdalautotest-3.4.3.tar.gz
|
||||
/gdalautotest-3.5.0.tar.gz
|
||||
/gdal-3.5.0-fedora.tar.xz
|
||||
/gdalautotest-3.5.1.tar.gz
|
||||
/gdal-3.5.1-fedora.tar.xz
|
||||
/gdal-3.5.2-fedora.tar.xz
|
||||
/gdalautotest-3.5.2.tar.gz
|
||||
/gdal-3.5.3-fedora.tar.xz
|
||||
/gdalautotest-3.5.3.tar.gz
|
||||
/gdal-3.6.0-fedora.tar.xz
|
||||
/gdalautotest-3.6.0.tar.gz
|
||||
/gdalautotest-3.6.1.tar.gz
|
||||
/gdal-3.6.1.tar.xz
|
||||
/gdal-3.6.1-fedora.tar.xz
|
||||
/gdal-3.6.2-fedora.tar.xz
|
||||
/gdalautotest-3.6.2.tar.gz
|
||||
/gdal-3.6.3-fedora.tar.xz
|
||||
/gdalautotest-3.6.3.tar.gz
|
||||
/gdal-3.6.4-fedora.tar.xz
|
||||
/gdalautotest-3.6.4.tar.gz
|
||||
/gdal-3.7.0-fedora.tar.xz
|
||||
/gdalautotest-3.7.0.tar.gz
|
||||
/gdal-3.7.1-fedora.tar.xz
|
||||
/gdalautotest-3.7.1.tar.gz
|
||||
/gdal-3.7.2-fedora.tar.xz
|
||||
/gdalautotest-3.7.2.tar.gz
|
||||
/gdal-3.7.3-fedora.tar.xz
|
||||
/gdalautotest-3.7.3.tar.gz
|
||||
/gdal-3.8.0-fedora.tar.xz
|
||||
/gdalautotest-3.8.0.tar.gz
|
||||
/gdal-3.8.1-fedora.tar.xz
|
||||
/gdalautotest-3.8.1.tar.gz
|
||||
/gdal-3.8.2-fedora.tar.xz
|
||||
/gdalautotest-3.8.2.tar.gz
|
||||
/gdal-3.8.3-fedora.tar.xz
|
||||
/gdalautotest-3.8.3.tar.gz
|
||||
/gdal-3.8.4-fedora.tar.xz
|
||||
/gdalautotest-3.8.4.tar.gz
|
||||
/gdal-3.8.5-fedora.tar.xz
|
||||
/gdalautotest-3.8.5.tar.gz
|
||||
/gdal-3.9.0-fedora.tar.xz
|
||||
/gdalautotest-3.9.0.tar.gz
|
||||
/gdal-3.9.1-fedora.tar.xz
|
||||
/gdalautotest-3.9.1.tar.gz
|
||||
/gdal-3.9.2-fedora.tar.xz
|
||||
/gdalautotest-3.9.2.tar.gz
|
||||
/gdalautotest-3.9.3.tar.gz
|
||||
/gdal-3.9.3-fedora.tar.xz
|
||||
/gdal-3.10.0-fedora.tar.xz
|
||||
/gdalautotest-3.10.0.tar.gz
|
||||
/gdal-3.10.1-fedora.tar.xz
|
||||
/gdalautotest-3.10.1.tar.gz
|
||||
/gdal-3.10.2-fedora.tar.xz
|
||||
/gdalautotest-3.10.2.tar.gz
|
||||
/gdal-3.10.3-fedora.tar.xz
|
||||
/gdalautotest-3.10.3.tar.gz
|
||||
/gdal-3.11.3-fedora.tar.xz
|
||||
/gdalautotest-3.11.3.tar.gz
|
||||
/gdal-3.11.4-fedora.tar.xz
|
||||
/gdalautotest-3.11.4.tar.gz
|
||||
/gdal-3.11.5-fedora.tar.xz
|
||||
/gdalautotest-3.11.5.tar.gz
|
||||
/gdal-3.12.0-fedora.tar.xz
|
||||
/gdal-3.12.0.tar.xz
|
||||
/gdalautotest-3.12.0.zip
|
||||
/gdal-3.12.1-fedora.tar.xz
|
||||
/gdalautotest-3.12.1.zip
|
||||
|
|
|
|||
11
cpl-config.h
Normal file
11
cpl-config.h
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "gdal/cpl_config-32.h"
|
||||
#else
|
||||
#if __WORDSIZE == 64
|
||||
#include "gdal/cpl_config-64.h"
|
||||
#else
|
||||
#error "Unknown word size"
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -1,30 +1,38 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Usage: $0 version"
|
||||
echo "Usage: $0 version pre"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION="$1"
|
||||
PRE="$2"
|
||||
|
||||
wget https://github.com/OSGeo/gdal/releases/download/v$VERSION/gdal-$VERSION.tar.gz
|
||||
if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then
|
||||
wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz
|
||||
fi
|
||||
|
||||
tar xvf gdal-"${VERSION}".tar.gz
|
||||
if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
|
||||
echo "gdal-${VERSION} or gdal-${VERSION}-fedora in the way, please remove and rerun this script"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
||||
tar xvf gdal-"${VERSION}${PRE}".tar.xz
|
||||
mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora
|
||||
|
||||
rm data/cubewerx_extra.wkt
|
||||
rm data/esri_extra.wkt
|
||||
rm data/esri_Wisconsin_extra.wkt
|
||||
rm data/esri_StatePlane_extra.wkt
|
||||
rm data/ecw_cs.wkt
|
||||
rm ogr/data/cubewerx_extra.wkt
|
||||
rm ogr/data/esri_StatePlane_extra.wkt
|
||||
rm ogr/data/ecw_cs.wkt
|
||||
|
||||
#Really necessary?
|
||||
rm -r swig/php
|
||||
|
||||
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt||' ogr/CMakeLists.txt
|
||||
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt||' ogr/CMakeLists.txt
|
||||
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt||' ogr/CMakeLists.txt
|
||||
|
||||
popd
|
||||
|
||||
|
||||
#TODO: Insert Provenance file
|
||||
|
||||
tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
|
||||
tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora
|
||||
|
|
|
|||
11
gdal-config
Executable file
11
gdal-config
Executable file
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/bash
|
||||
|
||||
ARCH=$(uname -m)
|
||||
case $ARCH in
|
||||
x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
|
||||
gdal-config-64 ${*}
|
||||
;;
|
||||
*)
|
||||
gdal-config-32 ${*}
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.3.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
|
||||
--- gdal-3.3.0-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-04-26 14:31:00.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-05-03 17:18:20.482677217 +0200
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <limits>
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// CADVector
|
||||
diff -rupN --no-dereference gdal-3.3.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.3.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
|
||||
--- gdal-3.3.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-04-26 14:30:59.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-05-03 17:18:20.483677217 +0200
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <limits>
|
||||
|
||||
#if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
|
||||
// gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
|
||||
diff -rupN --no-dereference gdal-3.3.0-fedora/third_party/LercLib/Lerc2.h gdal-3.3.0-fedora-new/third_party/LercLib/Lerc2.h
|
||||
--- gdal-3.3.0-fedora/third_party/LercLib/Lerc2.h 2021-04-26 14:30:17.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/third_party/LercLib/Lerc2.h 2021-05-03 17:18:20.483677217 +0200
|
||||
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
|
||||
#include <limits>
|
||||
#include <string>
|
||||
#include <typeinfo>
|
||||
+#include <limits>
|
||||
#include "Defines.h"
|
||||
#include "BitMask.h"
|
||||
#include "BitStuffer2.h"
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/apps/GNUmakefile gdal-3.3.0-fedora-new/apps/GNUmakefile
|
||||
--- gdal-3.3.0-fedora/apps/GNUmakefile 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/apps/GNUmakefile 2021-05-03 17:18:20.058677207 +0200
|
||||
@@ -233,6 +233,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 --no-dereference gdal-3.3.0-fedora/frmts/iso8211/GNUmakefile gdal-3.3.0-fedora-new/frmts/iso8211/GNUmakefile
|
||||
--- gdal-3.3.0-fedora/frmts/iso8211/GNUmakefile 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/frmts/iso8211/GNUmakefile 2021-05-03 17:18:19.611677197 +0200
|
||||
@@ -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)
|
||||
112
gdal_java.patch
112
gdal_java.patch
|
|
@ -1,112 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/swig/java/java.opt gdal-3.3.0-fedora-new/swig/java/java.opt
|
||||
--- gdal-3.3.0-fedora/swig/java/java.opt 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/swig/java/java.opt 2021-05-03 17:18:19.173677188 +0200
|
||||
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
|
||||
JAVAC=$(JAVA_HOME)/bin/javac
|
||||
JAVA=$(JAVA_HOME)/bin/java
|
||||
JAR=$(JAVA_HOME)/bin/jar
|
||||
-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
||||
+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux
|
||||
|
||||
|
||||
diff -rupN gdal-3.3.0-fedora/swig/java/add_javadoc.c gdal-3.3.0-fedora-new/swig/java/add_javadoc.c
|
||||
--- gdal-3.3.0-fedora/swig/java/add_javadoc.c 2021-04-26 14:29:58.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/swig/java/add_javadoc.c 2021-05-04 00:54:09.480133336 +0200
|
||||
@@ -133,22 +133,22 @@ int main(int argc, char* argv[])
|
||||
FILE* fDst;
|
||||
JavaDocInstance* instances = (JavaDocInstance*)calloc(sizeof(JavaDocInstance), 3000);
|
||||
int nInstances = 0;
|
||||
- char szLine[256];
|
||||
- char szClass[256];
|
||||
+ char szLine[512];
|
||||
+ char szClass[512];
|
||||
char javadoc[16384];
|
||||
szClass[0] = 0;
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
if (strstr(szLine, "/**") == NULL) continue;
|
||||
begin:
|
||||
strcpy(javadoc, szLine);
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
strcat(javadoc, szLine);
|
||||
if (strstr(szLine, "*/"))
|
||||
break;
|
||||
}
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
if (szLine[0] == 10)
|
||||
continue;
|
||||
@@ -188,10 +188,10 @@ begin:
|
||||
fDst = fopen(szDstName, "wt");
|
||||
if (fDst == NULL) continue;
|
||||
szClass[0] = 0;
|
||||
- char szPackage[256];
|
||||
+ char szPackage[512];
|
||||
szPackage[0] = 0;
|
||||
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
char szMethodName[1024];
|
||||
char* szOriLine = strdup(szLine);
|
||||
@@ -224,8 +224,10 @@ begin:
|
||||
if (strstr(szLine, "synchronized "))
|
||||
{
|
||||
char* c = strstr(szLine, "synchronized ");
|
||||
+ char rest[512];
|
||||
+ strcpy(rest, c + 13);
|
||||
*c = 0;
|
||||
- strcat(szLine, c + 13);
|
||||
+ strcat(szLine, rest);
|
||||
}
|
||||
if (strstr(szLine, "public") && !strstr(szLine, "native"))
|
||||
{
|
||||
@@ -234,7 +236,7 @@ begin:
|
||||
strcpy(szMethodName, szLine);
|
||||
do
|
||||
{
|
||||
- fgets(szLine, 255, fSrc);
|
||||
+ fgets(szLine, 511, fSrc);
|
||||
strcpy(szMethodName + strlen(szMethodName) - 1, szLine);
|
||||
} while (!strchr(szMethodName,')'));
|
||||
strcpy(szLine, szMethodName);
|
||||
@@ -261,7 +263,7 @@ begin:
|
||||
{
|
||||
do
|
||||
{
|
||||
- fgets(szLine, 255, fSrc);
|
||||
+ fgets(szLine, 511, fSrc);
|
||||
} while (!strchr(szLine,'}'));
|
||||
}
|
||||
break;
|
||||
@@ -289,7 +291,7 @@ begin:
|
||||
nBrackets --;
|
||||
}
|
||||
}
|
||||
- fgets(szLine, 255, fSrc);
|
||||
+ fgets(szLine, 511, fSrc);
|
||||
} while(bFoundOpen == FALSE || nBrackets > 0);
|
||||
}
|
||||
else
|
||||
diff -rupN gdal-3.3.0-fedora/swig/java/javadoc.java gdal-3.3.0-fedora-new/swig/java/javadoc.java
|
||||
--- gdal-3.3.0-fedora/swig/java/javadoc.java 2021-04-26 14:29:59.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/swig/java/javadoc.java 2021-05-05 09:08:14.992037179 +0200
|
||||
@@ -11982,12 +11982,12 @@ public interface osrConstants:public fin
|
||||
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM
|
||||
|
||||
/**
|
||||
- * Invalid input coordinate. e.g a latitude > 90°.
|
||||
+ * Invalid input coordinate. e.g a latitude > 90 deg.
|
||||
*/
|
||||
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_INVALID_COORD
|
||||
|
||||
/**
|
||||
- * Coordinate is outside of the projection domain. e.g approximate mercator with \|longitude - lon_0\| > 90°,
|
||||
+ * Coordinate is outside of the projection domain. e.g approximate mercator with \|longitude - lon_0\| > 90 deg,
|
||||
* or iterative convergence method failed.
|
||||
*/
|
||||
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/configure.ac gdal-3.3.0-fedora-new/configure.ac
|
||||
--- gdal-3.3.0-fedora/configure.ac 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/configure.ac 2021-05-03 17:18:20.692677222 +0200
|
||||
@@ -64,7 +64,7 @@ dnl warning #2304: non-explicit construc
|
||||
dnl warning #3280: declaration hides member
|
||||
dnl remark #11074: Inlining inhibited by limit max-size
|
||||
dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
|
||||
-AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
+#AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
|
||||
AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/doc/source/index.rst gdal-3.3.0-fedora-new/doc/source/index.rst
|
||||
--- gdal-3.3.0-fedora/doc/source/index.rst 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/doc/source/index.rst 2021-05-03 17:18:20.270677212 +0200
|
||||
@@ -4,8 +4,6 @@ GDAL
|
||||
|
||||
.. include:: ./about_no_title.rst
|
||||
|
||||
-This documentation is also available as a `PDF file <gdal.pdf>`_.
|
||||
-
|
||||
.. toctree::
|
||||
:maxdepth: 2
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/doc/Makefile gdal-3.3.0-fedora-new/doc/Makefile
|
||||
--- gdal-3.3.0-fedora/doc/Makefile 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/doc/Makefile 2021-05-03 17:18:19.833677202 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
|
||||
# You can set these variables from the command line.
|
||||
-SPHINXOPTS ?= --keep-going -j auto -W
|
||||
+SPHINXOPTS ?= --keep-going
|
||||
SPHINXBUILD = sphinx-build
|
||||
SOURCEDIR = source
|
||||
BUILDDIR = build
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.0-fedora/frmts/dods/GNUmakefile gdal-3.3.0-fedora-new/frmts/dods/GNUmakefile
|
||||
--- gdal-3.3.0-fedora/frmts/dods/GNUmakefile 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/frmts/dods/GNUmakefile 2021-05-03 17:18:19.398677193 +0200
|
||||
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
|
||||
|
||||
OBJ = dodsdataset2.o
|
||||
|
||||
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC)
|
||||
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -I/usr/include/tirpc
|
||||
|
||||
default: $(OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
diff -rupN --no-dereference gdal-3.3.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.3.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
||||
--- gdal-3.3.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-04-26 14:29:56.000000000 +0200
|
||||
+++ gdal-3.3.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-05-03 17:18:19.398677193 +0200
|
||||
@@ -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) $(LIBXML2_INC) -DDO_NOT_USE_DEBUG_BOOL
|
||||
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
|
||||
|
||||
default: $(O_OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
37
gdal_utils.patch
Normal file
37
gdal_utils.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||
--- gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100
|
||||
+++ gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-12-18 16:35:42.369730740 +0100
|
||||
@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P
|
||||
gdal_standard_includes(gdal_iso8211)
|
||||
|
||||
# Because linking an OBJECT library
|
||||
-add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp)
|
||||
+add_executable(8211dump 8211dump.cpp)
|
||||
target_include_directories(8211dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
|
||||
target_link_libraries(8211dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
|
||||
+install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
-add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp)
|
||||
+add_executable(8211view 8211view.cpp)
|
||||
target_include_directories(8211view PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
|
||||
target_link_libraries(8211view PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
|
||||
+install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
-add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp)
|
||||
+add_executable(8211createfromxml 8211createfromxml.cpp)
|
||||
target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
|
||||
target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
|
||||
+install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||
--- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100
|
||||
+++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 16:35:42.369966573 +0100
|
||||
@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
|
||||
target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
|
||||
endif()
|
||||
|
||||
-add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
|
||||
+add_executable(s57dump s57dump.cpp)
|
||||
gdal_standard_includes(s57dump)
|
||||
target_include_directories(s57dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
|
||||
target_link_libraries(s57dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> ogr_S57 gdal_iso8211)
|
||||
+install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdalautotest-3.3.0.tar.gz) = facd8ec0c0743240d6bbdd271ef659182c9d38857a71e2abe153019e27f4adad94f759f007a31472941487ed2d3f588a10412e955f9bd99ea25da2dc97a8924d
|
||||
SHA512 (gdal-3.3.0-fedora.tar.xz) = ce83c49740f333be17fa9e2287f2c24b79eed67c63fcf975eeda0340010f90b89085d4ee4e30da0105ddc53a2ac19eefaa89879dd27c33706a47546e9350e7ba
|
||||
SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
|
||||
SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue