git: 5f1836a182b8 - main - graphics/filmulator: make compatible with exiv2 0.28

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5f1836a182b87f8402cf50e86e889c9cdf9f32be

commit 5f1836a182b87f8402cf50e86e889c9cdf9f32be
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2023-07-02 11:33:03 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2023-07-09 22:08:06 +0000

    graphics/filmulator: make compatible with exiv2 0.28
    
    PR:             272311
---
 graphics/filmulator/Makefile                         |  2 +-
 graphics/filmulator/files/patch-core_imwriteJpeg.cpp | 11 +++++++++++
 .../files/patch-database_exifFunctions.cpp           | 20 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

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;
+     }