From nobody Sun Jul 09 22:09:34 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzhBQ4QJzz4mqtv; Sun, 9 Jul 2023 22:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzhBQ3pj7z3C2q; Sun, 9 Jul 2023 22:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/7mE0246XmIrYkbkqEom4BnajqavnvrPBc/e1E/d3g=; b=NghdiDd7/rx03uhLjehbIf4DxlqgHkwzJxyXzRPnl2+9/vYonqfkkK7ZGiVrh6x9+qx7y9 fxqPpHCzDXPktTTOk6dEdbI/iglR9eGS30bDbvlMT2+9YeB+O0Y0VzR9QTDKzZJLiTndd7 ItJQgmacl2YayoLSemXoohuydae4DHEmLgN+YvSzxW1fMkasyp91chiXKoMZ9wdiBYYbm2 afUcL78BIxrbQjpw3JTa+Grlj6+CD4QLZZAo9PhGEqS9jiHpO2u+JO02eHo1hWlZrp11Lw 1QIAU24KMemexHlScreGwOunUsuP9/8awhqNDznBNGi0haauAQ8dYS20Nzh96Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/7mE0246XmIrYkbkqEom4BnajqavnvrPBc/e1E/d3g=; b=g1CWcjvJWUGwBX9urXaXQNcF+K82xXgWI3EgcNx5ECMdqNjlIvaLTEPQVF/eVVvJ5E7+CH 5Oo6k6NHIUuK3SA1lmJBw9zlehZMjEafChp1Lbk27ageJYOGxkJmeRgdZRq6pfuagN9ldK KZrZ9dlK66o8TN2yPBBMKhR0LxHgN5OoIti+OaCtcKakk++Gw2hqbCmTi6iHGGl0APw0b8 0SJgwtfTN95e9CmeyPqoFfXL7Asy4N8GBoJuJMGV19+njkjr6ZmhMLVmVUGodxk9jkQn1E KhPJGzIdm4rHxFONh8U3theblfU1kq/QKXdnQefXSwQ6b4vqMVpDqyIG4asSMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940574; a=rsa-sha256; cv=none; b=YJgyFarN6JzqbafoV+hwsyAaFuAT3/8DUJiyXQ0UOyep2N6xC37GWUnQCFf1YgFX5HQSKh NhJ/YtR8WZaOPsAmVLzWdEQlNJMxSpjEcM/4Rrzh6cz6eOdO3YA41dsZYy3WvqD65QZLQ+ 2hP2wSvpTOlK3FbRDQY+xtCjEUqusMApDtgwsu6av46VdzvLWSAwhcbz/D8T70Q1WY14hh htngOfMvstvgQA12PGmll2fa7BA1gD06oxZt6bg1TTbNqmHemjG9rEfSVf1cUHK72iHz9g armoLzg68hmz/jv8LM888ovVgOJQmeF+ZWMUlsFFf48Izhn3s+wqAMv/3JIU2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzhBQ2wVkzKsh; Sun, 9 Jul 2023 22:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369M9YwA034178; Sun, 9 Jul 2023 22:09:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9YcP034177; Sun, 9 Jul 2023 22:09:34 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:34 GMT Message-Id: <202307092209.369M9YcP034177@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: f13af80790bd - main - astro/gpscorrelate: make compatible with exiv2 0.28 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f13af80790bd8020ef983cef5ad252972bf316ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=f13af80790bd8020ef983cef5ad252972bf316ec commit f13af80790bd8020ef983cef5ad252972bf316ec Author: Matthias Andree AuthorDate: 2023-07-02 12:53:49 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:08 +0000 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 #include -- --#include "exiv2/image.hpp" --#include "exiv2/exif.hpp" +#include +-#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);