summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2021-03-13 16:05:41 +0100
committerHans de Graaff <graaff@gentoo.org>2021-03-13 16:05:41 +0100
commit90bffc1aa20f30b359719efda89d9fdc97af87bb (patch)
tree48a8b63ec0670ee1a1ac6fb731360108196b71b5 /sci-geosciences/viking
parentdev-util/diffoscope: bump up to 169 (diff)
downloadgentoo-90bffc1aa20f30b359719efda89d9fdc97af87bb.tar.gz
gentoo-90bffc1aa20f30b359719efda89d9fdc97af87bb.tar.bz2
gentoo-90bffc1aa20f30b359719efda89d9fdc97af87bb.zip
sci-geosciences/viking: fix build with USE=libexif
Backport an upstream patch to build with libexif support. Closes: https://bugs.gentoo.org/775812 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'sci-geosciences/viking')
-rw-r--r--sci-geosciences/viking/files/viking-1.8-libexif.patch22
-rw-r--r--sci-geosciences/viking/viking-1.8-r1.ebuild2
2 files changed, 23 insertions, 1 deletions
diff --git a/sci-geosciences/viking/files/viking-1.8-libexif.patch b/sci-geosciences/viking/files/viking-1.8-libexif.patch
new file mode 100644
index 000000000000..0f8bd81fe1cd
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.8-libexif.patch
@@ -0,0 +1,22 @@
+From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001
+From: Rob Norris <rw_norris@hotmail.com>
+Date: Sun, 9 Feb 2020 11:28:30 +0000
+Subject: [PATCH] Github #80: Fix build with '--with-libexif'
+
+---
+ src/geotag_exif.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/geotag_exif.c b/src/geotag_exif.c
+index 0e879a39..6e9514a7 100644
+--- a/src/geotag_exif.c
++++ b/src/geotag_exif.c
+@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor
+ // Not worried if none of the other fields exist, as can default the values to something
+ //
+
+- gdouble alt = VIK_DEFAULT_ALTITUDE;
++ gdouble alt = NAN;
+ ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE);
+ if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) {
+ alt = Rational2Double ( ee->data,
diff --git a/sci-geosciences/viking/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
index fc94ad904522..5d0117c5794f 100644
--- a/sci-geosciences/viking/viking-1.8-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.8-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMONDEPEND}
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" "${FILESDIR}/${P}-libexif.patch" )
S="${WORKDIR}/${PN}-${P}"