pool/gdal
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 498833 from home:bruno_friedmann:branches:Application:Geo

Browse Source 
- New upstream release 2.2.0 
  - https://trac.osgeo.org/gdal/wiki/Release/2.2.0-News
- Packaging 
  + add patch gdal-upstream-issue#6898-changeset#38636.patch 
    fixing non void return garbage in swig/perl.
  + redone patches against 2.2.0
    gdal-libproj.patch
    GDALmake.opt.in.patch
    gdal-perl.patch

OBS-URL: https://build.opensuse.org/request/show/498833
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=41
This commit is contained in:
Martin Pluskal 2017-05-28 11:31:48 +00:00 committed by Git OBS Bridge
parent b34d269f69
commit 933dd98482
8 changed files with 114 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GDALmake.opt.in.patch
View File

@ -1,7 +1,7 @@
diff -rup gdal-2.1.0-orig/GDALmake.opt.in gdal-2.1.0/GDALmake.opt.in
--- gdal-2.1.0-orig/GDALmake.opt.in 2016-04-25 20:35:57.000000000 +0300
+++ gdal-2.1.0/GDALmake.opt.in 2016-05-10 05:25:25.988438174 +0300
@@ -68,7 +68,7 @@ INST_DOCS = @exec_prefix@/doc
diff -rup a/GDALmake.opt.in b/GDALmake.opt.in
--- a/GDALmake.opt.in 2017-04-28 18:07:38.000000000 +0200
+++ b/GDALmake.opt.in 2017-05-19 21:11:58.318459759 +0200
@@ -67,7 +67,7 @@ INST_DOCS = @exec_prefix@/doc
INST_MAN = @mandir@
INST_HTML = $(HOME)/www/gdal

3
gdal-2.1.3.tar.xz
View File

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

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

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

12
gdal-libproj.patch
View File

@ -1,12 +1,12 @@
diff -rup a/ogr/ogrct.cpp b/ogr/ogrct.cpp
--- a/ogr/ogrct.cpp 2016-01-26 16:21:46.000000000 +0100
+++ b/ogr/ogrct.cpp 2016-02-23 12:41:38.368276062 +0100
@@ -92,7 +92,7 @@ static void (*pfn_pj_ctx_free)( projC
--- a/ogr/ogrct.cpp 2017-04-28 18:07:33.000000000 +0200
+++ b/ogr/ogrct.cpp 2017-05-19 21:06:54.145528449 +0200
@@ -102,7 +102,7 @@ static bool bProjLocaleSafe = false
#elif defined(__APPLE__)
# define LIBNAME "libproj.dylib"
# define LIBNAME "libproj.dylib"
#else
-# define LIBNAME "libproj.so"
+# define LIBNAME "libproj.so.12"
-# define LIBNAME "libproj.so"
+# define LIBNAME "libproj.so.12"
#endif
/************************************************************************/

10
gdal-perl.patch
View File

@ -1,7 +1,7 @@
diff -rup a/swig/perl/GNUmakefile b/swig/perl/GNUmakefile
--- a/swig/perl/GNUmakefile 2015-06-14 21:06:33.000000000 +0200
+++ b/swig/perl/GNUmakefile 2015-07-26 19:09:56.184743728 +0200
@@ -26,7 +26,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
--- a/swig/perl/GNUmakefile 2017-04-28 18:07:38.000000000 +0200
+++ b/swig/perl/GNUmakefile 2017-05-19 21:09:04.906101672 +0200
@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
gdal_wrap.cc: generate
Makefile_Geo__GDAL:
@ -11,8 +11,8 @@ diff -rup a/swig/perl/GNUmakefile b/swig/perl/GNUmakefile
test: build
$(MAKE) -f Makefile_Geo__GDAL test
diff -rup a/swig/perl/Makefile b/swig/perl/Makefile
--- a/swig/perl/Makefile 2015-06-14 21:06:33.000000000 +0200
+++ b/swig/perl/Makefile 2015-07-26 19:09:30.598745454 +0200
--- a/swig/perl/Makefile 2017-04-28 18:07:38.000000000 +0200
+++ b/swig/perl/Makefile 2017-05-19 21:09:20.618146109 +0200
@@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL
$(MAKE) -f Makefile_Geo__OSR

68
gdal-upstream-issue#6898-changeset#38636.patch Normal file
View File

@ -0,0 +1,68 @@
Index: swig/include/perl/band.i
===================================================================
--- a/swig/include/perl/band.i (revision 38635)
+++ b/swig/include/perl/band.i (revision 38636)
@@ -4,5 +4,5 @@
double NVClassify(int comparison, double nv, AV* classifier, const char **error) {
/* recursive, return nv < classifier[0] ? classifier[1] : classifier[2]
- returns error if there are not three values in the classifier,
+ sets error if there are not three values in the classifier,
first is not a number, or second or third are not a number of arrayref
*/
@@ -33,16 +33,13 @@
else if (t && SvROK(*t) && (SvTYPE(SvRV(*t)) == SVt_PVAV))
return NVClassify(comparison, nv, (AV*)(SvRV(*t)), error);
- else {
+ else
*error = "The decision in a classifier must be a number or a reference to a classifier.";
- return 0;
- }
- } else {
+ } else
*error = "The first value in a classifier must be a number.";
- return 0;
- }
+ return 0;
}
void NVClass(int comparison, double nv, AV* classifier, int *klass, const char **error) {
- /* recursive, return nv < classifier[0] ? classifier[1] : classifier[2]
- returns NULL if there are not three values in the classifier,
+ /* recursive, return in klass nv < classifier[0] ? classifier[1] : classifier[2]
+ sets error if there are not three values in the classifier,
first is not a number, or second or third are not a number of arrayref
*/
@@ -78,12 +75,8 @@
else if (t && SvROK(*t) && (SvTYPE(SvRV(*t)) == SVt_PVAV))
NVClass(comparison, nv, (AV*)(SvRV(*t)), klass, error);
- else {
+ else
*error = "The decision in a classifier must be a number or a reference to a classifier.";
- return;
- }
- } else {
+ } else
*error = "The first value in a classifier must be a number.";
- return;
- }
}
AV* to_array_classifier(SV* classifier, int* comparison, const char **error) {
@@ -101,6 +94,8 @@
else if (strcmp(c, ">=") == 0)
*comparison = 3;
- else
+ else {
*error = "The first element in classifier object must be a comparison.";
+ return NULL;
+ }
}
if (s && SvROK(*s) && (SvTYPE(SvRV(*s)) == SVt_PVAV))
@@ -108,7 +103,7 @@
else
*error = "The second element in classifier object must be an array reference.";
- } else {
+ } else
*error = NEED_ARRAY_REF;
- }
+ return NULL;
}
%}

