sci-astronomy/siril: Fix build with >=exiv2-0.28

Closes: https://bugs.gentoo.org/906499
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2023-08-20 19:37:41 +02:00
parent 94fbc15608
commit ec80058fde
2 changed files with 42 additions and 2 deletions
@@ -0,0 +1,39 @@
* asturm 2023-08-20: Combination of two commits from upstream git master
3c2579cd: Pick the only hunk relevant for exiv2-0.28...
64583490: Blend with that to fix build w/o exiv2 and fix indendation...
From 3c2579cd171314f7e408c00bc8e793330dcc07ba Mon Sep 17 00:00:00 2001
From: Cyril Richard <cyril.richard42@gmail.com>
Date: Sun, 4 Jun 2023 22:10:55 +0000
Subject: [PATCH] XISF image import
From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001
From: Vincent Hourdin <vh@free-astro.org>
Date: Mon, 5 Jun 2023 00:27:56 +0200
Subject: [PATCH] fixing exiv2 as optional
--- a/src/core/exif.cpp
+++ b/src/core/exif.cpp
@@ -121,10 +121,18 @@
#endif
}
+#ifdef HAVE_EXIV2
+#if EXIV2_TEST_VERSION(0,28,0)
+typedef Exiv2::Image::UniquePtr ImagePtr;
+#else
+typedef Exiv2::Image::AutoPtr ImagePtr;
+#endif
+#endif
+
gchar* siril_get_date_from_exif(const char *filename) {
#ifdef HAVE_EXIV2
try {
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(WIDEN(filename));
+ ImagePtr image = Exiv2::ImageFactory::open(WIDEN(filename));
if (image.get() == 0) {
fprintf(stderr, "Error Cannot open the file.\n");
return NULL;
--
GitLab
@@ -52,8 +52,9 @@ BDEPEND="dev-util/cmake
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-stdint.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch"
"${FILESDIR}/${PN}-1.2-stdint.patch"
"${FILESDIR}/${PN}-1.2-tiff.patch"
"${FILESDIR}/${PN}-1.2-exiv2-0.28.patch" # bug 906499
)
DOCS=( README.md NEWS ChangeLog AUTHORS )