Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2020-04-11 23:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Sat Apr 11 23:46:39 2020 rev:48 rq:793055 version:3.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2020-02-04 19:52:38.165296502 +0100 +++ /work/SRC/openSUSE:Factory/.gdal.new.3248/gdal.changes 2020-04-11 23:46:54.603105806 +0200 @@ -1,0 +2,8 @@ +Thu Apr 9 10:22:54 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Rework ECW5 SDK handling +- Fix build with ECW SDK 5.5 with upstream backports: + * gdal-ecwjp2-sdk-5.5.patch + * gdal-ecwjp2-sdk-5.5_dep1.patch + +------------------------------------------------------------------- New: ---- gdal-ecwjp2-sdk-5.5.patch gdal-ecwjp2-sdk-5.5_dep1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.ODkn0f/_old 2020-04-11 23:46:55.219106275 +0200 +++ /var/tmp/diff_new_pack.ODkn0f/_new 2020-04-11 23:46:55.219106275 +0200 @@ -36,6 +36,9 @@ Patch0: gdal-perl.patch # Fix occasional parallel build failure Patch1: GDALmake.opt.in.patch +# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/commit/e5cb5406ea9090b2f17cffeeb7ba5fb49e7158f2 + dep commit +Patch2: gdal-ecwjp2-sdk-5.5_dep1.patch +Patch3: gdal-ecwjp2-sdk-5.5.patch BuildRequires: KEALib-devel BuildRequires: autoconf BuildRequires: automake @@ -156,7 +159,10 @@ %prep %setup -q -n %{sourcename}-%{version} -%autopatch -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p2 +%patch3 -p2 # Set the right (build) libproj.so version, use the upper found version. PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') @@ -173,20 +179,14 @@ find . -type f -name "style_ogr_brush.png" -exec chmod 0644 {} \; find . -type f -name "style_ogr_sym.png" -exec chmod 0644 {} \; -#Fix wrong /usr/bin/env phyton +# Fix wrong /usr/bin/env phyton #Create the move to python3 find . -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} \; %if %{with ecw5_support} # gdal configure script looks for a given layout, so reproduce what is expected. -%if 0%{?suse_version} >= 1500 -%define ecw_abi_conf newabi -%else -%define ecw_abi_conf "" -%endif -mkdir -p ../ECW/Desktop_Read-Only/lib/%{ecw_abi_conf}/x64/release/ -mkdir -p ../ECW/Desktop_Read-Only/include -cp %{_libdir}/libNCSEcw* ../ECW/Desktop_Read-Only/lib/%{ecw_abi_conf}/x64/release/ -cp -r %{_includedir}/{ECW*,NCS*} ../ECW/Desktop_Read-Only/include/ +mkdir -p ../ECW/Desktop_Read-Only/lib/x64/ +ln -s %{_libdir} ../ECW/Desktop_Read-Only/lib/x64/release +ln -s %{_includedir} ../ECW/Desktop_Read-Only/include %endif %build ++++++ gdal-ecwjp2-sdk-5.5.patch ++++++ ++++ 775 lines (skipped) ++++++ gdal-ecwjp2-sdk-5.5_dep1.patch ++++++ 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;
