Attachment 243140 Details for Bug 272311 – astro/gpscorrelate: make compatible with exiv2 0.28

[patch] astro/gpscorrelate: make compatible with exiv2 0.28

0011-astro-gpscorrelate-make-compatible-with-exiv2-0.28.patch (text/plain), 4.90 KB, created by Matthias Andree on 2023-07-02 14:55:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-02 14:55:13 UTC

Size: 4.90 KB

patch

obsolete

>From 418842280e793cd2014ebd7beea23f22c2b2d76d Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 14:53:49 +0200
>Subject: [PATCH 11/20] astro/gpscorrelate: make compatible with exiv2 0.28
>
>PR:		272311
>---
> astro/gpscorrelate/Makefile                 | 11 ++-
> astro/gpscorrelate/files/patch-exif-gps.cpp | 92 +++++++++++++++++++--
> 2 files changed, 95 insertions(+), 8 deletions(-)
>
>diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
>index 4c061b178349..ac88fc2e73d2 100644
>--- a/astro/gpscorrelate/Makefile
>+++ b/astro/gpscorrelate/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	gpscorrelate
> PORTVERSION=	1.6.1
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	astro geography
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -12,13 +12,18 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
> 		libgtkmm-2.4.so:x11-toolkits/gtkmm24
>+LIB_DEPENDS+=	libatk-1.0.so:accessibility/at-spi2-core
>+LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
>+LIB_DEPENDS+=	libfreetype.so:print/freetype2
>+LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz
> 
>-USES=		compiler:c++11-lang gmake gnome pkgconfig
>-USE_GNOME=	libxml2
>+USES=		compiler:c++11-lang gettext-runtime gmake gnome pkgconfig
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	freefoote
> 
>+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
>+
> PLIST_FILES=	bin/gpscorrelate bin/gpscorrelate-gui \
> 		man/man1/gpscorrelate.1.gz man/man1/gpscorrelate-gui.1.gz
> PORTDOCS=	*
>diff --git a/astro/gpscorrelate/files/patch-exif-gps.cpp b/astro/gpscorrelate/files/patch-exif-gps.cpp
>index 441fcf55569c..445e3cd75606 100644
>--- a/astro/gpscorrelate/files/patch-exif-gps.cpp
>+++ b/astro/gpscorrelate/files/patch-exif-gps.cpp
>@@ -1,13 +1,95 @@
>---- exif-gps.cpp.orig	2019-07-07 08:26:16 UTC
>+--- exif-gps.cpp.orig	2012-08-14 10:11:01 UTC
> +++ exif-gps.cpp
>-@@ -40,9 +40,7 @@
>+@@ -40,10 +40,8 @@
>  #include <sys/stat.h>
>  #include <unistd.h>
>  
>--
>--#include "exiv2/image.hpp"
>--#include "exiv2/exif.hpp"
> +#include <exiv2/exiv2.hpp>
>  
>+-#include "exiv2/image.hpp"
>+-#include "exiv2/exif.hpp"
>+-
>  #include "gpsstructure.h"
>  #include "exif-gps.h"
>+ 
>+@@ -87,7 +85,7 @@ char* ReadExifDate(char* File, int* IncludesGPS)
>+ {
>+ 	// Open and read the file.
>+ 	Exiv2::ExifData ExifRead;
>+-	Exiv2::Image::AutoPtr Image;
>++	Exiv2::Image::UniquePtr Image;
>+ 
>+ 	try {
>+ 		Image = Exiv2::ImageFactory::open(File);
>+@@ -150,7 +148,7 @@ char* ReadExifData(char* File, double* Lat, double* Lo
>+ 	// for display purposes. For the GUI version.
>+ 	// Open and read the file.
>+ 	Exiv2::ExifData ExifRead;
>+-	Exiv2::Image::AutoPtr Image;
>++	Exiv2::Image::UniquePtr Image;
>+ 
>+ 	try {
>+ 		Image = Exiv2::ImageFactory::open(File);
>+@@ -268,7 +266,7 @@ char* ReadExifData(char* File, double* Lat, double* Lo
>+ 
>+ 		// Is the altitude below sea level? If so, negate the value.
>+ 		GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"];
>+-		if (GPSData.count() >= 1 && GPSData.toLong() == 1)
>++		if (GPSData.count() >= 1 && GPSData.toInt64() == 1)
>+ 		{
>+ 			// Negate the elevation.
>+ 			*Elev = -*Elev;
>+@@ -289,7 +287,7 @@ char* ReadGPSTimestamp(char* File, char* DateStamp, ch
>+ 	// for display purposes. For the GUI version.
>+ 	// Open and read the file.
>+ 	Exiv2::ExifData ExifRead;
>+-	Exiv2::Image::AutoPtr Image;
>++	Exiv2::Image::UniquePtr Image;
>+ 
>+ 	try {
>+ 		Image = Exiv2::ImageFactory::open(File);
>+@@ -445,7 +443,7 @@ int WriteGPSData(char* File, struct GPSPoint* Point, c
>+ 	struct utimbuf utb;
>+ 	if (NoChangeMtime)
>+ 		stat(File, &statbuf);
>+-	Exiv2::Image::AutoPtr Image;
>++	Exiv2::Image::UniquePtr Image;
>+ 
>+ 	try {
>+ 		Image = Exiv2::ImageFactory::open(File);
>+@@ -473,7 +471,7 @@ int WriteGPSData(char* File, struct GPSPoint* Point, c
>+ 	// Do all the easy constant ones first.
>+ 	// GPSVersionID tag: standard says is should be four bytes: 02 00 00 00
>+ 	//  (and, must be present).
>+-	Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
>++	Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
>+ 	Value->read("2 0 0 0");
>+ 	ExifToWrite.add(Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"), Value.get());
>+ 	// Datum: the datum of the measured data. If not given, we insert WGS-84.
>+@@ -660,7 +658,7 @@ int WriteFixedDatestamp(char* File, time_t Time)
>+ 	struct utimbuf utb;
>+ 	stat(File, &statbuf);
>+ 
>+-	Exiv2::Image::AutoPtr Image;
>++	Exiv2::Image::UniquePtr Image;
>+ 
>+ 	try {
>+ 		Image = Exiv2::ImageFactory::open(File);
>+@@ -699,7 +697,7 @@ int WriteFixedDatestamp(char* File, time_t Time)
>+ 
>+ 	char ScratchBuf[100];
>+ 
>+-	Exiv2::Value::AutoPtr Value;
>++	Exiv2::Value::UniquePtr Value;
>+ 	Value = Exiv2::Value::create(Exiv2::signedRational);
>+ 	snprintf(ScratchBuf, 100, "%d/1 %d/1 %d/1",
>+ 			TimeStamp.tm_year + 1900,
>+@@ -737,7 +735,7 @@ int RemoveGPSExif(char* File, int NoChangeMtime)
>+ 		stat(File, &statbuf);
>+ 
>+ 	// Open the file and start reading.
>+-	Exiv2::Image::AutoPtr Image;
>++	Exiv2::Image::UniquePtr Image;
>+ 	
>+ 	try {
>+ 		Image = Exiv2::ImageFactory::open(File);
>-- 
>2.41.0
>

Flags:

mandree: maintainer-approval+

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176