rpm/gdal
SHA256
1
0
Fork 0
forked from pool/gdal
Code Pull Requests Activity

Accepting request 814850 from home:Guillaume_G:branches:Application:Geo

Browse Source 
- Add _constraints to avoid build failure
- Fix docs and man builds for Tumbleweed with upstream patch:
  * gdal-fix-docs.patch
- Disable docs/man on Leap - https://github.com/OSGeo/gdal/issues/2690
- Update to 3.1.0:
  * New binaries: gdal_viewshed gdalmdiminfo gdalmdimtranslate
  * full changelog:
    https://github.com/OSGeo/gdal/blob/v3.1.0/gdal/NEWS
- Refresh patch:
  * GDALmake.opt.in.patch
- Drop upstream patches:
 * gdal-ecwjp2-sdk-5.5_dep1.patch
 * gdal-ecwjp2-sdk-5.5.patch

OBS-URL: https://build.opensuse.org/request/show/814850
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=116
This commit is contained in:
Bruno Friedmann 2020-06-16 09:27:49 +00:00 committed by Git OBS Bridge
parent ec5971c638
commit a169076b3c
11 changed files with 513 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GDALmake.opt.in.patch
View File

@ -1,9 +1,8 @@
diff -rup a/GDALmake.opt.in b/GDALmake.opt.in --- a/GDALmake.opt.in 2020-05-25 15:09:29.892069150 +0200
--- a/GDALmake.opt.in 2018-09-21 11:01:50.000000000 +0200 +++ b/GDALmake.opt.in 2020-05-25 15:09:54.164285244 +0200
+++ b/GDALmake.opt.in 2018-09-29 15:21:42.993179662 +0200 @@ -74,7 +74,7 @@ INST_DOCS = @htmldir@
@@ -67,7 +67,7 @@ INST_DOCS = @exec_prefix@/doc
INST_MAN = @mandir@ INST_MAN = @mandir@
INST_HTML = $(HOME)/www/gdal INST_WEB = $(HOME)/www/gdal
-CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION -CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
+CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION +CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION

10
_constraints Normal file
View File

@ -0,0 +1,10 @@
<constraints>
<hardware>
<memory>
<size unit="G">3</size>
</memory>
<disk>
<size unit="G">5</size>
</disk>
</hardware>
</constraints>

3
gdal-3.0.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
size 8696684

1
gdal-3.0.4.tar.xz.md5
View File

@ -1 +0,0 @@
8996bbee51e73b5a968d8d0f48895ac8 gdal-3.0.4.tar.xz

3
gdal-3.1.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda
size 12076312

1
gdal-3.1.0.tar.xz.md5 Normal file
View File

@ -0,0 +1 @@
fe29a41d5813263fc33c1f9130f73e01 gdal-3.1.0.tar.xz

775
gdal-ecwjp2-sdk-5.5.patch
View File

