Accepting request 685448 from home:bruno_friedmann:branches:Application:Geo
- Update to bugfix version 1.4.3 - Add upstream patches (proj6 support and build fix) + e5cf016.patch + 7425a7f.patch - Packaging: spec-cleaner minimal - Add build dependency on graphviz to enable images in - spec file cleanup OBS-URL: https://build.opensuse.org/request/show/685448 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geotiff?expand=0&rev=20
This commit is contained in:
Git OBS Bridge
parent
cd196feff2
commit
842e0cf83f
22
7425a7f.patch
Normal file
22
7425a7f.patch
Normal file
@ -0,0 +1,22 @@
|
||||
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"
|
||||
|
||||
/************************************************************************/
|
||||
49
e5cf016.patch
Normal file
49
e5cf016.patch
Normal file
@ -0,0 +1,49 @@
|
||||
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,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 15 19:58:50 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
|
||||
|
||||
- Update to bugfix version 1.4.3
|
||||
- Add upstream patches (proj6 support and build fix)
|
||||
+ e5cf016.patch
|
||||
+ 7425a7f.patch
|
||||
- Packaging: spec-cleaner minimal
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 29 08:51:01 UTC 2018 - mpluskal@suse.com
|
||||
|
||||
|
||||
11
geotiff.spec
11
geotiff.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package geotiff
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,20 +12,24 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define sover 2
|
||||
%define libname lib%{name}%{sover}
|
||||
Name: geotiff
|
||||
Version: 1.4.2
|
||||
Version: 1.4.3
|
||||
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
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: pkgconfig
|
||||
@ -67,6 +71,7 @@ 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"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e
|
||||
size 1778991
|
||||
3
libgeotiff-1.4.3.tar.gz
Normal file
3
libgeotiff-1.4.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265
|
||||
size 1864829
|
||||
Loading…
x
Reference in New Issue
Block a user