CVS commit: pkgsrc/geography/gipfel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 13 09:31:07 UTC 2023

Modified Files:
        pkgsrc/geography/gipfel: Makefile distinfo
        pkgsrc/geography/gipfel/patches: patch-src_ImageMetaData.cxx

Log Message:
gipfel: fix build with exiv2 0.28.0

Patch mailed upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/geography/gipfel/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/gipfel/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/geography/gipfel/patches/patch-src_ImageMetaData.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gipfel/Makefile
diff -u pkgsrc/geography/gipfel/Makefile:1.24 pkgsrc/geography/gipfel/Makefile:1.25
--- pkgsrc/geography/gipfel/Makefile:1.24       Sat Jul  1 22:16:34 2023
+++ pkgsrc/geography/gipfel/Makefile    Thu Jul 13 09:31:07 2023
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2023/07/01 22:16:34 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/07/13 09:31:07 wiz Exp $
 
 DISTNAME=      gipfel-0.4.0
 PKGREVISION=   11
 CATEGORIES=    geography graphics
-MASTER_SITES=  http://www.ecademix.com/JohannesHofmann/
+MASTER_SITES=  https://flpsed.org/
 
 MAINTAINER=    johannes.hofmann%gmx.de@localhost
-#HOMEPAGE=     http://www.ecademix.com/JohannesHofmann/gipfel.html
-COMMENT=       Photogrammetry For Mountain Images
+HOMEPAGE=      https://flpsed.org/gipfel.html
+COMMENT=       Photogrammetry for mountain images
 LICENSE=       gnu-gpl-v3
 
 GNU_CONFIGURE= yes

Index: pkgsrc/geography/gipfel/distinfo
diff -u pkgsrc/geography/gipfel/distinfo:1.6 pkgsrc/geography/gipfel/distinfo:1.7
--- pkgsrc/geography/gipfel/distinfo:1.6        Tue Oct 26 10:45:09 2021
+++ pkgsrc/geography/gipfel/distinfo    Thu Jul 13 09:31:07 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:45:09 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/07/13 09:31:07 wiz Exp $
 
 BLAKE2s (gipfel-0.4.0.tar.gz) = dd95234e479df818c5b41fd8b5b34a84d5cc21319c59b50889a323d65509c479
 SHA512 (gipfel-0.4.0.tar.gz) = d8deeae94ce7b9e6a1a4ca19296a1c19e91b0ccdecef320ad9857441e06a96e07ee1f8432f59fe484f39f69d00654d2e622799491e7c982e22ac69211ba2b793
 Size (gipfel-0.4.0.tar.gz) = 496685 bytes
-SHA1 (patch-src_ImageMetaData.cxx) = 123e06d21d78e8447318d185f05cc46d9700c4fe
+SHA1 (patch-src_ImageMetaData.cxx) = d28c775edb7dc958d60439f95aefaa1fb8c1cfc5

Index: pkgsrc/geography/gipfel/patches/patch-src_ImageMetaData.cxx
diff -u pkgsrc/geography/gipfel/patches/patch-src_ImageMetaData.cxx:1.1 pkgsrc/geography/gipfel/patches/patch-src_ImageMetaData.cxx:1.2
--- pkgsrc/geography/gipfel/patches/patch-src_ImageMetaData.cxx:1.1     Fri Mar 20 20:46:04 2020
+++ pkgsrc/geography/gipfel/patches/patch-src_ImageMetaData.cxx Thu Jul 13 09:31:07 2023
@@ -1,12 +1,97 @@
-$NetBSD: patch-src_ImageMetaData.cxx,v 1.1 2020/03/20 20:46:04 joerg Exp $
+$NetBSD: patch-src_ImageMetaData.cxx,v 1.2 2023/07/13 09:31:07 wiz Exp $
 
---- src/ImageMetaData.cxx.orig 2020-03-20 19:11:56.000675904 +0000
+Fix build with exiv2 0.28.0
+
+--- src/ImageMetaData.cxx.orig 2010-03-11 12:36:30.000000000 +0000
 +++ src/ImageMetaData.cxx
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,8 @@
  
  #include <exiv2/image.hpp>
  #include <exiv2/exif.hpp>
 +#include <exiv2/error.hpp>
++#include <exiv2/version.hpp>
  
  #include "../config.h"
  #include "ImageMetaData.H"
+@@ -102,12 +104,16 @@ exifSetCoordinate(double *destVal, Exiv2
+ 
+ int
+ ImageMetaData::load_image_exif(char *name) {
++#if EXIV2_TEST_VERSION(0,28,0)
++      Exiv2::Image::UniquePtr image;
++#else
+       Exiv2::Image::AutoPtr image;
++#endif
+ 
+       try {
+               image = Exiv2::ImageFactory::open(name);
+               image->readMetadata();
+-      } catch (Exiv2::Error error) {
++      } catch (Exiv2::Error &error) {
+               fprintf(stderr, "Error reading metadata\n");
+               return 1;
+       }
+@@ -134,19 +140,19 @@ ImageMetaData::load_image_exif(char *nam
+                       _model = strdup(pos->toString().c_str());
+       }
+ 
+-    if (isnan(_focal_length))
++    if (std::isnan(_focal_length))
+               exifSetValue(&_focal_length, &exifData, "Exif.Photo.FocalLength");
+ 
+-    if (isnan(_focal_length_35mm))
++    if (std::isnan(_focal_length_35mm))
+               exifSetValue(&_focal_length_35mm, &exifData, "Exif.Photo.FocalLengthIn35mmFilm");
+ 
+-    if (isnan(_longitude))
++    if (std::isnan(_longitude))
+               exifSetCoordinate(&_longitude, &exifData, "Exif.GPSInfo.GPSLongitude");
+ 
+-    if (isnan(_latitude))
++    if (std::isnan(_latitude))
+               exifSetCoordinate(&_latitude, &exifData, "Exif.GPSInfo.GPSLatitude");
+ 
+-    if (isnan(_height))
++    if (std::isnan(_height))
+               exifSetValue(&_height, &exifData, "Exif.GPSInfo.GPSAltitude");
+ 
+     return 0;
+@@ -170,12 +176,16 @@ ImageMetaData::load_image_jpgcom(char *n
+     double lo, la, he, dir, ni, ti, fr, k0, k1, x0 = 0.0;
+     int pt = 0;
+     int n, ret = 1;
++#if EXIV2_TEST_VERSION(0,28,0)
++      Exiv2::Image::UniquePtr image;
++#else
+       Exiv2::Image::AutoPtr image;
++#endif
+ 
+       try {
+               image = Exiv2::ImageFactory::open(name);
+               image->readMetadata();
+-      } catch (Exiv2::Error error) {
++      } catch (Exiv2::Error &error) {
+               fprintf(stderr, "Error reading metadata\n");
+               return 1;
+       }
+@@ -245,7 +255,11 @@ ImageMetaData::save_image_jpgcom(char *i
+ 
+       close(in_fd);
+ 
++#if EXIV2_TEST_VERSION(0,28,0)
++    Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(tmpname);
++#else
+     Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(tmpname);
++#endif
+     if (!image.get())
+               err++;
+ 
+@@ -267,7 +281,7 @@ ImageMetaData::save_image_jpgcom(char *i
+ 
+       try {
+               image->writeMetadata();
+-      } catch (Exiv2::Error error) {
++      } catch (Exiv2::Error &error) {
+               fprintf(stderr, "Error writing metadata\n");
+               err++;
+       }