Attachment 243176 Details for Bug 272311 – graphics/filmulator - make compatible with exiv2 0.28 #2 - unified prior patches

[patch] graphics/filmulator - make compatible with exiv2 0.28 #2 - unified prior patches

0001-graphics-filmulator-make-compatible-with-exiv2-0.28.patch (text/plain), 2.65 KB, created by Matthias Andree on 2023-07-03 10:47:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-03 10:47:15 UTC

Size: 2.65 KB

patch

obsolete

>From 8c340d457f4d05dea11c9660cb9fb567eb1e0232 Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 13:33:03 +0200
>Subject: [PATCH] graphics/filmulator: make compatible with exiv2 0.28
>
>PR:		272311
>---
> graphics/filmulator/Makefile                  |  2 +-
> .../files/patch-core_imwriteJpeg.cpp          | 11 ++++++++++
> .../files/patch-database_exifFunctions.cpp    | 20 +++++++++++++++++++
> 3 files changed, 32 insertions(+), 1 deletion(-)
> create mode 100644 graphics/filmulator/files/patch-core_imwriteJpeg.cpp
> create mode 100644 graphics/filmulator/files/patch-database_exifFunctions.cpp
>
>diff --git a/graphics/filmulator/Makefile b/graphics/filmulator/Makefile
>index a536c5e5e911..077ed370fcf7 100644
>--- a/graphics/filmulator/Makefile
>+++ b/graphics/filmulator/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	filmulator
> PORTVERSION=	0.11.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	graphics
> 
>diff --git a/graphics/filmulator/files/patch-core_imwriteJpeg.cpp b/graphics/filmulator/files/patch-core_imwriteJpeg.cpp
>new file mode 100644
>index 000000000000..b1ac49c5971d
>--- /dev/null
>+++ b/graphics/filmulator/files/patch-core_imwriteJpeg.cpp
>@@ -0,0 +1,11 @@
>+--- core/imwriteJpeg.cpp.orig	2021-03-05 05:27:44 UTC
>++++ core/imwriteJpeg.cpp
>+@@ -186,7 +186,7 @@ static void remove_exif_keys(Exiv2::ExifData &exifData
>+             {
>+                 exifData.erase(pos);
>+             }
>+-        } catch (Exiv2::AnyError &e) {
>++        } catch (Exiv2::Error &e) {
>+             //catch invalid tag
>+         }
>+     }
>diff --git a/graphics/filmulator/files/patch-database_exifFunctions.cpp b/graphics/filmulator/files/patch-database_exifFunctions.cpp
>new file mode 100644
>index 000000000000..f181c867b16b
>--- /dev/null
>+++ b/graphics/filmulator/files/patch-database_exifFunctions.cpp
>@@ -0,0 +1,20 @@
>+--- database/exifFunctions.cpp.orig	2021-03-05 05:27:44 UTC
>++++ database/exifFunctions.cpp
>+@@ -123,7 +123,7 @@ int exifDefaultRotation(const std::string fullFilename
>+         int exifOrientation;
>+         try
>+         {
>+-            exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toLong();
>++            exifOrientation = (int) exifData["Exif.Image.Orientation"].value().toInt64();
>+         }
>+         catch (...)
>+         {
>+@@ -295,7 +295,7 @@ int exifRating(const std::string fullFilename)
>+         std::string maker = exifData["Exif.Image.Make"].toString();
>+         if (maker.compare("Canon") == 0)
>+         {
>+-            return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toLong()));
>++            return min(5,max(0,(int) xmpData["Xmp.xmp.Rating"].toInt64()));
>+         }
>+         return 0;
>+     }
>-- 
>2.41.0
>

Flags:

danfe: 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