PR#6: Add patch for upstream bug found by node-gdal tests - rpms/gdal

rpms / gdal

#6 Add patch for upstream bug found by node-gdal tests

Closed 6 years ago by praiskup. Opened 6 years ago by tomh.

rpms/ tomh/gdal srcbands into master

Add patch for bug by node-gdal tests and fixed upstream

Tom Hughes • 6 years ago

0994cd7

Link perl extension using a C++ compiler

Tom Hughes • 6 years ago

3fd04ce

Use libtirpc for RPC routines

Tom Hughes • 6 years ago

a1a6501

gdal-srcbands.patch

file added

+19

		`@@ -0,0 +1,19 @@`
		`+ commit 9128246d1ef1c01ca9ec1d5606b920b59edb8765`
		`+ Author: Tom Hughes <tom@compton.nu>`
		`+ Date: Wed Jan 24 09:37:48 2018 +0000`
		`+`
		`+ Use panSrcBands when accessing the source data`
		`+`
		`+ diff --git a/gdal/alg/gdalwarpoperation.cpp b/gdal/alg/gdalwarpoperation.cpp`
		`+ index b652506623..791ca67db9 100644`
		`+ --- a/gdal/alg/gdalwarpoperation.cpp`
		`+ +++ b/gdal/alg/gdalwarpoperation.cpp`
		`+ @@ -1776,7 +1776,7 @@ CPLErr GDALWarpOperation::WarpRegionToBuffer(`
		`+ if( psOptions->nBandCount == 1 )`
		`+ {`
		`+ // Particular case to simplify the stack a bit.`
		`+ - eErr = poSrcDS->GetRasterBand(psOptions->panDstBands[0])->RasterIO(`
		`+ + eErr = poSrcDS->GetRasterBand(psOptions->panSrcBands[0])->RasterIO(`
		`+ GF_Read,`
		`+ nSrcXOff, nSrcYOff, nSrcXSize, nSrcYSize,`
		`+ oWK.papabySrcImage[0], nSrcXSize, nSrcYSize,`

gdal.spec

file modified

+18 -4

		`@@ -62,7 +62,7 @@`

		`Name: gdal`
		`Version: 2.2.3`
		`- Release: 6%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}`
		`+ Release: 8%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}`
		`Summary: GIS file format library`
		`Group: System Environment/Libraries`
		`License: MIT`
		`@@ -97,6 +97,9 @@`

		`Patch10: %{name}-2.2.3_json-c_013.patch`

		`+ # https://github.com/OSGeo/gdal/pull/295`
		`+ Patch11: %{name}-srcbands.patch`
		`+`
		`BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)`

		`BuildRequires: ant`
		`@@ -185,6 +188,7 @@`
		`BuildRequires: xerces-c-devel`
		`BuildRequires: xz-devel`
		`BuildRequires: zlib-devel`
		`+ BuildRequires: libtirpc-devel`

		`# Run time dependency for gpsbabel driver`
		`Requires: gpsbabel`
		`@@ -335,6 +339,7 @@`
		`%patch8 -p1 -b .java~`
		`%patch9 -p1 -b .zlib~`
		`%patch10 -p1 -b .json-c_013~`
		`+ %patch11 -p2 -b .srcbands~`

		`# Copy in PROVENANCE.TXT-fedora`
		`cp -p %SOURCE4 .`
		`@@ -415,8 +420,8 @@`
		`%else`
		`export CFLAGS="$RPM_OPT_FLAGS -fpic"`
		`%endif`
		`- export CXXFLAGS="$CFLAGS -I%{_includedir}/libgeotiff"`
		`- export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"`
		`+ export CXXFLAGS="$CFLAGS -I%{_includedir}/libgeotiff -I%{_includedir}/tirpc"`
		`+ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff -I%{_includedir}/tirpc"`

		`# For future reference:`
		`# epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024`
		`@@ -429,7 +434,7 @@`
		`%endif`

		`%configure \`
		`- LIBS=-l%{g2clib} \`
		`+ LIBS="-l%{g2clib} -ltirpc" \`
		`--with-autoload=%{_libdir}/%{name}plugins \`
		`--datadir=%{_datadir}/%{name}/ \`
		`--includedir=%{_includedir}/%{name}/ \`
		`@@ -485,6 +490,8 @@`
		`POPPLER_OPTS="$POPPLER_OPTS POPPLER_0_58_OR_LATER=yes"`
		`%endif`

		`+ export PERL_MM_OPT="LD=g++"`
		`+`
		`make %{?_smp_mflags} $POPPLER_OPTS`

		`make man`
		`@@ -882,6 +889,13 @@`
		`#Or as before, using ldconfig`

		`%changelog`
		`+ * Wed Jan 24 2018 Tom Hughes <tom@compton.nu> - 2.2.3-8`
		`+ - Add patch for bug by node-gdal tests and fixed upstream`
		`+`
		`+ * Wed Jan 24 2018 Tom Hughes <tom@compton.nu> - 2.2.3-7`
		`+ - Use libtirpc for RPC routines`
		`+ - Link perl extension using a C++ compiler`
		`+`
		`* Sat Jan 27 2018 Than Ngo <than@redhat.com> - - 2.2.3-6`
		`- cleanup condition`