[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpscorrelate/files/, sci-geosciences/gpscorrelate/
commit: 40c5fd9857ca17b583abc7627acfa9547f2f4283
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 20 17:02:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 20 17:07:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c5fd98
sci-geosciences/gpscorrelate: Fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/906498
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gpscorrelate-2.0-exiv2-0.28.patch| 135 +
.../gpscorrelate/gpscorrelate-2.0.ebuild | 1 +
2 files changed, 136 insertions(+)
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch
new file mode 100644
index ..f15032fd7c77
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch
@@ -0,0 +1,135 @@
+From 7c945a5c9116325dad795dbe9682c2c4a4dea2d9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 20 Aug 2023 18:57:43 +0200
+Subject: [PATCH] Fix build with >=exiv2-0.28
+
+Fixes https://github.com/dfandrich/gpscorrelate/issues/22
+
+Signed-off-by: Andreas Sturmlechner
+---
+ exif-gps.cpp | 37 +
+ 1 file changed, 37 insertions(+)
+
+diff --git a/exif-gps.cpp b/exif-gps.cpp
+index d464d62..71b46ef 100644
+--- a/exif-gps.cpp
b/exif-gps.cpp
+@@ -44,6 +44,7 @@
+ #include "exiv2/image.hpp"
+ #include "exiv2/exif.hpp"
+ #include "exiv2/error.hpp"
++#include "exiv2/version.hpp"
+
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
+@@ -97,7 +98,11 @@ int main(int argc, char* argv[])
+ char* ReadExifDate(const char* File, int* IncludesGPS)
+ {
+ // Open and read the file.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ Exiv2::Image::UniquePtr Image;
++#else
+ Exiv2::Image::AutoPtr Image;
++#endif
+
+ try {
+ Image = Exiv2::ImageFactory::open(File);
+@@ -154,7 +159,11 @@ char* ReadExifData(const char* File, double* Lat, double*
Long, double* Elev, in
+ // much more data than the last, specifically
+ // for display purposes. For the GUI version.
+ // Open and read the file.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ Exiv2::Image::UniquePtr Image;
++#else
+ Exiv2::Image::AutoPtr Image;
++#endif
+
+ try {
+ Image = Exiv2::ImageFactory::open(File);
+@@ -273,7 +282,11 @@ char* ReadExifData(const char* File, double* Lat, double*
Long, double* Elev, in
+
+ // Is the altitude below sea level? If so, negate the value.
+ GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"];
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ if (GPSData.count() >= 1 && GPSData.toUint32() == 1)
++#else
+ if (GPSData.count() >= 1 && GPSData.toLong() == 1)
++#endif
+ {
+ // Negate the elevation.
+ *Elev = -*Elev;
+@@ -292,7 +305,11 @@ char* ReadGPSTimestamp(const char* File, char* DateStamp,
char* TimeStamp, int*
+ // much more data than the last, specifically
+ // for display purposes. For the GUI version.
+ // Open and read the file.
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ Exiv2::Image::UniquePtr Image;
++#else
+ Exiv2::Image::AutoPtr Image;
++#endif
+
+ try {
+ Image = Exiv2::ImageFactory::open(File);
+@@ -463,7 +480,11 @@ int WriteGPSData(const char* File, const struct GPSPoint*
Point,
+ struct utimbuf utb;
+ if (NoChangeMtime)
+ stat(File, );
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ Exiv2::Image::UniquePtr Image;
++#else
+ Exiv2::Image::AutoPtr Image;
++#endif
+
+ try {
+ Image = Exiv2::ImageFactory::open(File);
+@@ -493,7 +514,11 @@ int WriteGPSData(const char* File, const struct GPSPoint*
Point,
+ // Do all the easy constant ones first.
+ // GPSVersionID tag: standard says it should be four bytes: 02 02 00 00
+ // (and, must be present).
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ Exiv2::Value::UniquePtr Value =
Exiv2::Value::create(Exiv2::unsignedByte);
++#else
+ Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedByte);
++#endif
+ Value->read("2 2 0 0");
+ replace(ExifToWrite, Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"),
Value.get());
+ // Datum: the datum of the measured data. The default is WGS-84.
+@@ -643,7 +668,11 @@ int WriteFixedDatestamp(const char* File, time_t Time)
+ struct utimbuf utb;
+ stat(File, );
+
++#if EXIV2_TEST_VERSION(0, 28, 0)
++ Exiv2::Image::UniquePtr Image;
++#else
+ Exiv2::Image::AutoPtr Image;
++#endif
+
+ try {
+ Image = Exiv2::ImageFactory::open(File);
+@@ -672,7 +701,11 @@ int WriteFixedDatestamp(const char* File, time_t Time)
+
ExifToWrite.erase(ExifToWrite.findKey(Exiv2::ExifKey("Exif.GPSInfo.GPSDateStamp")));
+
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpscorrelate/files/, sci-geosciences/gpscorrelate/
commit: 35dd7df22871172b49cf5c1cc670fb6c1f06496d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 15 21:36:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 15 21:41:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35dd7df2
sci-geosciences/gpscorrelate: drop 1.6.1-r2
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-geosciences/gpscorrelate/Manifest | 1 -
.../files/gpscorrelate-1.6.1-exiv2-0.27.1.patch| 27 ---
.../files/gpscorrelate-1.6.1-makefile.patch| 46 --
.../gpscorrelate/gpscorrelate-1.6.1-r2.ebuild | 55 --
4 files changed, 129 deletions(-)
diff --git a/sci-geosciences/gpscorrelate/Manifest
b/sci-geosciences/gpscorrelate/Manifest
index e08700cfbada..6e8b6e1ff9e7 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,2 +1 @@
-DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B
664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965
SHA512
c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
DIST gpscorrelate-2.0.tar.gz 283797 BLAKE2B
8cee5b3c37fa758cbf665b9e7cfcc61d7ee73c4aebc0a660718812c598e9b362e76c746a8d6007080783a5d2c0b91eaf5d5c90f48072e6808d2409c6d2b5fbf4
SHA512
c4267b14b219118f2d56c064403a3a7bd74ef1d3af1e83bec6fe5b391bee80b3d69a0e52a834da9f615d9c54720ade28ea22ab8b6fac75c31c71fc5eb348f709
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
deleted file mode 100644
index 16921b72a1f6..
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c82aa1e76e3faeaec605df618c87223513efb3b9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sat, 29 Jun 2019 10:27:24 +0200
-Subject: [PATCH] Fix build with exiv2-0.27.1
-
-Use catchall header as recommended by exiv2 upstream.
- exif-gps.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/exif-gps.cpp b/exif-gps.cpp
-index fb9f2cb..61b4736 100644
a/exif-gps.cpp
-+++ b/exif-gps.cpp
-@@ -41,8 +41,7 @@
- #include
-
-
--#include "exiv2/image.hpp"
--#include "exiv2/exif.hpp"
-+#include "exiv2/exiv2.hpp"
-
- #include "gpsstructure.h"
- #include "exif-gps.h"
---
-2.22.0
-
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
deleted file mode 100644
index 82bd63545dfc..
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -4,11 +4,15 @@
-
- COBJS= main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
- GOBJS= main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
--CFLAGS = -Wall
--override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0)
-I/usr/include/exiv2
--OFLAGS = -Wall
--override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
--prefix = /usr/local
-+CFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
-+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
-+CLIBS = $(shell ${PKG_CONFIG} --libs libxml-2.0) -lm -lexiv2 -lstdc++
-+ifdef BUILD_GUI
-+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
-+CFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
-+CLIBS += $(shell ${PKG_CONFIG} --libs gtk+-2.0)
-+endif
-+prefix ?= /usr/local
- bindir = $(prefix)/bin
- datadir = $(prefix)/share
- mandir = $(datadir)/man
-@@ -18,16 +22,16 @@
- all: gpscorrelate gpscorrelate-gui gpscorrelate.1
-
- gpscorrelate: $(COBJS)
-- g++ $(OFLAGS) -o $@ $(COBJS)
-+ $(CXX) $(LDFLAGS) $(COBJS) $(CLIBS) -o $@
-
- gpscorrelate-gui: $(GOBJS)
-- g++ $(OFLAGS) -o $@ $(GOBJS)
-+ $(CXX) $(LDFLAGS) $(GOBJS) $(CLIBS) -o $@
-
--.c.o:
-- gcc $(CFLAGS) -c -o $*.o $<
-+%.o: %.c
-+ $(CC) -c -o $@ $< $(CFLAGS)
-
--.cpp.o:
-- g++ $(CFLAGS) -c -o $*.o $<
-+%.o: %.cpp $(DEPS)
-+ $(CXX) -c -o $@ $< $(CXXFLAGS)
-
- clean:
- rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
deleted file mode 100644
index 7f1c8c38fc5e..
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS
trace"
-HOMEPAGE="https://github.com/freefoote/gpscorrelate;
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpscorrelate/files/, sci-geosciences/gpscorrelate/
commit: eadbd51607c20feac887e67b4215adb8e8f416cb
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu Feb 24 12:26:59 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Thu Feb 24 12:26:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadbd516
sci-geosciences/gpscorrelate: add version 2.0
Closes: https://bugs.gentoo.org/754069
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-geosciences/gpscorrelate/Manifest | 1 +
.../gpscorrelate-2.0-desktop-pass-validation.patch | 10 +
.../gpscorrelate/gpscorrelate-2.0.ebuild | 50 ++
3 files changed, 61 insertions(+)
diff --git a/sci-geosciences/gpscorrelate/Manifest
b/sci-geosciences/gpscorrelate/Manifest
index 866912d81e40..e08700cfbada 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1 +1,2 @@
DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B
664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965
SHA512
c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
+DIST gpscorrelate-2.0.tar.gz 283797 BLAKE2B
8cee5b3c37fa758cbf665b9e7cfcc61d7ee73c4aebc0a660718812c598e9b362e76c746a8d6007080783a5d2c0b91eaf5d5c90f48072e6808d2409c6d2b5fbf4
SHA512
c4267b14b219118f2d56c064403a3a7bd74ef1d3af1e83bec6fe5b391bee80b3d69a0e52a834da9f615d9c54720ade28ea22ab8b6fac75c31c71fc5eb348f709
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
new file mode 100644
index ..131e21041898
--- /dev/null
+++
b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
@@ -0,0 +1,10 @@
+diff --git a/gpscorrelate.desktop b/gpscorrelate.desktop
+index b4db0d6..0885ca4 100644
+--- a/gpscorrelate.desktop
b/gpscorrelate.desktop
+@@ -1,4 +1,4 @@
+-[Desktop Entry]
++[Desktop Entry]
+ Type=Application
+ Version=1.0
+ Name=GPSCorrelate
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
new file mode 100644
index ..0d45dcd66a4c
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS
trace"
+HOMEPAGE="https://dfandrich.github.io/gpscorrelate/;
+SRC_URI="https://github.com/dfandrich/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="gtk"
+
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/libxml2:2
+ media-gfx/exiv2:=
+ gtk? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-desktop-pass-validation.patch"
+)
+
+src_compile() {
+ tc-export CC CXX PKG_CONFIG
+ emake gpscorrelate CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
LDFLAGS="${LDFLAGS}"
+ use gtk && emake gpscorrelate-gui CFLAGS="${CFLAGS}"
CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+
+}
+
+src_install() {
+ dobin ${PN}
+ if use gtk; then
+ dobin ${PN}-gui
+ doicon -s scalable ${PN}-gui.svg
+ domenu ${PN}.desktop
+ fi
+ dodoc doc/*.html doc/*.png doc/*.xml
+ einstalldocs
+ doman doc/${PN}.1
+}
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpscorrelate/files/, sci-geosciences/gpscorrelate/
commit: bde1f53104418c74c9d78fabd1c1df70982dd411
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 29 08:49:55 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 29 08:50:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde1f531
sci-geosciences/gpscorrelate: EAPI-7 bump, fix build w/ exiv2-0.27.1
Don't install cruft.
Bug: https://bugs.gentoo.org/685926
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gpscorrelate-1.6.1-exiv2-0.27.1.patch| 27 +++
.../gpscorrelate/gpscorrelate-1.6.1-r1.ebuild | 55 ++
2 files changed, 82 insertions(+)
diff --git
a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
new file mode 100644
index 000..16921b72a1f
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
@@ -0,0 +1,27 @@
+From c82aa1e76e3faeaec605df618c87223513efb3b9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 29 Jun 2019 10:27:24 +0200
+Subject: [PATCH] Fix build with exiv2-0.27.1
+
+Use catchall header as recommended by exiv2 upstream.
+---
+ exif-gps.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/exif-gps.cpp b/exif-gps.cpp
+index fb9f2cb..61b4736 100644
+--- a/exif-gps.cpp
b/exif-gps.cpp
+@@ -41,8 +41,7 @@
+ #include
+
+
+-#include "exiv2/image.hpp"
+-#include "exiv2/exif.hpp"
++#include "exiv2/exiv2.hpp"
+
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
+--
+2.22.0
+
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
new file mode 100644
index 000..859bf5a9d68
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS
trace"
+HOMEPAGE="https://github.com/freefoote/gpscorrelate;
+SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc gtk"
+
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/libxml2:2
+ media-gfx/exiv2:=
+ gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-makefile.patch"
+ "${FILESDIR}/${P}-exiv2-0.27.1.patch"
+)
+
+src_compile() {
+ tc-export CC CXX
+ local opts="gpscorrelate gpscorrelate.1"
+ use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
+ emake ${opts}
+}
+
+src_install() {
+ dobin ${PN}
+ if use gtk; then
+ dobin ${PN}-gui
+ doicon ${PN}-gui.svg
+ domenu ${PN}.desktop
+ fi
+ if use doc; then
+ rm doc/gpscorrelate-manpage.xml* || die
+ local DOCS=()
+ local HTML_DOCS=( doc/. )
+ einstalldocs
+ fi
+ doman ${PN}.1
+}
