Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
449f8bcdbb |
38
.gitignore
vendored
38
.gitignore
vendored
@ -5,41 +5,3 @@ gdalautotest-1.7.0.tar.gz
|
||||
/gdal-1.9.0-fedora.tar.gz
|
||||
/gdalautotest-1.9.0.tar.gz
|
||||
/gdal-1.9.1-fedora.tar.gz
|
||||
/gdal-1.9.2-fedora.tar.gz
|
||||
/gdal-1.10.0-fedora.tar.gz
|
||||
/gdal-1.10.1-fedora.tar.xz
|
||||
/gdalautotest-1.10.1.tar.gz
|
||||
/gdal-1.11.0-fedora.tar.xz
|
||||
/gdalautotest-1.11.0.tar.gz
|
||||
/gdal-1.11.1-fedora.tar.xz
|
||||
/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
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
gdal-1.9.1.tar.gz re-pack for Fedora
|
||||
|
||||
All files with pending legal questions are stripped from the original tarball,
|
||||
to form this tarball. Legal information is mainly from PROVENANCE.TXT
|
||||
|
||||
|
||||
No files are manipulated.
|
||||
|
||||
Please see the cleaning script clean-gdal.sh!
|
||||
|
||||
This leaves GDAL short of a few formats, coordinate systems and the PHP bindings.
|
||||
|
||||
Volker Fröhlich <volker27@gmx.at>
|
||||
|
||||
* updated to 1.9.1 by Volker Fröhlich <volker27@gmx.at>
|
||||
* updated to 1.9.0 by Volker Fröhlich <volker27@gmx.at>
|
||||
* updated to 1.7.3 by Viji V Nair <viji@fedoraproject.org>
|
||||
* updated to 1.7.2 by Sven Lankes <sven@lank.es>
|
||||
* updated to 1.7.1 by Balint Crisitan <cristian.balint@gmail.com>
|
||||
* updated to 1.6.1 by Dan Horak <dan@danny.cz>
|
||||
|
||||
|
||||
Removed files:
|
||||
========================================
|
||||
# due to uncertain license issues
|
||||
and derivative copy from ESRI (TM) and CubeWerx (TM):
|
||||
|
||||
data/cubewerx_extra.wkt
|
||||
data/esri_extra.wkt
|
||||
data/ecw_cs.wkt
|
||||
|
||||
Removed folders plus its contents:
|
||||
========================================
|
||||
# due to uncertain license issues these formats
|
||||
are removed and not suported in fedora pack:
|
||||
|
||||
frmts/bsb <-- http://www.osgeo.org/pipermail/gdal-dev/2003-September/001097.html
|
||||
swig/php <-- PHP license, incompatible mixture
|
||||
@ -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
|
||||
|
||||
11
gdal-1.9.0-man.patch
Normal file
11
gdal-1.9.0-man.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -Nur gdal-1.9.0-fedora/GNUmakefile gdal-1.9.0-fedora-man/GNUmakefile
|
||||
--- gdal-1.9.0-fedora/GNUmakefile 2012-01-04 08:03:42.000000000 +0100
|
||||
+++ gdal-1.9.0-fedora-man/GNUmakefile 2012-02-22 17:29:07.565112215 +0100
|
||||
@@ -129,6 +129,7 @@
|
||||
cp frmts/wms/frmt_wms_*.xml html
|
||||
cp frmts/wms/frmt_twms_*.xml html
|
||||
|
||||
+.PHONY: man
|
||||
man:
|
||||
# Generate man pages
|
||||
(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
|
||||
14
gdal-1.9.1-dods-3.11.3.patch
Normal file
14
gdal-1.9.1-dods-3.11.3.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -Nur gdal-1.9.1-fedora/configure gdal-1.9.1-fedora-dods3.11.3/configure
|
||||
--- gdal-1.9.1-fedora/configure 2012-05-17 05:30:56.000000000 +0200
|
||||
+++ gdal-1.9.1-fedora-dods3.11.3/configure 2012-05-20 10:47:10.032831845 +0200
|
||||
@@ -24320,8 +24320,8 @@
|
||||
as_fn_error $? "--with-dods-root requires path to dods root as argument" "$LINENO" 5
|
||||
else
|
||||
DODS_LIB=$with_dods_root/lib
|
||||
- DODS_INC="-I$with_dods_root/include -I$with_dods_root/include/libdap -I$with_dods_root/include/dap"
|
||||
DODS_BIN=$with_dods_root/bin
|
||||
+ DODS_INC="-I$with_dods_root/include -I$with_dods_root/include/libdap -I$with_dods_root/include/dap `$DODS_BIN/xml2-config --cflags`"
|
||||
|
||||
rm -f islibdappost310.*
|
||||
echo '#include "Connect.h"' > islibdappost310.cpp
|
||||
Binary files gdal-1.9.1-fedora/.configure.swp and gdal-1.9.1-fedora-dods3.11.3/.configure.swp differ
|
||||
29
gdal-1.9.1-java-swig.patch
Normal file
29
gdal-1.9.1-java-swig.patch
Normal file
@ -0,0 +1,29 @@
|
||||
Index: /branches/1.9/gdal/swig/include/XMLNode.i
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/swig/include/XMLNode.i (revision 19751)
|
||||
+++ /branches/1.9/gdal/swig/include/XMLNode.i (revision 24440)
|
||||
@@ -38,16 +38,16 @@
|
||||
} CPLXMLNodeType;
|
||||
|
||||
-%rename (XMLNode) _CPLXMLNode;
|
||||
-%rename (Type) _CPLXMLNode::eType;
|
||||
-%rename (Value) _CPLXMLNode::pszValue;
|
||||
-%rename (Next) _CPLXMLNode::psNext;
|
||||
-%rename (Child) _CPLXMLNode::psChild;
|
||||
-typedef struct _CPLXMLNode
|
||||
+%rename (XMLNode) CPLXMLNode;
|
||||
+%rename (Type) CPLXMLNode::eType;
|
||||
+%rename (Value) CPLXMLNode::pszValue;
|
||||
+%rename (Next) CPLXMLNode::psNext;
|
||||
+%rename (Child) CPLXMLNode::psChild;
|
||||
+typedef struct CPLXMLNode
|
||||
{
|
||||
%immutable;
|
||||
CPLXMLNodeType eType;
|
||||
char *pszValue;
|
||||
- struct _CPLXMLNode *psNext;
|
||||
- struct _CPLXMLNode *psChild;
|
||||
+ struct CPLXMLNode *psNext;
|
||||
+ struct CPLXMLNode *psChild;
|
||||
%mutable;
|
||||
} CPLXMLNode;
|
||||
187
gdal-1.9.1-poppler020.patch
Normal file
187
gdal-1.9.1-poppler020.patch
Normal file
@ -0,0 +1,187 @@
|
||||
Index: /branches/1.9/gdal/configure
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/configure (revision 24333)
|
||||
+++ /branches/1.9/gdal/configure (revision 24437)
|
||||
@@ -639,4 +639,5 @@
|
||||
HAVE_PODOFO
|
||||
POPPLER_INC
|
||||
+POPPLER_0_20_OR_LATER
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS
|
||||
POPPLER_HAS_OPTCONTENT
|
||||
@@ -26470,4 +26471,5 @@
|
||||
POPPLER_HAS_OPTCONTENT=no
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
|
||||
+POPPLER_0_20_OR_LATER=no
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
|
||||
@@ -26536,4 +26538,20 @@
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
+
|
||||
+ # And now we check if we have Poppler >= 0.20.0
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Poppler >= 0.20.0" >&5
|
||||
+$as_echo_n "checking if we have Poppler >= 0.20.0... " >&6; }
|
||||
+ rm -f testpoppler.*
|
||||
+ echo '#include <poppler/Error.h>' > testpoppler.cpp
|
||||
+ echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp
|
||||
+ if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
|
||||
+ POPPLER_0_20_OR_LATER=yes
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ fi
|
||||
+
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
@@ -26556,4 +26574,6 @@
|
||||
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS=$POPPLER_BASE_STREAM_HAS_TWO_ARGS
|
||||
+
|
||||
+POPPLER_0_20_OR_LATER=$POPPLER_0_20_OR_LATER
|
||||
|
||||
POPPLER_INC=$POPPLER_INC
|
||||
Index: /branches/1.9/gdal/nmake.opt
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/nmake.opt (revision 23610)
|
||||
+++ /branches/1.9/gdal/nmake.opt (revision 24437)
|
||||
@@ -469,8 +469,10 @@
|
||||
# Uncomment for PDF support
|
||||
# Uncomment POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES for Poppler >= 0.16.0
|
||||
+# Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
|
||||
#POPPLER_ENABLED = YES
|
||||
#POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
|
||||
#POPPLER_HAS_OPTCONTENT = YES
|
||||
#POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES
|
||||
+#POPPLER_0_20_OR_LATER = YES
|
||||
#POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
|
||||
|
||||
Index: /branches/1.9/gdal/configure.in
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/configure.in (revision 24333)
|
||||
+++ /branches/1.9/gdal/configure.in (revision 24437)
|
||||
@@ -2941,4 +2941,5 @@
|
||||
POPPLER_HAS_OPTCONTENT=no
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
|
||||
+POPPLER_0_20_OR_LATER=no
|
||||
|
||||
AC_MSG_CHECKING([for poppler])
|
||||
@@ -3000,4 +3001,17 @@
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
+
|
||||
+ # And now we check if we have Poppler >= 0.20.0
|
||||
+ AC_MSG_CHECKING([if we have Poppler >= 0.20.0])
|
||||
+ rm -f testpoppler.*
|
||||
+ echo '#include <poppler/Error.h>' > testpoppler.cpp
|
||||
+ echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp
|
||||
+ if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
|
||||
+ POPPLER_0_20_OR_LATER=yes
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ else
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ fi
|
||||
+
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
@@ -3015,4 +3029,5 @@
|
||||
AC_SUBST(POPPLER_HAS_OPTCONTENT, $POPPLER_HAS_OPTCONTENT)
|
||||
AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
|
||||
+AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
|
||||
AC_SUBST(POPPLER_INC, $POPPLER_INC)
|
||||
|
||||
Index: /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp (revision 23986)
|
||||
+++ /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp (revision 24437)
|
||||
@@ -327,5 +327,9 @@
|
||||
poSplashOut = new SplashOutputDev(splashModeRGB8, 4, gFalse, sColor);
|
||||
PDFDoc* poDoc = poGDS->poDoc;
|
||||
+#ifdef POPPLER_0_20_OR_LATER
|
||||
+ poSplashOut->startDoc(poDoc);
|
||||
+#else
|
||||
poSplashOut->startDoc(poDoc->getXRef());
|
||||
+#endif
|
||||
double dfDPI = poGDS->dfDPI;
|
||||
|
||||
@@ -518,4 +522,19 @@
|
||||
|
||||
#ifdef USE_POPPLER
|
||||
+#ifdef POPPLER_0_20_OR_LATER
|
||||
+static void PDFDatasetErrorFunction(void* userData, ErrorCategory eErrCatagory, int nPos, char *pszMsg)
|
||||
+{
|
||||
+ CPLString osError;
|
||||
+
|
||||
+ if (nPos >= 0)
|
||||
+ osError.Printf("Pos = %d, ", nPos);
|
||||
+ osError += pszMsg;
|
||||
+
|
||||
+ if (strcmp(osError.c_str(), "Incorrect password") == 0)
|
||||
+ return;
|
||||
+
|
||||
+ CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
|
||||
+}
|
||||
+#else
|
||||
static void PDFDatasetErrorFunction(int nPos, char *pszMsg, va_list args)
|
||||
{
|
||||
@@ -531,4 +550,5 @@
|
||||
CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
|
||||
}
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
@@ -567,5 +587,9 @@
|
||||
|
||||
/* Set custom error handler for poppler errors */
|
||||
+#ifdef POPPLER_0_20_OR_LATER
|
||||
+ setErrorCallback(PDFDatasetErrorFunction, NULL);
|
||||
+#else
|
||||
setErrorFunction(PDFDatasetErrorFunction);
|
||||
+#endif
|
||||
|
||||
/* poppler global variable */
|
||||
Index: /branches/1.9/gdal/frmts/pdf/makefile.vc
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/frmts/pdf/makefile.vc (revision 22493)
|
||||
+++ /branches/1.9/gdal/frmts/pdf/makefile.vc (revision 24437)
|
||||
@@ -7,5 +7,5 @@
|
||||
|
||||
!IFDEF POPPLER_ENABLED
|
||||
-EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) -DUSE_POPPLER
|
||||
+EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) -DUSE_POPPLER
|
||||
|
||||
!IFDEF POPPLER_HAS_OPTCONTENT
|
||||
@@ -15,4 +15,8 @@
|
||||
!IFDEF POPPLER_BASE_STREAM_HAS_TWO_ARGS
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS = -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS
|
||||
+!ENDIF
|
||||
+
|
||||
+!IFDEF POPPLER_0_20_OR_LATER
|
||||
+POPPLER_0_20_OR_LATER_FLAGS = -DPOPPLER_0_20_OR_LATER
|
||||
!ENDIF
|
||||
|
||||
Index: /branches/1.9/gdal/frmts/pdf/GNUmakefile
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/frmts/pdf/GNUmakefile (revision 22491)
|
||||
+++ /branches/1.9/gdal/frmts/pdf/GNUmakefile (revision 24437)
|
||||
@@ -16,4 +16,9 @@
|
||||
endif
|
||||
|
||||
+ifeq ($(POPPLER_0_20_OR_LATER),yes)
|
||||
+CPPFLAGS += -DPOPPLER_0_20_OR_LATER
|
||||
+endif
|
||||
+
|
||||
+
|
||||
CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(POPPLER_INC) $(PODOFO_INC)
|
||||
|
||||
Index: /branches/1.9/gdal/GDALmake.opt.in
|
||||
===================================================================
|
||||
--- /branches/1.9/gdal/GDALmake.opt.in (revision 24419)
|
||||
+++ /branches/1.9/gdal/GDALmake.opt.in (revision 24437)
|
||||
@@ -386,4 +386,5 @@
|
||||
POPPLER_HAS_OPTCONTENT = @POPPLER_HAS_OPTCONTENT@
|
||||
POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
|
||||
+POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
|
||||
POPPLER_INC = @POPPLER_INC@
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
#!/bin/bash
|
||||
VERSION="3.0.4"
|
||||
# Volker Fröhlich
|
||||
VERSION="1.9.1"
|
||||
|
||||
tar xvf gdal-"${VERSION}".tar.xz
|
||||
tar xvfz gdal-"${VERSION}".tar.gz
|
||||
|
||||
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
||||
|
||||
@ -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
|
||||
|
||||
@ -19,4 +22,4 @@ popd
|
||||
|
||||
#TODO: Insert Provenance file
|
||||
|
||||
tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
|
||||
tar cvfz gdal-"${VERSION}"-fedora.tar.gz gdal-"${VERSION}"-fedora
|
||||
|
||||
@ -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
|
||||
67
gdal-g2clib.patch
Normal file
67
gdal-g2clib.patch
Normal file
@ -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
|
||||
6
gdal.pom
Normal file
6
gdal.pom
Normal file
@ -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
|
||||
45d1a1853a612af71e1dd2dc7232a49a gdal-1.9.1-fedora.tar.gz
|
||||
0d1e425b45465f64f6d1f32790d8bea0 gdalautotest-1.9.0.tar.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user