13
gdal.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed May 24 09:00:11 UTC 2017 - bruno@ioda-net.ch
- New upstream release 2.2.0
- https://trac.osgeo.org/gdal/wiki/Release/2.2.0-News
- Packaging
+ add patch gdal-upstream-issue#6898-changeset#38636.patch
fixing non void return garbage in swig/perl.
+ redone patches against 2.2.0
gdal-libproj.patch
GDALmake.opt.in.patch
gdal-perl.patch
-------------------------------------------------------------------
Fri Feb 3 12:00:00 UTC 2017 - Angelos Tzotsos <tzotsos@opensuse.org>

21
gdal.spec
View File

@ -23,7 +23,7 @@
%define sourcename gdal
Name: gdal
Version: 2.1.3
Version: 2.2.0
Release: 0
Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats
License: MIT and BSD-3-Clause and SUSE-Public-Domain
@ -36,6 +36,8 @@ Patch1: GDALmake.opt.in.patch
# Fix hard coded name of libproj library
# But libproj.so is valid if libproj-devel is installed ?
Patch2: gdal-libproj.patch
# Upstream issue #6898 changeset #38636
Patch3: gdal-upstream-issue#6898-changeset#38636.patch
BuildRequires: blas-devel
BuildRequires: chrpath
BuildRequires: curl-devel
@ -44,10 +46,10 @@ BuildRequires: doxygen >= 1.4.2
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: geos-devel >= 3
BuildRequires: geotiff-devel >= 1.2.1
BuildRequires: giflib-devel
BuildRequires: lapack-devel
BuildRequires: libexpat-devel >= 1.95.0
BuildRequires: geotiff-devel >= 1.2.1
# No more please we have openjpeg2
# BuildRequires: libjasper-devel
# Using jasper create build error on arm, powerpc, s390
@ -158,6 +160,7 @@ The GDAL python modules provide support to handle multiple GIS file formats.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
@ -168,11 +171,8 @@ for F in frmt_twms_srtm.xml frmt_wms_bluemarble_s3_tms.xml frmt_wms_virtualearth
done
%build
# need to regenerate (old one does not accpet CFLAGS)
%if 0%{?suse_version} >= 1310
mv configure.in configure.ac
# need to regenerate (old one does not accept CFLAGS)
autoreconf -fi
%endif
%configure \
--prefix=%{_prefix} \
@ -263,11 +263,13 @@ rm -f html/do-not-remove
# chrpath must be removed here
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so
@ -342,11 +344,14 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_bindir}/gdaltindex
%{_bindir}/gdaltransform
%{_bindir}/gdalwarp
%{_bindir}/gnmanalyse
%{_bindir}/gnmmanage
%{_bindir}/mkgraticule.py
%{_bindir}/nearblack
%{_bindir}/ogr2ogr
%{_bindir}/ogrinfo
%{_bindir}/ogrlineref
%{_bindir}/ogrmerge.py
%{_bindir}/ogrtindex
%{_bindir}/pct2rgb.py
%{_bindir}/rgb2pct.py
@ -388,6 +393,7 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{_mandir}/man1/ogr_utilities.1*
%{_mandir}/man1/ogrinfo.1*
%{_mandir}/man1/ogrlineref.1*
%{_mandir}/man1/ogrmerge.1*
%{_mandir}/man1/ogrtindex.1*
%{_mandir}/man1/pct2rgb.1*
%{_mandir}/man1/rgb2pct.1*
@ -410,6 +416,7 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%{perl_vendorarch}/Geo/GDAL.pm
%dir %{perl_vendorarch}/Geo/GDAL
%{perl_vendorarch}/Geo/GDAL/Const.pm
%{perl_vendorarch}/Geo/GNM.pm
%{perl_vendorarch}/Geo/OGR.pm
%{perl_vendorarch}/Geo/OSR.pm
%dir %{perl_vendorarch}/Geo
@ -418,6 +425,8 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
%dir %{perl_vendorarch}/auto/Geo/GDAL/Const
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
%dir %{perl_vendorarch}/auto/Geo/GNM
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GNM/GNM.so
%dir %{perl_vendorarch}/auto/Geo/OGR
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OGR/OGR.so
%dir %{perl_vendorarch}/auto/Geo/OSR