Accepting request 692317 from Application:Geo
OBS-URL: https://build.opensuse.org/request/show/692317 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geotiff?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fef62417ca
@ -1,22 +0,0 @@
|
||||
From 7425a7fc314b27efd2141191f756810c8e936edd Mon Sep 17 00:00:00 2001
|
||||
From: Even Rouault <even.rouault@spatialys.com>
|
||||
Date: Sat, 8 Dec 2018 17:46:17 +0100
|
||||
Subject: [PATCH] geotiff_proj4.c: temporarily add
|
||||
ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
|
||||
|
||||
---
|
||||
libgeotiff/geotiff_proj4.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libgeotiff/geotiff_proj4.c b/libgeotiff/geotiff_proj4.c
|
||||
index f84f449..73ddcca 100644
|
||||
--- a/libgeotiff/geotiff_proj4.c
|
||||
+++ b/libgeotiff/geotiff_proj4.c
|
||||
@@ -1374,6 +1374,7 @@ int GTIFProj4FromLatLong( GTIFDefn * psDefn, int nPoints,
|
||||
}
|
||||
#else
|
||||
|
||||
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
|
||||
#include "proj_api.h"
|
||||
|
||||
/************************************************************************/
|
||||
@ -1,49 +0,0 @@
|
||||
From e5cf016d4df42c27c483234260a1cc733712909f Mon Sep 17 00:00:00 2001
|
||||
From: Even Rouault <even.rouault@spatialys.com>
|
||||
Date: Sat, 8 Dec 2018 17:55:12 +0100
|
||||
Subject: [PATCH] applygeo.c and geotifcp.c: fix compiler warnings
|
||||
|
||||
---
|
||||
libgeotiff/bin/applygeo.c | 6 ++++++
|
||||
libgeotiff/bin/geotifcp.c | 4 ++--
|
||||
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libgeotiff/bin/applygeo.c b/libgeotiff/bin/applygeo.c
|
||||
index 3c61b8d..49641fd 100644
|
||||
--- a/libgeotiff/bin/applygeo.c
|
||||
+++ b/libgeotiff/bin/applygeo.c
|
||||
@@ -80,6 +80,12 @@ main(int argc, char *argv[])
|
||||
char *geofile;
|
||||
char *tiffile;
|
||||
int rc;
|
||||
+
|
||||
+ if( argc != 3 )
|
||||
+ {
|
||||
+ fprintf(stderr, usage, "applygeo");
|
||||
+ exit(1);
|
||||
+ }
|
||||
|
||||
prog = argv[0];
|
||||
geofile = argv[1];
|
||||
diff --git a/libgeotiff/bin/geotifcp.c b/libgeotiff/bin/geotifcp.c
|
||||
index 460c273..78ba0cc 100644
|
||||
--- a/libgeotiff/bin/geotifcp.c
|
||||
+++ b/libgeotiff/bin/geotifcp.c
|
||||
@@ -741,7 +741,7 @@ DECLAREcpFunc(cpContig2ContigByRow_8_to_4)
|
||||
|
||||
printf( "Downsample\n" );
|
||||
|
||||
- (void) imagewidth; (void) spp;
|
||||
+ (void) spp;
|
||||
for (row = 0; row < imagelength; row++) {
|
||||
int i_in, i_out_byte;
|
||||
|
||||
@@ -749,7 +749,7 @@ DECLAREcpFunc(cpContig2ContigByRow_8_to_4)
|
||||
goto done;
|
||||
|
||||
for( i_in = 0, i_out_byte = 0;
|
||||
- i_in < imagewidth;
|
||||
+ (unsigned)i_in < imagewidth;
|
||||
i_in += 2, i_out_byte++ )
|
||||
{
|
||||
buf_out[i_out_byte] =
|
||||
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 2 11:27:36 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
|
||||
|
||||
- Update to version 1.5.1 (support gdal 2.4.1)
|
||||
- Remove merged upstream patch f4956251.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 25 18:42:34 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
|
||||
|
||||
- Add upstream patch f4956251.patch to make it useable with gdal
|
||||
2.4.1
|
||||
- Upstream issue https://github.com/OSGeo/libgeotiff/issues/14
|
||||
Simplify fixing file (all are utf-8 ok) just CRLF
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 24 10:14:03 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
|
||||
|
||||
- Update to version 1.5.
|
||||
+ Require PROJ >= 6 dependency
|
||||
+ Remove all CSV files used by geo_normalize API, libgeotiff now
|
||||
relies on PROJ database for EPSG CRS definitions.
|
||||
+ geo_normalize.c: SetGTParmIds(): use
|
||||
ProjStraightVertPoleLongGeoKey for CT_PolarStereographic
|
||||
+ geo_normalize.c: report StdParallel1 for Mercator_2SP when a
|
||||
PCS code is used
|
||||
+ geo_normalize.c: fix support for Laborde Oblique Mercator
|
||||
+ listgeo: use PROJ database to display non-hardcoded values of
|
||||
a number of keys
|
||||
- Packaging
|
||||
+ Remove unneeded patches e5cf016.patch 7425a7f.patch
|
||||
+ Move URL & source to https
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 15 19:58:50 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
|
||||
|
||||
|
||||
52
geotiff.spec
52
geotiff.spec
@ -16,25 +16,23 @@
|
||||
#
|
||||
|
||||
|
||||
%define sover 2
|
||||
%define sover 5
|
||||
%define libname lib%{name}%{sover}
|
||||
Name: geotiff
|
||||
Version: 1.4.3
|
||||
Version: 1.5.1
|
||||
Release: 0
|
||||
Summary: Library to handle georeferenced TIFF
|
||||
License: MIT AND SUSE-Public-Domain
|
||||
Group: Productivity/Scientific/Other
|
||||
URL: http://trac.osgeo.org/geotiff
|
||||
Source0: http://download.osgeo.org/%{name}/lib%{name}/lib%{name}-%{version}.tar.gz
|
||||
# UPSTREAM PATCH (proj6 support)
|
||||
Patch0: https://github.com/OSGeo/libgeotiff/commit/7425a7f.patch
|
||||
# UPSTREAM PATCH (fix compiler warning)
|
||||
Patch1: https://github.com/OSGeo/libgeotiff/commit/e5cf016.patch
|
||||
URL: https://github.com/OSGeo/libgeotiff
|
||||
Source0: https://download.osgeo.org/%{name}/lib%{name}/lib%{name}-%{version}.tar.gz
|
||||
# UPSTREAM Patch (geotif) to be used with gdal 2.4.1
|
||||
# Patch0: https://github.com/OSGeo/libgeotiff/commit/f4956251.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libtiff-4)
|
||||
BuildRequires: pkgconfig(proj)
|
||||
BuildRequires: pkgconfig(proj) >= 6.0
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%description
|
||||
@ -71,21 +69,16 @@ GeoTIFF keys in new files.
|
||||
%prep
|
||||
|
||||
%setup -q -n lib%{name}-%{version}
|
||||
%autopatch -p2
|
||||
for f in `find . -type f` ; do
|
||||
if file $f | grep -q ISO-8859 ; then
|
||||
echo "Fix encoding for $f"
|
||||
set -x
|
||||
iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
|
||||
mv -f ${f}.tmp $f
|
||||
set +x
|
||||
fi
|
||||
if file $f | grep -q CRLF ; then
|
||||
echo "Fix line ends for $f"
|
||||
set -x
|
||||
sed -i -e 's|\r||g' $f
|
||||
set +x
|
||||
fi
|
||||
#%%autopatch -p2
|
||||
|
||||
for f in `find . -type f`
|
||||
do
|
||||
if file $f | grep -q CRLF ; then
|
||||
echo "Fix line ends for $f"
|
||||
set -x
|
||||
sed -i -e 's|\r||g' $f
|
||||
set +x
|
||||
fi
|
||||
done
|
||||
|
||||
%build
|
||||
@ -121,7 +114,6 @@ EOF
|
||||
|
||||
install -Dpm 0644 lib%{name}.pc \
|
||||
%{buildroot}%{_libdir}/pkgconfig/lib%{name}.pc
|
||||
echo >> %{buildroot}%{_datadir}/epsg_csv/codes.csv
|
||||
# do not ship la files
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
@ -130,27 +122,23 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%files
|
||||
%license LICENSE COPYING
|
||||
%doc ChangeLog README
|
||||
%doc ChangeLog README NEWS
|
||||
%{_bindir}/geotifcp
|
||||
%{_bindir}/listgeo
|
||||
%{_bindir}/applygeo
|
||||
%{_mandir}/man1/listgeo.1%{?ext_man}
|
||||
%{_mandir}/man1/applygeo.1%{?ext_man}
|
||||
%{_mandir}/man1/geotifcp.1%{?ext_man}
|
||||
%dir %{_datadir}/epsg_csv
|
||||
%attr(0755,root,root) %{_datadir}/epsg_csv/csv2c.py*
|
||||
%attr(0755,root,root) %{_datadir}/epsg_csv/csv_tools.py*
|
||||
%attr(0644,root,root) %{_datadir}/epsg_csv/*.csv
|
||||
|
||||
%files -n %{libname}
|
||||
%license LICENSE COPYING
|
||||
%doc ChangeLog README
|
||||
%doc ChangeLog README NEWS
|
||||
%{_libdir}/lib%{name}.so.%{sover}*
|
||||
|
||||
%files devel
|
||||
%defattr(0644,root,root,0755)
|
||||
%license LICENSE COPYING
|
||||
%doc ChangeLog README
|
||||
%doc ChangeLog README NEWS
|
||||
%dir %{_includedir}/lib%{name}
|
||||
%{_includedir}/lib%{name}/*.h
|
||||
%{_includedir}/lib%{name}/*.inc
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265
|
||||
size 1864829
|
||||
3
libgeotiff-1.5.1.tar.gz
Normal file
3
libgeotiff-1.5.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c
|
||||
size 528083
|
||||
Loading…
x
Reference in New Issue
Block a user