@ -1,775 +0,0 @@
From e5cb5406ea9090b2f17cffeeb7ba5fb49e7158f2 Mon Sep 17 00:00:00 2001
From: Chris Tapley <chris.tapley.81@gmail.com>
Date: Tue, 15 Oct 2019 17:19:14 +0800
Subject: [PATCH] ecwjp2 sdk 5.5 changes
- implementation for API breaking changes.
- handle "newabi" rename to "cpp11abi" in configure and configure.ac
- example information in nmake.opt
---
gdal/configure | 34 +++++---
gdal/configure.ac | 30 ++++---
gdal/frmts/ecw/ecwcreatecopy.cpp | 17 ++--
gdal/frmts/ecw/ecwdataset.cpp | 133 ++++++++++++++++---------------
gdal/frmts/ecw/gdal_ecw.h | 37 +++++----
gdal/frmts/ecw/jp2userbox.cpp | 21 +++--
gdal/nmake.opt | 35 ++++++--
7 files changed, 185 insertions(+), 122 deletions(-)
diff --git a/gdal/configure b/gdal/configure
index 40d038394ed..fd2e3f6c12f 100755
--- a/gdal/configure
+++ b/gdal/configure
@@ -33205,18 +33205,23 @@ $as_echo "found libecwj2 in $with_ecw/lib." >&6; }
# ECW SDK 5.0 style and also for the case where license type is included in path i.e. specific license type is requested.
elif test -r $with_ecw/lib/$ECW_ARCH/$ECW_CONF/libNCSEcw.a ; then
- # Test if we must use the newabi version (SDK 5.4)
- if test -r $with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ # Test if we must use the newabi/cpp11abi version (SDK 5.4+)
+ if test -r $with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a || test -r $with_ecw/lib/cpp11abi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ if test -d $with_ecw/lib/newabi; then
+ ECW_ABIDIR=newabi
+ else
+ ECW_ABIDIR=cpp11abi
+ fi
echo "#include <string>" > testnewabi.cpp
echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp
echo "int main() { return static_cast<int>(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp
- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
- ECW_LIBDIR=$with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF
+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
+ ECW_LIBDIR=$with_ecw/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF
ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA"
with_ecw=$with_ecw/$ecw_license_type
ECW_54="yes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Intergraph 5.4+ SDK with newabi in ${ECW_LIBDIR}." >&5
-$as_echo "found Intergraph 5.4+ SDK with newabi in ${ECW_LIBDIR}." >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Intergraph 5.4+ SDK with ${ECW_ABIDIR} in ${ECW_LIBDIR}." >&5
+$as_echo "found Intergraph 5.4+ SDK with ${ECW_ABIDIR} in ${ECW_LIBDIR}." >&6; }
rm -f testnewabi.*
rm -f testnewabi
break
@@ -33234,17 +33239,22 @@ $as_echo "found Intergraph 5.x+ SDK in ${ECW_LIBDIR}." >&6; }
elif test -d $with_ecw; then
for ecw_license_type in "Desktop_Read-Write" "Server_Read-Only_EndUser" "Server_Read-Only" "Server_Read-Write" "Desktop_Read-Only"
do
- # Test if we must use the newabi version (SDK 5.4)
- if test -r $with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ # Test if we must use the newabi/cpp11abi version (SDK 5.4+)
+ if test -r $with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a || test -r $with_ecw/$ecw_license_type/lib/cpp11abi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ if test -d $with_ecw/lib/newabi; then
+ ECW_ABIDIR=newabi
+ else
+ ECW_ABIDIR=cpp11abi
+ fi
echo "#include <string>" > testnewabi.cpp
echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp
echo "int main() { return static_cast<int>(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp
- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
- ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF
+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
+ ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF
ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA"
with_ecw=$with_ecw/$ecw_license_type
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Intergraph 5.4+ SDK with newabi in ${ECW_LIBDIR}." >&5
-$as_echo "found Intergraph 5.4+ SDK with newabi in ${ECW_LIBDIR}." >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Intergraph 5.4+ SDK with ${ECW_ABIDIR} in ${ECW_LIBDIR}." >&5
+$as_echo "found Intergraph 5.4+ SDK with ${ECW_ABIDIR} in ${ECW_LIBDIR}." >&6; }
ECW_54="yes"
rm -f testnewabi.*
rm -f testnewabi
diff --git a/gdal/configure.ac b/gdal/configure.ac
index ce2618cd0fe..c46efad2543 100644
--- a/gdal/configure.ac
+++ b/gdal/configure.ac
@@ -3244,17 +3244,22 @@ else
# ECW SDK 5.0 style and also for the case where license type is included in path i.e. specific license type is requested.
elif test -r $with_ecw/lib/$ECW_ARCH/$ECW_CONF/libNCSEcw.a ; then
- # Test if we must use the newabi version (SDK 5.4)
- if test -r $with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ # Test if we must use the newabi/cpp11abi version (SDK 5.4+)
+ if test -r $with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a || test -r $with_ecw/lib/cpp11abi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ if test -d $with_ecw/lib/newabi; then
+ ECW_ABIDIR=newabi
+ else
+ ECW_ABIDIR=cpp11abi
+ fi
echo "#include <string>" > testnewabi.cpp
echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp
echo "int main() { return static_cast<int>(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp
- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
- ECW_LIBDIR=$with_ecw/lib/newabi/$ECW_ARCH/$ECW_CONF
+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
+ ECW_LIBDIR=$with_ecw/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF
ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA"
with_ecw=$with_ecw/$ecw_license_type
ECW_54="yes"
- AC_MSG_RESULT([found Intergraph 5.4+ SDK with newabi in ${ECW_LIBDIR}.])
+ AC_MSG_RESULT([found Intergraph 5.4+ SDK with ${ECW_ABIDIR} in ${ECW_LIBDIR}.])
rm -f testnewabi.*
rm -f testnewabi
break
@@ -3271,16 +3276,21 @@ else
elif test -d $with_ecw; then
for ecw_license_type in "Desktop_Read-Write" "Server_Read-Only_EndUser" "Server_Read-Only" "Server_Read-Write" "Desktop_Read-Only"
do
- # Test if we must use the newabi version (SDK 5.4)
- if test -r $with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ # Test if we must use the newabi/cpp11abi version (SDK 5.4+)
+ if test -r $with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a || test -r $with_ecw/$ecw_license_type/lib/cpp11abi/$ECW_ARCH/$ECW_CONF/libNCSEcw.a; then
+ if test -d $with_ecw/lib/newabi; then
+ ECW_ABIDIR=newabi
+ else
+ ECW_ABIDIR=cpp11abi
+ fi
echo "#include <string>" > testnewabi.cpp
echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp
echo "int main() { return static_cast<int>(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp
- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
- ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF
+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
+ ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/$ECW_ABIDIR/$ECW_ARCH/$ECW_CONF
ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA"
with_ecw=$with_ecw/$ecw_license_type
- AC_MSG_RESULT([found Intergraph 5.4+ SDK with newabi in ${ECW_LIBDIR}.])
+ AC_MSG_RESULT([found Intergraph 5.4+ SDK with ${ECW_ABIDIR} in ${ECW_LIBDIR}.])
ECW_54="yes"
rm -f testnewabi.*
rm -f testnewabi
diff --git a/gdal/frmts/ecw/ecwcreatecopy.cpp b/gdal/frmts/ecw/ecwcreatecopy.cpp
index b17592720cb..97f8f45f7ff 100644
--- a/gdal/frmts/ecw/ecwcreatecopy.cpp
+++ b/gdal/frmts/ecw/ecwcreatecopy.cpp
@@ -115,7 +115,7 @@ class GDALECWCompressor final: public CNCSFile {
GDALDataset *m_poSrcDS;
- VSIIOStream m_OStream;
+ std::shared_ptr<VSIIOStream> m_OStream;
int m_nPercentComplete;
int m_bCancelled;
@@ -143,7 +143,7 @@ class GDALECWCompressor final: public CNCSFile {
/************************************************************************/
GDALECWCompressor::GDALECWCompressor() :
- eWorkDT(GDT_Unknown)
+ m_OStream(std::make_shared<VSIIOStream>()), eWorkDT(GDT_Unknown)
{
m_poSrcDS = nullptr;
m_nPercentComplete = -1;
@@ -186,7 +186,7 @@ CPLErr GDALECWCompressor::CloseDown()
{
Close( true );
- m_OStream.Close();
+ m_OStream->Close();
return CE_None;
}
@@ -1008,7 +1008,7 @@ CPLErr GDALECWCompressor::Initialize(
return CE_Failure;
}
- m_OStream.Access( fpVSIL, TRUE, (BOOLEAN) bSeekable, pszFilename,
+ m_OStream->Access( fpVSIL, TRUE, (BOOLEAN) bSeekable, pszFilename,
0, -1 );
}
else
@@ -1114,8 +1114,13 @@ CPLErr GDALECWCompressor::Initialize(
oError = GetCNCSError(Open( (char *) pszFilename, false, true ));
}
}
- else
- oError = CNCSJP2FileView::Open( &(m_OStream) );
+ else {
+#if ECWSDK_VERSION>=55
+ oError = CNCSJP2FileView::Open(m_OStream);
+#else
+ oError = CNCSJP2FileView::Open(m_OStream.get());
+#endif
+ }
}
if( oError.GetErrorNumber() == NCS_SUCCESS )
diff --git a/gdal/frmts/ecw/ecwdataset.cpp b/gdal/frmts/ecw/ecwdataset.cpp
index 6ef14bd27d9..c2fbd4f3663 100644
--- a/gdal/frmts/ecw/ecwdataset.cpp
+++ b/gdal/frmts/ecw/ecwdataset.cpp
@@ -194,11 +194,11 @@ ECWRasterBand::ECWRasterBand( ECWDataset *poDSIn, int nBandIn, int iOverviewIn,
CPLDebug("ECW", "Fourth (alpha) band is promoted from 1 bit to 8 bit");
if( (poDSIn->psFileInfo->pBands[nBand-1].nBits % 8) != 0 && !bPromoteTo8Bit )
- SetMetadataItem("NBITS",
+ GDALPamRasterBand::SetMetadataItem("NBITS",
CPLString().Printf("%d",poDSIn->psFileInfo->pBands[nBand-1].nBits),
"IMAGE_STRUCTURE" );
- SetDescription(poDSIn->psFileInfo->pBands[nBand-1].szDesc);
+ GDALPamRasterBand::SetDescription(poDSIn->psFileInfo->pBands[nBand-1].szDesc);
}
/************************************************************************/
@@ -208,7 +208,7 @@ ECWRasterBand::ECWRasterBand( ECWDataset *poDSIn, int nBandIn, int iOverviewIn,
ECWRasterBand::~ECWRasterBand()
{
- FlushCache();
+ GDALRasterBand::FlushCache();
while( !apoOverviews.empty() )
{
@@ -266,7 +266,7 @@ CPLErr ECWRasterBand::AdviseRead( int nXOff, int nYOff, int nXSize, int nYSize,
GDALDataType eDT,
char **papszOptions )
{
- int nResFactor = 1 << (iOverview+1);
+ const int nResFactor = 1 << (iOverview+1);
return poGDS->AdviseRead( nXOff * nResFactor,
nYOff * nResFactor,
@@ -312,13 +312,13 @@ CPLErr ECWRasterBand::GetDefaultHistogram( double *pdfMin, double *pdfMax,
NCSBandStats& bandStats = poGDS->pStatistics->BandsStats[nStatsBandIndex];
if ( bandStats.Histogram != nullptr && bandStats.nHistBucketCount > 0 ){
*pnBuckets = bandStats.nHistBucketCount;
- *ppanHistogram = (GUIntBig *)VSIMalloc(bandStats.nHistBucketCount *sizeof(GUIntBig));
+ *ppanHistogram = static_cast<GUIntBig *>(VSIMalloc(bandStats.nHistBucketCount * sizeof(GUIntBig)));
for (size_t i = 0; i < bandStats.nHistBucketCount; i++){
- (*ppanHistogram)[i] = (GUIntBig) bandStats.Histogram[i];
+ (*ppanHistogram)[i] = static_cast<GUIntBig>(bandStats.Histogram[i]);
}
//JTO: this is not perfect as You can't tell who wrote the histogram !!!
//It will offset it unnecessarily for files with hists not modified by GDAL.
- double dfHalfBucket = (bandStats.fMaxHist - bandStats.fMinHist) / (2 * (*pnBuckets - 1));
+ const double dfHalfBucket = (bandStats.fMaxHist - bandStats.fMinHist) / (2 * (*pnBuckets - 1));
if ( pdfMin != nullptr ){
*pdfMin = bandStats.fMinHist - dfHalfBucket;
}
@@ -326,11 +326,7 @@ CPLErr ECWRasterBand::GetDefaultHistogram( double *pdfMin, double *pdfMax,
*pdfMax = bandStats.fMaxHist + dfHalfBucket;
}
bHistogramFromFile = true;
- }else{
- bHistogramFromFile = false;
}
- }else{
- bHistogramFromFile = false;
}
if (!bHistogramFromFile ){
@@ -338,29 +334,21 @@ CPLErr ECWRasterBand::GetDefaultHistogram( double *pdfMin, double *pdfMax,
//compute. Save.
pamError = GDALPamRasterBand::GetDefaultHistogram(pdfMin, pdfMax, pnBuckets, ppanHistogram, TRUE, f,pProgressData);
if (pamError == CE_None){
- CPLErr error2 = SetDefaultHistogram(*pdfMin, *pdfMax, *pnBuckets, *ppanHistogram);
+ const CPLErr error2 = SetDefaultHistogram(*pdfMin, *pdfMax, *pnBuckets, *ppanHistogram);
if (error2 != CE_None){
//Histogram is there but we failed to save it back to file.
CPLError (CE_Warning, CPLE_AppDefined,
"SetDefaultHistogram failed in ECWRasterBand::GetDefaultHistogram. Histogram might not be saved in .ecw file." );
}
return CE_None;
- }else{
- //Something went wrong during histogram computation.
- return pamError;
}
+ return pamError;
}
- else
- {
- // No histogram, no forced computation.
- return CE_Warning;
- }
- }
- else
- {
- // Statistics were already there and were used.
- return CE_None;
+ // No histogram, no forced computation.
+ return CE_Warning;
}
+ // Statistics were already there and were used.
+ return CE_None;
}
/************************************************************************/
@@ -426,7 +414,7 @@ CPLErr ECWRasterBand::SetDefaultHistogram( double dfMin, double dfMax,
bucketCounts[i] = pStatistics->BandsStats[i].nHistBucketCount;
}
bucketCounts[nStatsBandIndex] = nBuckets;
- if (nBuckets < (int)pStatistics->BandsStats[nStatsBandIndex].nHistBucketCount){
+ if (nBuckets < static_cast<int>(pStatistics->BandsStats[nStatsBandIndex].nHistBucketCount)){
pStatistics->BandsStats[nStatsBandIndex].nHistBucketCount = nBuckets;
}
error = NCSEcwInitStatistics(&pNewStatistics, nStatsBandCount, bucketCounts);
@@ -454,10 +442,10 @@ CPLErr ECWRasterBand::SetDefaultHistogram( double dfMin, double dfMax,
//at this point we have allocated statistics structure.
double dfHalfBucket = (dfMax - dfMin) / (2 * nBuckets);
- pStatistics->BandsStats[nStatsBandIndex].fMinHist = (IEEE4) (dfMin + dfHalfBucket);
- pStatistics->BandsStats[nStatsBandIndex].fMaxHist = (IEEE4) (dfMax - dfHalfBucket);
+ pStatistics->BandsStats[nStatsBandIndex].fMinHist = static_cast<IEEE4>(dfMin + dfHalfBucket);
+ pStatistics->BandsStats[nStatsBandIndex].fMaxHist = static_cast<IEEE4>(dfMax - dfHalfBucket);
for (int i=0;i<nBuckets;i++){
- pStatistics->BandsStats[nStatsBandIndex].Histogram[i] = (UINT64)panHistogram[i];
+ pStatistics->BandsStats[nStatsBandIndex].Histogram[i] = static_cast<UINT64>(panHistogram[i]);
}
if (hasPAMDefaultHistogram){
@@ -472,7 +460,8 @@ CPLErr ECWRasterBand::SetDefaultHistogram( double dfMin, double dfMax,
/* GetBandIndexAndCountForStatistics() */
/************************************************************************/
-void ECWRasterBand::GetBandIndexAndCountForStatistics(int &bandIndex, int &bandCount){
+void ECWRasterBand::GetBandIndexAndCountForStatistics(int &bandIndex, int &bandCount) const
+{
bandIndex = nBand-1;
bandCount = poGDS->nBands;
for (int i=0;i<poGDS->nBands;i++){
@@ -500,7 +489,7 @@ double ECWRasterBand::GetMinimum(int* pbSuccess)
if ( poGDS->pStatistics != nullptr )
{
NCSBandStats& bandStats = poGDS->pStatistics->BandsStats[nStatsBandIndex];
- if ( bandStats.fMinVal == bandStats.fMinVal )
+ if (!std::isnan(bandStats.fMinVal))
{
if( pbSuccess )
*pbSuccess = TRUE;
@@ -527,7 +516,7 @@ double ECWRasterBand::GetMaximum(int* pbSuccess)
if ( poGDS->pStatistics != nullptr )
{
NCSBandStats& bandStats = poGDS->pStatistics->BandsStats[nStatsBandIndex];
- if ( bandStats.fMaxVal == bandStats.fMaxVal )
+ if (!std::isnan(bandStats.fMaxVal))
{
if( pbSuccess )
*pbSuccess = TRUE;
@@ -549,7 +538,7 @@ CPLErr ECWRasterBand::GetStatistics( int bApproxOK, int bForce,
int bForceCoalesced = bForce;
// If file version is smaller than 3, there will be no statistics in the file. But if it is version 3 or higher we don't want underlying implementation to compute histogram
// so we set bForceCoalesced to FALSE.
- if (poGDS->psFileInfo->nFormatVersion >= 3){
+ if (poGDS->psFileInfo->nFormatVersion >= 3) {
bForceCoalesced = FALSE;
}
// We check if we have PAM histogram. If we have them we return them. This will allow to override statistics stored in the file.
@@ -571,22 +560,22 @@ CPLErr ECWRasterBand::GetStatistics( int bApproxOK, int bForce,
{
bStatisticsFromFile = true;
NCSBandStats& bandStats = poGDS->pStatistics->BandsStats[nStatsBandIndex];
- if ( pdfMin != nullptr && bandStats.fMinVal == bandStats.fMinVal){
+ if ( pdfMin != nullptr && !std::isnan(bandStats.fMinVal)) {
*pdfMin = bandStats.fMinVal;
}else{
bStatisticsFromFile = false;
}
- if ( pdfMax != nullptr && bandStats.fMaxVal == bandStats.fMaxVal){
+ if ( pdfMax != nullptr && !std::isnan(bandStats.fMaxVal)) {
*pdfMax = bandStats.fMaxVal;
}else{
bStatisticsFromFile = false;
}
- if ( pdfMean != nullptr && bandStats.fMeanVal == bandStats.fMeanVal){
+ if ( pdfMean != nullptr && !std::isnan(bandStats.fMeanVal)) {
*pdfMean = bandStats.fMeanVal;
}else{
bStatisticsFromFile = false;
}
- if ( padfStdDev != nullptr && bandStats.fStandardDev == bandStats.fStandardDev){
+ if ( padfStdDev != nullptr && !std::isnan(bandStats.fStandardDev)) {
*padfStdDev = bandStats.fStandardDev;
}else{
bStatisticsFromFile = false;
@@ -614,20 +603,18 @@ CPLErr ECWRasterBand::GetStatistics( int bApproxOK, int bForce,
*padfStdDev = dfStdDev;
}
if ( pamError == CE_None){
- CPLErr err = SetStatistics(dfMin,dfMax,dfMean,dfStdDev);
+ const CPLErr err = SetStatistics(dfMin,dfMax,dfMean,dfStdDev);
if (err !=CE_None){
CPLError (CE_Warning, CPLE_AppDefined,
"SetStatistics failed in ECWRasterBand::GetDefaultHistogram. Statistics might not be saved in .ecw file." );
}
return CE_None;
- }else{
- //whatever happened we return.
- return pamError;
}
- }else{
- //no statistics and we are not forced to return.
- return CE_Warning;
+ //whatever happened we return.
+ return pamError;
}
+ //no statistics and we are not forced to return.
+ return CE_Warning;
}
/************************************************************************/
@@ -658,10 +645,10 @@ CPLErr ECWRasterBand::SetStatistics( double dfMin, double dfMax,
}
}
- poGDS->pStatistics->BandsStats[nStatsBandIndex].fMinVal = (IEEE4) dfMin;
- poGDS->pStatistics->BandsStats[nStatsBandIndex].fMaxVal = (IEEE4)dfMax;
- poGDS->pStatistics->BandsStats[nStatsBandIndex].fMeanVal = (IEEE4)dfMean;
- poGDS->pStatistics->BandsStats[nStatsBandIndex].fStandardDev = (IEEE4)dfStdDev;
+ poGDS->pStatistics->BandsStats[nStatsBandIndex].fMinVal = static_cast<IEEE4>(dfMin);
+ poGDS->pStatistics->BandsStats[nStatsBandIndex].fMaxVal = static_cast<IEEE4>(dfMax);
+ poGDS->pStatistics->BandsStats[nStatsBandIndex].fMeanVal = static_cast<IEEE4>(dfMean);
+ poGDS->pStatistics->BandsStats[nStatsBandIndex].fStandardDev = static_cast<IEEE4>(dfStdDev);
poGDS->bStatisticsDirty = TRUE;
//if we have PAM statistics we need to save them as well. Better option would be to remove them from PAM file but I don't know how to do that without messing in PAM internals.
if ( hasPAMStatistics ){
@@ -692,9 +679,9 @@ CPLErr ECWRasterBand::OldIRasterIO( GDALRWFlag eRWFlag,
GDALRasterIOExtraArg* psExtraArg )
{
- int iBand, bDirect;
+ int iBand;
GByte *pabyWorkBuffer = nullptr;
- int nResFactor = 1 << (iOverview+1);
+ const int nResFactor = 1 << (iOverview+1);
nXOff *= nResFactor;
nYOff *= nResFactor;
@@ -707,12 +694,12 @@ CPLErr ECWRasterBand::OldIRasterIO( GDALRWFlag eRWFlag,
int nRet = poGDS->TryWinRasterIO( eRWFlag,
nXOff, nYOff,
nXSize, nYSize,
- (GByte *) pData, nBufXSize, nBufYSize,
+ static_cast<GByte *>(pData), nBufXSize, nBufYSize,
eBufType, 1, &nBand,
nPixelSpace, nLineSpace, 0 , psExtraArg);
if( nRet == TRUE )
return CE_None;
- else if( nRet < 0 )
+ if( nRet < 0 )
return CE_Failure;
/* -------------------------------------------------------------------- */
@@ -732,12 +719,12 @@ CPLErr ECWRasterBand::OldIRasterIO( GDALRWFlag eRWFlag,
/* Can we perform direct loads, or must we load into a working */
/* buffer, and transform? */
/* -------------------------------------------------------------------- */
- int nRawPixelSize = GDALGetDataTypeSize(poGDS->eRasterDataType) / 8;
+ const int nRawPixelSize = GDALGetDataTypeSize(poGDS->eRasterDataType) / 8;
- bDirect = nPixelSpace == 1 && eBufType == GDT_Byte
+ int bDirect = nPixelSpace == 1 && eBufType == GDT_Byte
&& nNewXSize == nBufXSize && nNewYSize == nBufYSize;
if( !bDirect )
- pabyWorkBuffer = (GByte *) CPLMalloc(nNewXSize * nRawPixelSize);
+ pabyWorkBuffer = static_cast<GByte *>(CPLMalloc(nNewXSize * nRawPixelSize));
/* -------------------------------------------------------------------- */
/* Establish access at the desired resolution. */
@@ -747,7 +734,7 @@ CPLErr ECWRasterBand::OldIRasterIO( GDALRWFlag eRWFlag,
iBand = nBand-1;
poGDS->nBandIndexToPromoteTo8Bit = ( bPromoteTo8Bit ) ? 0 : -1;
// TODO: Fix writable strings issue.
- CNCSError oErr = poGDS->poFileView->SetView( 1, (unsigned int *) (&iBand),
+ CNCSError oErr = poGDS->poFileView->SetView( 1, reinterpret_cast<unsigned int *>(&iBand),
nXOff, nYOff,
nXOff + nXSize - 1,
nYOff + nYSize - 1,
@@ -765,8 +752,8 @@ CPLErr ECWRasterBand::OldIRasterIO( GDALRWFlag eRWFlag,
/* Supersampling is not supported by the ECW API, so we will do */
/* it ourselves. */
/* -------------------------------------------------------------------- */
- double dfSrcYInc = (double)nNewYSize / nBufYSize;
- double dfSrcXInc = (double)nNewXSize / nBufXSize;
+ double dfSrcYInc = static_cast<double>(nNewYSize) / nBufYSize;
+ double dfSrcXInc = static_cast<double>(nNewXSize) / nBufXSize;
int iSrcLine, iDstLine;
CPLErr eErr = CE_None;
@@ -1017,7 +1004,7 @@ ECWDataset::ECWDataset(int bIsJPEG2000In)
ECWDataset::~ECWDataset()
{
- FlushCache();
+ GDALPamDataset::FlushCache();
CleanupWindow();
#if ECWSDK_VERSION>=50
@@ -1070,6 +1057,9 @@ ECWDataset::~ECWDataset()
// from the GDAL destructor.
if( poFileView != nullptr && !GDALIsInGlobalDestructor() )
{
+#if ECWSDK_VERSION >= 55
+ delete poFileView;
+#else
VSIIOStream *poUnderlyingIOStream = (VSIIOStream *)nullptr;
if( bUsingCustomStream )
@@ -1083,6 +1073,8 @@ ECWDataset::~ECWDataset()
if( --poUnderlyingIOStream->nFileViewCount == 0 )
delete poUnderlyingIOStream;
}
+#endif
+ poFileView = nullptr;
}
/* WriteHeader() must be called after closing the file handle to work */
@@ -2549,11 +2541,21 @@ CNCSJP2FileView *ECWDataset::OpenFileView( const char *pszDatasetName,
{
CPLDebug( "ECW", "Got mutex." );
}
- VSIIOStream *poIOStream = new VSIIOStream();
- poIOStream->Access( fpVSIL, FALSE, TRUE, pszDatasetName, 0, -1 );
-
+
poFileView = new CNCSJP2FileView();
- oErr = poFileView->Open( poIOStream, bProgressive );
+
+#if ECWSDK_VERSION >= 55
+ NCS::CString streamName(pszDatasetName);
+ auto vsiIoStream = NCS::CView::FindSteamByStreamNameFromOpenDatasets(streamName);
+ if (!vsiIoStream) {
+ vsiIoStream = std::make_shared<VSIIOStream>();
+ std::static_pointer_cast<VSIIOStream>(vsiIoStream)->Access(fpVSIL, FALSE, TRUE, pszDatasetName, 0, -1);
+ }
+ oErr = poFileView->Open(vsiIoStream, bProgressive);
+#else
+ auto vsiIoStream = new VSIIOStream();
+ vsiIoStream->Access(fpVSIL, FALSE, TRUE, pszDatasetName, 0, -1);
+ oErr = poFileView->Open(vsiIoStream, bProgressive);
// The CNCSJP2FileView (poFileView) object may not use the iostream
// (poIOStream) passed to the CNCSJP2FileView::Open() method if an
@@ -2575,14 +2577,15 @@ CNCSJP2FileView *ECWDataset::OpenFileView( const char *pszDatasetName,
if ( poUnderlyingIOStream )
poUnderlyingIOStream->nFileViewCount++;
- if ( poIOStream != poUnderlyingIOStream )
+ if ( vsiIoStream != poUnderlyingIOStream )
{
- delete poIOStream;
+ delete vsiIoStream;
}
else
{
bUsingCustomStream = TRUE;
}
+#endif
CPLReleaseMutex( hECWDatasetMutex );
diff --git a/gdal/frmts/ecw/gdal_ecw.h b/gdal/frmts/ecw/gdal_ecw.h
index 1b479485a33..142a63a21fa 100644
--- a/gdal/frmts/ecw/gdal_ecw.h
+++ b/gdal/frmts/ecw/gdal_ecw.h
@@ -89,7 +89,10 @@ class JP2UserBox final: public CNCSJP2Box {
virtual ~JP2UserBox();
-#if ECWSDK_VERSION >= 40
+#if ECWSDK_VERSION >= 55
+ CNCSError Parse(NCS::SDK::CFileBase &JP2File, const NCS::CIOStreamPtr &Stream) override;
+ CNCSError UnParse(NCS::SDK::CFileBase &JP2File, const NCS::CIOStreamPtr &Stream) override;
+#elif ECWSDK_VERSION >= 40
virtual CNCSError Parse(NCS::SDK::CFileBase &JP2File,
NCS::CIOStream &Stream) override;
virtual CNCSError UnParse(NCS::SDK::CFileBase &JP2File,
@@ -116,9 +119,10 @@ class JP2UserBox final: public CNCSJP2Box {
/************************************************************************/
class VSIIOStream final: public CNCSJPCIOStream
-
{
- private:
+#if ECWSDK_VERSION >= 54
+ NCS_DELETE_ALL_COPY_AND_MOVE(VSIIOStream)
+#endif
char *m_Filename;
public:
@@ -131,12 +135,13 @@ class VSIIOStream final: public CNCSJPCIOStream
int nCOMState;
int nCOMLength;
- GByte abyCOMType[2];
+ GByte abyCOMType[2]{};
/* To fix ‘virtual bool NCS::CIOStream::Read(INT64, void*, UINT32)’ was hidden' with SDK 5 */
using CNCSJPCIOStream::Read;
- VSIIOStream() : m_Filename(nullptr){
+ VSIIOStream() : m_Filename(nullptr)
+ {
nFileViewCount = 0;
startOfJPData = 0;
lengthOfJPData = -1;
@@ -152,13 +157,13 @@ class VSIIOStream final: public CNCSJPCIOStream
abyCOMType[1] = 0;
}
virtual ~VSIIOStream() {
- Close();
+ VSIIOStream::Close();
if (m_Filename!=nullptr){
CPLFree(m_Filename);
}
}
- virtual CNCSError Close() override {
+ CNCSError Close() override {
CNCSError oErr = CNCSJPCIOStream::Close();
if( fpVSIL != nullptr )
{
@@ -169,18 +174,17 @@ class VSIIOStream final: public CNCSJPCIOStream
}
#if ECWSDK_VERSION >= 40
- virtual VSIIOStream *Clone() override {
+ VSIIOStream *Clone() override {
CPLDebug( "ECW", "VSIIOStream::Clone()" );
VSILFILE *fpNewVSIL = VSIFOpenL( m_Filename, "rb" );
if (fpNewVSIL == nullptr)
{
return nullptr;
- }else
- {
- VSIIOStream *pDst = new VSIIOStream();
- pDst->Access(fpNewVSIL, bWritable, bSeekable, m_Filename, startOfJPData, lengthOfJPData);
- return pDst;
}
+
+ VSIIOStream *pDst = new VSIIOStream();
+ pDst->Access(fpNewVSIL, bWritable, bSeekable, m_Filename, startOfJPData, lengthOfJPData);
+ return pDst;
}
#endif /* ECWSDK_VERSION >= 4 */
@@ -199,9 +203,10 @@ class VSIIOStream final: public CNCSJPCIOStream
// if it does not have a path to a real directory, we will
// substitute something.
CPLString osFilenameUsed = pszFilename;
+#if ECWSDK_VERSION < 55
CPLString osPath = CPLGetPath( pszFilename );
struct stat sStatBuf;
- if( osPath != "" && stat( osPath, &sStatBuf ) != 0 )
+ if( !osPath.empty() && stat( osPath, &sStatBuf ) != 0 )
{
osFilenameUsed = CPLGenerateTempFilename( nullptr );
// try to preserve the extension.
@@ -212,6 +217,8 @@ class VSIIOStream final: public CNCSJPCIOStream
}
CPLDebug( "ECW", "Using filename '%s' for temporary directory determination purposes.", osFilenameUsed.c_str() );
}
+#endif
+
#ifdef WIN32
if( CSLTestBoolean( CPLGetConfigOption( "GDAL_FILENAME_IS_UTF8", "YES" ) ) )
{
@@ -662,7 +669,7 @@ class ECWRasterBand final: public GDALPamRasterBand
int nBufXSize, int nBufYSize,
GDALDataType eDT, char **papszOptions ) override;
#if ECWSDK_VERSION >= 50
- void GetBandIndexAndCountForStatistics(int &bandIndex, int &bandCount);
+ void GetBandIndexAndCountForStatistics(int &bandIndex, int &bandCount) const;
virtual CPLErr GetDefaultHistogram( double *pdfMin, double *pdfMax,
int *pnBuckets, GUIntBig ** ppanHistogram,
int bForce,
diff --git a/gdal/frmts/ecw/jp2userbox.cpp b/gdal/frmts/ecw/jp2userbox.cpp
index 2829835a5af..367cc696cfb 100644
--- a/gdal/frmts/ecw/jp2userbox.cpp
+++ b/gdal/frmts/ecw/jp2userbox.cpp
@@ -72,7 +72,7 @@ void JP2UserBox::SetData( int nLengthIn, const unsigned char *pabyDataIn )
CPLFree( pabyData );
nDataLength = nLengthIn;
- pabyData = (unsigned char *) CPLMalloc(nDataLength);
+ pabyData = static_cast<unsigned char *>(CPLMalloc(nDataLength));
memcpy( pabyData, pabyDataIn, nDataLength );
m_bValid = true;
@@ -94,8 +94,10 @@ void JP2UserBox::UpdateXLBox()
/* */
/* Parse box, and data contents from file into memory. */
/************************************************************************/
-
-#if ECWSDK_VERSION >= 40
+#if ECWSDK_VERSION >= 55
+CNCSError JP2UserBox::Parse(CPL_UNUSED NCS::SDK::CFileBase &JP2File,
+ CPL_UNUSED const NCS::CIOStreamPtr &Stream)
+#elif ECWSDK_VERSION >= 40
CNCSError JP2UserBox::Parse( CPL_UNUSED NCS::SDK::CFileBase &JP2File,
CPL_UNUSED NCS::CIOStream &Stream )
#else
@@ -113,8 +115,10 @@ CNCSError JP2UserBox::Parse( CPL_UNUSED class CNCSJP2File &JP2File,
/* */
/* Write box meta information, and data to file. */
/************************************************************************/
-
-#if ECWSDK_VERSION >= 40
+#if ECWSDK_VERSION >= 55
+CNCSError JP2UserBox::UnParse(NCS::SDK::CFileBase &JP2File,
+ const NCS::CIOStreamPtr &Stream)
+#elif ECWSDK_VERSION >= 40
CNCSError JP2UserBox::UnParse( NCS::SDK::CFileBase &JP2File,
NCS::CIOStream &Stream )
#else
@@ -136,9 +140,12 @@ CNCSError JP2UserBox::UnParse( class CNCSJP2File &JP2File,
#else
Error = CNCSSDKBox::UnParse(JP2File, Stream);
#endif
-// NCSJP2_CHECKIO_BEGIN(Error, Stream);
+
+#if ECWSDK_VERSION >= 55
+ Stream->Write(pabyData, nDataLength);
+#else
Stream.Write(pabyData, nDataLength);
-// NCSJP2_CHECKIO_END();
+#endif
return Error;
}
diff --git a/gdal/nmake.opt b/gdal/nmake.opt
index 17f252e44b5..910acb17987 100644
--- a/gdal/nmake.opt
+++ b/gdal/nmake.opt
@@ -342,13 +342,34 @@ JPEG12_SUPPORTED = 1
# NCSEcw4.lib, and add -DHAVE_COMPRESS to ECWFLAGS. The ECWDIR setting will
# also need some adjustment.
-# Uncomment the following and update to enable ECW read support with the 5.0 SDK
-#ECWDIR = "c:\Intergraph\ecwsdk5"
-#ECWFLAGS = -DECWSDK_VERSION=50 \
-# -I$(ECWDIR)\include \
-# -I$(ECWDIR)\include/NCSECW/api -I$(ECWDIR)\include/NCSECW/jp2 \
-# -I$(ECWDIR)\include/NCSECW/ecw
-#ECWLIB = $(ECWDIR)\lib\vc90\win32\NCSEcw.lib
+# Uncomment the following and update to enable ECW read support with the 5.0+ SDK
+#!IF $(MSVC_VER) < 1910
+#ECW_PLATFORM_TOOLSET_DIR = vc140
+#!ELSE
+#ECW_PLATFORM_TOOLSET_DIR = vc141
+#!ENDIF
+
+#!IF "$(DEBUG)" == "1"
+#ECW_LIB_DEBUG_SUFFIX = d
+#!ENDIF
+
+#!IF "$(WIN64)" == "1"
+#ECW_PLATFORM_DIR = x64
+#!ELSE
+#ECW_PLATFORM_DIR = Win32
+#!ENDIF
+
+#ECWDIR = "C:/Hexagon/ERDAS ECW JPEG 2000 SDK 5.4.0/Desktop Read-Only"
+#ECWDIR = "C:/Hexagon/ERDAS ECW JPEG 2000 SDK 5.5.0/Desktop Read-Only"
+#ECW_MAJOR_MINOR_VERSION = 55
+
+#ECW_INCLUDES = -I$(ECWDIR)/include \
+# -I$(ECWDIR)/include/NCSEcw/API -I$(ECWDIR)/include/NCSEcw/JP2 \
+# -I$(ECWDIR)/include/NCSEcw/ECW
+
+#ECW_ENABLE_COMPRESSION = -DHAVE_COMPRESS
+#ECWFLAGS = -DECWSDK_VERSION=$(ECW_MAJOR_MINOR_VERSION) $(ECW_ENABLE_COMPRESSION) $(ECW_INCLUDES)
+#ECWLIB = $(ECWDIR)\lib\$(ECW_PLATFORM_TOOLSET_DIR)\$(ECW_PLATFORM_DIR)\NCSEcw$(ECW_LIB_LINK_SUFFIX).lib
# To build ECW support as a plugin uncomment the following, and make sure
# to do "nmake /f makefile.vc plugin" in gdal/frmts/ecw and copy the two

52
gdal-ecwjp2-sdk-5.5_dep1.patch
View File

@ -1,52 +0,0 @@
diff --git a/gdal/frmts/ecw/gdal_ecw.h b/gdal/frmts/ecw/gdal_ecw.h
index e1b6772934a..1b479485a33 100644
--- a/gdal/frmts/ecw/gdal_ecw.h
+++ b/gdal/frmts/ecw/gdal_ecw.h
@@ -76,9 +76,9 @@ void ECWReportError(CNCSError& oErr, const char* pszMsg = "");
/************************************************************************/
#ifdef HAVE_COMPRESS
#if ECWSDK_VERSION>=50
-class JP2UserBox : public CNCSSDKBox {
+class JP2UserBox final: public CNCSSDKBox {
#else
-class JP2UserBox : public CNCSJP2Box {
+class JP2UserBox final: public CNCSJP2Box {
#endif
private:
int nDataLength;
@@ -115,7 +115,7 @@ class JP2UserBox : public CNCSJP2Box {
/* ==================================================================== */
/************************************************************************/
-class VSIIOStream : public CNCSJPCIOStream
+class VSIIOStream final: public CNCSJPCIOStream
{
private:
@@ -395,7 +395,7 @@ class ECWDataset;
#if ECWSDK_VERSION >= 40
-class ECWAsyncReader : public GDALAsyncReader
+class ECWAsyncReader final: public GDALAsyncReader
{
private:
CNCSJP2FileView *poFileView = nullptr;
@@ -444,7 +444,7 @@ typedef struct
GByte* pabyData;
} ECWCachedMultiBandIO;
-class CPL_DLL ECWDataset : public GDALJP2AbstractDataset
+class CPL_DLL ECWDataset final: public GDALJP2AbstractDataset
{
friend class ECWRasterBand;
friend class ECWAsyncReader;
@@ -611,7 +611,7 @@ class CPL_DLL ECWDataset : public GDALJP2AbstractDataset
/* ==================================================================== */
/************************************************************************/
-class ECWRasterBand : public GDALPamRasterBand
+class ECWRasterBand final: public GDALPamRasterBand
{
friend class ECWDataset;

411
gdal-fix-docs.patch Normal file
View File

@ -0,0 +1,411 @@
From 58b9f4eba6bf3bf39350e4c0a9005336cf1b61fc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 13 Jun 2020 23:22:44 +0200
Subject: [PATCH] Doc building: fix warnings when using recent Doxygen and/or
Sphinx+Breathe (fixes #2673)
---
gdal/Doxyfile | 7 +++-
gdal/gcore/gdal.h | 18 ++++++--
gdal/gcore/gdal_priv.h | 7 +---
gdal/ogr/ogr_geometry.h | 87 ++++++++++++++++++++++++++++++++++++++-
gdal/ogr/ogr_spatialref.h | 23 +++++++++--
gdal/port/cpl_conv.h | 2 +-
6 files changed, 129 insertions(+), 15 deletions(-)
diff --git a/gdal/Doxyfile b/gdal/Doxyfile
index e7afd116860..aedffa2e5f7 100644
--- a/gdal/Doxyfile
+++ b/gdal/Doxyfile
@@ -954,7 +954,12 @@ PREDEFINED = HAVE_DLFCN_H \
HAVE_LONG_LONG=1 \
HAVE_SC_PHYS_PAGES=1 \
final= \
- CPL_RESTRICT=
+ CPL_RESTRICT= \
+ CPL_WARN_UNUSED_RESULT= \
+ CPL_RETURNS_NONNULL= \
+ CPLSTRING_METHOD_DLL= \
+ CPL_NO_RETURN= \
+ EXPERIMENTAL_CPL_WARN_UNUSED_RESULT=
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
diff --git a/gdal/gcore/gdal.h b/gdal/gcore/gdal.h
index 7a232ee6278..0529d178ce2 100644
--- a/gdal/gcore/gdal.h
+++ b/gdal/gcore/gdal.h
@@ -956,7 +956,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetRasterHistogram( GDALRasterBandH hBand,
int nBuckets, int *panHistogram,
int bIncludeOutOfRange, int bApproxOK,
GDALProgressFunc pfnProgress,
- void * pProgressData ) CPL_WARN_DEPRECATED("Use GDALGetRasterHistogramEx() instead");
+ void * pProgressData )
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GDALGetRasterHistogramEx() instead")
+/*! @endcond */
+ ;
CPLErr CPL_DLL CPL_STDCALL GDALGetRasterHistogramEx( GDALRasterBandH hBand,
double dfMin, double dfMax,
int nBuckets, GUIntBig *panHistogram,
@@ -968,7 +972,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogram( GDALRasterBandH hBand,
int *pnBuckets, int **ppanHistogram,
int bForce,
GDALProgressFunc pfnProgress,
- void * pProgressData ) CPL_WARN_DEPRECATED("Use GDALGetDefaultHistogramEx() instead");
+ void * pProgressData )
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GDALGetDefaultHistogramEx() instead")
+/*! @endcond */
+ ;
CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogramEx( GDALRasterBandH hBand,
double *pdfMin, double *pdfMax,
int *pnBuckets, GUIntBig **ppanHistogram,
@@ -977,7 +985,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogramEx( GDALRasterBandH hBand,
void * pProgressData );
CPLErr CPL_DLL CPL_STDCALL GDALSetDefaultHistogram( GDALRasterBandH hBand,
double dfMin, double dfMax,
- int nBuckets, int *panHistogram ) CPL_WARN_DEPRECATED("Use GDALSetDefaultHistogramEx() instead");
+ int nBuckets, int *panHistogram )
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GDALSetDefaultHistogramEx() instead")
+/*! @endcond */
+ ;
CPLErr CPL_DLL CPL_STDCALL GDALSetDefaultHistogramEx( GDALRasterBandH hBand,
double dfMin, double dfMax,
int nBuckets, GUIntBig *panHistogram );
diff --git a/gdal/gcore/gdal_priv.h b/gdal/gcore/gdal_priv.h
index 6790daf7110..f30269be6f7 100644
--- a/gdal/gcore/gdal_priv.h
+++ b/gdal/gcore/gdal_priv.h
@@ -604,7 +604,9 @@ class CPL_DLL GDALDataset : public GDALMajorObject
CPLErr BuildOverviews( const char *, int, int *,
int, int *, GDALProgressFunc, void * );
+#ifndef DOXYGEN_XML
void ReportError(CPLErr eErrClass, CPLErrorNum err_no, const char *fmt, ...) CPL_PRINT_FUNC_FORMAT (4, 5);
+#endif
char ** GetMetadata(const char * pszDomain = "") override;
@@ -612,8 +614,6 @@ class CPL_DLL GDALDataset : public GDALMajorObject
#ifdef DOXYGEN_SKIP
CPLErr SetMetadata( char ** papszMetadata,
const char * pszDomain ) override;
- const char *GetMetadataItem( const char * pszName,
- const char * pszDomain ) override;
CPLErr SetMetadataItem( const char * pszName,
const char * pszValue,
const char * pszDomain ) override;
@@ -1252,11 +1252,8 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
// Only defined when Doxygen enabled
#ifdef DOXYGEN_SKIP
- char **GetMetadata( const char * pszDomain = "" ) override;
CPLErr SetMetadata( char ** papszMetadata,
const char * pszDomain ) override;
- const char *GetMetadataItem( const char * pszName,
- const char * pszDomain ) override;
CPLErr SetMetadataItem( const char * pszName,
const char * pszValue,
const char * pszDomain ) override;
diff --git a/gdal/ogr/ogr_geometry.h b/gdal/ogr/ogr_geometry.h
index d7de8f07555..ef220d19747 100644
--- a/gdal/ogr/ogr_geometry.h
+++ b/gdal/ogr/ogr_geometry.h
@@ -421,13 +421,18 @@ class CPL_DLL OGRGeometry
OGRwkbVariant=wkbVariantOldOgc ) const = 0;
virtual OGRErr importFromWkt( const char ** ppszInput ) = 0;
+#ifndef DOXYGEN_XML
/** Deprecated.
* @deprecated in GDAL 2.3
*/
- OGRErr importFromWkt( char ** ppszInput ) CPL_WARN_DEPRECATED("Use importFromWkt(const char**) instead")
+ OGRErr importFromWkt( char ** ppszInput )
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use importFromWkt(const char**) instead")
+/*! @endcond */
{
return importFromWkt( const_cast<const char**>(ppszInput) );
}
+#endif
OGRErr exportToWkt( char ** ppszDstText,
OGRwkbVariant=wkbVariantOldOgc ) const;
@@ -881,9 +886,16 @@ class CPL_DLL OGRPoint : public OGRGeometry
OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a point to WKT
/// \param opts Output options.
@@ -1187,9 +1199,16 @@ class CPL_DLL OGRSimpleCurve: public OGRCurve
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a simple curve to WKT
/// \param opts Output options.
@@ -1481,9 +1500,16 @@ class CPL_DLL OGRCircularString : public OGRSimpleCurve
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a circular string to WKT
/// \param opts Output options.
@@ -1701,9 +1727,16 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a compound curve to WKT
/// \param opts Output options.
@@ -1904,9 +1937,16 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a curve polygon to WKT
/// \param opts Output options.
@@ -2048,10 +2088,16 @@ class CPL_DLL OGRPolygon : public OGRCurvePolygon
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a polygon to WKT
/// \param opts Output options.
@@ -2238,10 +2284,16 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a geometry collection to WKT
/// \param opts Output options.
@@ -2341,10 +2393,16 @@ class CPL_DLL OGRMultiSurface : public OGRGeometryCollection
// Non standard (OGRGeometry).
virtual const char *getGeometryName() const override;
virtual OGRwkbGeometryType getGeometryType() const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a geometry collection to WKT
/// \param opts Output options.
@@ -2439,7 +2497,10 @@ class CPL_DLL OGRMultiPolygon : public OGRMultiSurface
// Non-standard (OGRGeometry).
virtual const char *getGeometryName() const override;
virtual OGRwkbGeometryType getGeometryType() const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a multipolygon to WKT
/// \param opts Output options.
@@ -2538,9 +2599,16 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface
virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *,
OGRwkbVariant=wkbVariantOldOgc )
const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a polyhedral surface to WKT
/// \param opts Output options.
@@ -2718,9 +2786,16 @@ class CPL_DLL OGRMultiPoint : public OGRGeometryCollection
// Non-standard (OGRGeometry).
virtual const char *getGeometryName() const override;
virtual OGRwkbGeometryType getGeometryType() const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a multipoint to WKT
/// \param opts Output options.
@@ -2803,9 +2878,16 @@ class CPL_DLL OGRMultiCurve : public OGRGeometryCollection
// Non standard (OGRGeometry).
virtual const char *getGeometryName() const override;
virtual OGRwkbGeometryType getGeometryType() const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::importFromWkt; /** deprecated */
+#endif
+
OGRErr importFromWkt( const char ** ) override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a multicurve to WKT
/// \param opts Output options.
@@ -2884,7 +2966,10 @@ class CPL_DLL OGRMultiLineString : public OGRMultiCurve
// Non standard (OGRGeometry).
virtual const char *getGeometryName() const override;
virtual OGRwkbGeometryType getGeometryType() const override;
+
+#ifndef DOXYGEN_XML
using OGRGeometry::exportToWkt;
+#endif
/// Export a multilinestring to WKT
/// \param opts Output options.
diff --git a/gdal/ogr/ogr_spatialref.h b/gdal/ogr/ogr_spatialref.h
index 23237a62091..a97af16ece7 100644
--- a/gdal/ogr/ogr_spatialref.h
+++ b/gdal/ogr/ogr_spatialref.h
@@ -293,7 +293,11 @@ class CPL_DLL OGRSpatialReference
const char *pszUnitAuthority = nullptr,
const char *pszUnitCode = nullptr);
- double GetLinearUnits( char ** ) const CPL_WARN_DEPRECATED("Use GetLinearUnits(const char**) instead");
+ double GetLinearUnits( char ** ) const
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GetLinearUnits(const char**) instead")
+/*! @endcond */
+ ;
double GetLinearUnits( const char ** = nullptr ) const;
/*! @cond Doxygen_Suppress */
double GetLinearUnits( std::nullptr_t ) const
@@ -302,7 +306,10 @@ class CPL_DLL OGRSpatialReference
double GetTargetLinearUnits( const char *pszTargetKey,
char ** ppszRetName ) const
- CPL_WARN_DEPRECATED("Use GetTargetLinearUnits(const char*, const char**)");
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GetTargetLinearUnits(const char*, const char**)")
+/*! @endcond */
+ ;
double GetTargetLinearUnits( const char *pszTargetKey,
const char ** ppszRetName = nullptr ) const;
/*! @cond Doxygen_Suppress */
@@ -311,14 +318,22 @@ class CPL_DLL OGRSpatialReference
/*! @endcond */
OGRErr SetAngularUnits( const char *pszName, double dfInRadians );
- double GetAngularUnits( char ** ) const CPL_WARN_DEPRECATED("Use GetAngularUnits(const char**) instead");
+ double GetAngularUnits( char ** ) const
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GetAngularUnits(const char**) instead")
+/*! @endcond */
+ ;
double GetAngularUnits( const char ** = nullptr ) const;
/*! @cond Doxygen_Suppress */
double GetAngularUnits( std::nullptr_t ) const
{ return GetAngularUnits( static_cast<const char**>(nullptr) ); }
/*! @endcond */
- double GetPrimeMeridian( char ** ) const CPL_WARN_DEPRECATED("Use GetPrimeMeridian(const char**) instead");
+ double GetPrimeMeridian( char ** ) const
+/*! @cond Doxygen_Suppress */
+ CPL_WARN_DEPRECATED("Use GetPrimeMeridian(const char**) instead")
+/*! @endcond */
+ ;
double GetPrimeMeridian( const char ** = nullptr ) const;
/*! @cond Doxygen_Suppress */
double GetPrimeMeridian( std::nullptr_t ) const
diff --git a/gdal/port/cpl_conv.h b/gdal/port/cpl_conv.h
index a3ee4e7318d..e6f03396e32 100644
--- a/gdal/port/cpl_conv.h
+++ b/gdal/port/cpl_conv.h
@@ -178,7 +178,7 @@ const char CPL_DLL *CPLLaunderForFilename(const char* pszName,
/* -------------------------------------------------------------------- */
/** Callback for CPLPushFileFinder */
-typedef const char *(*CPLFileFinder)(const char *, const char *);
+typedef char const *(*CPLFileFinder)(const char *, const char *);
const char CPL_DLL *CPLFindFile(const char *pszClass,
const char *pszBasename);

25
gdal.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Jun 16 08:22:44 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add _constraints to avoid build failure
-------------------------------------------------------------------
Mon Jun 15 08:32:54 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Fix docs and man builds for Tumbleweed with upstream patch:
* gdal-fix-docs.patch
- Disable docs/man on Leap - https://github.com/OSGeo/gdal/issues/2690
-------------------------------------------------------------------
Thu Jun 11 16:44:15 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 3.1.0:
* New binaries: gdal_viewshed gdalmdiminfo gdalmdimtranslate
* full changelog:
https://github.com/OSGeo/gdal/blob/v3.1.0/gdal/NEWS
- Refresh patch:
* GDALmake.opt.in.patch
- Drop upstream patches:
* gdal-ecwjp2-sdk-5.5_dep1.patch
* gdal-ecwjp2-sdk-5.5.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 20 08:31:33 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> Mon Apr 20 08:31:33 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

79
gdal.spec
View File

@ -16,18 +16,22 @@
# #
# Soname should be bumped on API/ABI break %define soversion 27
# http://trac.osgeo.org/gdal/ticket/4543
%define soversion 26
%define sourcename gdal %define sourcename gdal
# Uppercase GDAL is the canonical name for this package in Python # Uppercase GDAL is the canonical name for this package in Python
%define pypi_package_name GDAL %define pypi_package_name GDAL
# Enable docs on Tumbleweed only - https://github.com/OSGeo/gdal/issues/2690
%if 0%{?suse_version} > 1500
%bcond_without docs
%else
%bcond_with docs
%endif
%bcond_with ecw_support %bcond_with ecw_support
%bcond_with ecw5_support %bcond_with ecw5_support
%bcond_with fgdb_support %bcond_with fgdb_support
%bcond_without python2 %bcond_without python2
Name: gdal Name: gdal
Version: 3.0.4 Version: 3.1.0
Release: 0 Release: 0
Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats
License: MIT AND BSD-3-Clause AND SUSE-Public-Domain License: MIT AND BSD-3-Clause AND SUSE-Public-Domain
@ -37,9 +41,8 @@ Source1: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ver
Patch0: gdal-perl.patch Patch0: gdal-perl.patch
# Fix occasional parallel build failure # Fix occasional parallel build failure
Patch1: GDALmake.opt.in.patch Patch1: GDALmake.opt.in.patch
# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/commit/e5cb5406ea9090b2f17cffeeb7ba5fb49e7158f2 + dep commit # PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/pull/2678
Patch2: gdal-ecwjp2-sdk-5.5_dep1.patch Patch2: gdal-fix-docs.patch
Patch3: gdal-ecwjp2-sdk-5.5.patch
BuildRequires: KEALib-devel BuildRequires: KEALib-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -61,10 +64,6 @@ BuildRequires: opencl-headers
BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-macros BuildRequires: perl-macros
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if %{with python2}
BuildRequires: python-numpy-devel
BuildRequires: python-setuptools
%endif
BuildRequires: python3-numpy-devel BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: swig BuildRequires: swig
@ -94,6 +93,21 @@ BuildRequires: pkgconfig(spatialite)
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(xerces-c)
BuildRequires: pkgconfig(zlib) >= 1.1.4 BuildRequires: pkgconfig(zlib) >= 1.1.4
%if %{with docs}
BuildRequires: python3-Sphinx
BuildRequires: python3-breathe
BuildRequires: texlive-dvips-bin
BuildRequires: texlive-latex-bin-bin
BuildRequires: texlive-newunicodechar
%endif
%if %{with python2}
BuildRequires: python-numpy-devel
BuildRequires: python-setuptools
%if %{with docs}
BuildRequires: python-Sphinx
BuildRequires: python-breathe
%endif
%endif
%if %{with fgdb_support} %if %{with fgdb_support}
BuildRequires: filegdb_api-devel BuildRequires: filegdb_api-devel
%endif %endif
@ -165,12 +179,16 @@ The GDAL python modules provide support to handle multiple GIS file formats.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p2 %patch2 -p2
%patch3 -p2
# Set the right (build) libproj.so version, use the upper found version. # Set the right (build) libproj.so version, use the upper found version.
PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}')
sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp
# --keep-going option not support on Leap/SLE
%if 0%{?sle_version} && 0%{?sle_version} <= 150200
sed -i 's/--keep-going//' doc/Makefile
%endif
# Fix mandir # Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
@ -266,7 +284,16 @@ do
make %{?_smp_mflags} -C swig/${M} generate make %{?_smp_mflags} -C swig/${M} generate
done done
make %{?_smp_mflags} VERBOSE=1 all docs man # Force Doxygen generation
rm doc/.doxygen_up_to_date
pushd doc/
make .doxygen_up_to_date
popd
make %{?_smp_mflags} VERBOSE=1 all \
%if %{with docs}
docs man \
%endif
# Make Python 3 module # Make Python 3 module
pushd swig/python pushd swig/python
@ -281,15 +308,18 @@ pushd swig/python
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
popd popd
make %{?_smp_mflags} install install-man \ make %{?_smp_mflags} install \
%if %{with docs}
install-man \
%endif
DESTDIR=%{buildroot} INST_MAN=%{_mandir} DESTDIR=%{buildroot} INST_MAN=%{_mandir}
# Not on buildroot : broke everything with python3 # Not on buildroot : broke everything with python3
# If done got python3 needing python2 package heretic .. # If done got python3 needing python2 package heretic ..
# Futhermore duplicates are only existing in src html dir # Futhermore duplicates are only existing in src html dir
%fdupes -s html %fdupes -s doc/build/html
# Empty file # Empty file
rm -f html/do-not-remove rm -f doc/build/html/do-not-remove
# chrpath must be removed here # chrpath must be removed here
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
@ -317,6 +347,9 @@ rm -f %{buildroot}%{_datadir}/gdal/LICENSE.TXT
# avoid PACKAGE redefines # avoid PACKAGE redefines
sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h
# Fix wrong /usr/bin/env phyton3
find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \;
%post -n lib%{name}%{soversion} -p /sbin/ldconfig %post -n lib%{name}%{soversion} -p /sbin/ldconfig
%postun -n lib%{name}%{soversion} -p /sbin/ldconfig %postun -n lib%{name}%{soversion} -p /sbin/ldconfig
@ -348,6 +381,7 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_bindir}/gdal_retile.py %{_bindir}/gdal_retile.py
%{_bindir}/gdal_sieve.py %{_bindir}/gdal_sieve.py
%{_bindir}/gdal_translate %{_bindir}/gdal_translate
%{_bindir}/gdal_viewshed
%{_bindir}/gdaladdo %{_bindir}/gdaladdo
%{_bindir}/gdalbuildvrt %{_bindir}/gdalbuildvrt
%{_bindir}/gdalchksum.py %{_bindir}/gdalchksum.py
@ -359,6 +393,8 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_bindir}/gdalinfo %{_bindir}/gdalinfo
%{_bindir}/gdallocationinfo %{_bindir}/gdallocationinfo
%{_bindir}/gdalmanage %{_bindir}/gdalmanage
%{_bindir}/gdalmdiminfo
%{_bindir}/gdalmdimtranslate
%{_bindir}/gdalmove.py %{_bindir}/gdalmove.py
%{_bindir}/gdalserver %{_bindir}/gdalserver
%{_bindir}/gdalsrsinfo %{_bindir}/gdalsrsinfo
@ -378,6 +414,7 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_bindir}/rgb2pct.py %{_bindir}/rgb2pct.py
%{_bindir}/testepsg %{_bindir}/testepsg
%{_datadir}/gdal %{_datadir}/gdal
%if %{with docs}
%{_mandir}/man1/gdal2tiles.1%{?ext_man} %{_mandir}/man1/gdal2tiles.1%{?ext_man}
%{_mandir}/man1/gdal_calc.1%{?ext_man} %{_mandir}/man1/gdal_calc.1%{?ext_man}
%{_mandir}/man1/gdal_contour.1%{?ext_man} %{_mandir}/man1/gdal_contour.1%{?ext_man}
@ -392,7 +429,6 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_mandir}/man1/gdal_retile.1%{?ext_man} %{_mandir}/man1/gdal_retile.1%{?ext_man}
%{_mandir}/man1/gdal_sieve.1%{?ext_man} %{_mandir}/man1/gdal_sieve.1%{?ext_man}
%{_mandir}/man1/gdal_translate.1%{?ext_man} %{_mandir}/man1/gdal_translate.1%{?ext_man}
%{_mandir}/man1/gdal_utilities.1%{?ext_man}
%{_mandir}/man1/gdaladdo.1%{?ext_man} %{_mandir}/man1/gdaladdo.1%{?ext_man}
%{_mandir}/man1/gdalbuildvrt.1%{?ext_man} %{_mandir}/man1/gdalbuildvrt.1%{?ext_man}
%{_mandir}/man1/gdalcompare.1%{?ext_man} %{_mandir}/man1/gdalcompare.1%{?ext_man}
@ -405,29 +441,32 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_mandir}/man1/gdaltindex.1%{?ext_man} %{_mandir}/man1/gdaltindex.1%{?ext_man}
%{_mandir}/man1/gdaltransform.1%{?ext_man} %{_mandir}/man1/gdaltransform.1%{?ext_man}
%{_mandir}/man1/gdalwarp.1%{?ext_man} %{_mandir}/man1/gdalwarp.1%{?ext_man}
%{_mandir}/man1/gnm_utilities.1%{?ext_man}
%{_mandir}/man1/gnmanalyse.1%{?ext_man} %{_mandir}/man1/gnmanalyse.1%{?ext_man}
%{_mandir}/man1/gnmmanage.1%{?ext_man} %{_mandir}/man1/gnmmanage.1%{?ext_man}
%{_mandir}/man1/nearblack.1%{?ext_man} %{_mandir}/man1/nearblack.1%{?ext_man}
%{_mandir}/man1/ogr2ogr.1%{?ext_man} %{_mandir}/man1/ogr2ogr.1%{?ext_man}
%{_mandir}/man1/ogr_utilities.1%{?ext_man}
%{_mandir}/man1/ogrinfo.1%{?ext_man} %{_mandir}/man1/ogrinfo.1%{?ext_man}
%{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrlineref.1%{?ext_man}
%{_mandir}/man1/ogrmerge.1%{?ext_man} %{_mandir}/man1/ogrmerge.1%{?ext_man}
%{_mandir}/man1/ogrtindex.1%{?ext_man} %{_mandir}/man1/ogrtindex.1%{?ext_man}
%{_mandir}/man1/pct2rgb.1%{?ext_man} %{_mandir}/man1/pct2rgb.1%{?ext_man}
%{_mandir}/man1/rgb2pct.1%{?ext_man} %{_mandir}/man1/rgb2pct.1%{?ext_man}
%endif
%files devel %files devel
%license LICENSE.TXT %license LICENSE.TXT
%doc NEWS PROVENANCE.TXT %doc NEWS PROVENANCE.TXT
%doc html %if %{with docs}
%doc doc/build/html/
%endif
%attr(755,root,root) %{_bindir}/gdal-config %attr(755,root,root) %{_bindir}/gdal-config
%{_libdir}/libgdal.so %{_libdir}/libgdal.so
%{_libdir}/pkgconfig/gdal.pc %{_libdir}/pkgconfig/gdal.pc
%dir %{_includedir}/gdal %dir %{_includedir}/gdal
%{_includedir}/gdal/*.h %{_includedir}/gdal/*.h
%if %{with docs}
%{_mandir}/man1/gdal-config.1%{?ext_man} %{_mandir}/man1/gdal-config.1%{?ext_man}
%endif
%files -n perl-%{name} %files -n perl-%{name}
%license LICENSE.TXT %license LICENSE.TXT