diff -Nru pinot-1.05/debian/changelog pinot-1.05/debian/changelog
--- pinot-1.05/debian/changelog	2020-01-19 19:45:31.000000000 +0000
+++ pinot-1.05/debian/changelog	2020-02-06 03:24:59.000000000 +0000
@@ -1,3 +1,9 @@
+pinot (1.05-4.1+rpi1) bullseye-staging; urgency=medium
+
+  * Apply upstream commit for compatibility with newer exiv2.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 06 Feb 2020 03:24:59 +0000
+
 pinot (1.05-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru pinot-1.05/debian/patches/handle-newer-exiv2.patch pinot-1.05/debian/patches/handle-newer-exiv2.patch
--- pinot-1.05/debian/patches/handle-newer-exiv2.patch	1970-01-01 00:00:00.000000000 +0000
+++ pinot-1.05/debian/patches/handle-newer-exiv2.patch	2020-02-06 03:24:31.000000000 +0000
@@ -0,0 +1,53 @@
+This Debian patch is based on the commit described below, but modified
+to make it apply to the Debian package.
+
+commit faaa552de9ec099184d131c08b76ae0b1ce4f5ec
+Author: FabriceColin <fabrice.colin@gmail.com>
+Date:   Tue Jul 23 22:03:14 2019 +0200
+
+    Handle newer versions of exiv2.
+
+diff --git a/Tokenize/filters/Exiv2ImageFilter.cc b/Tokenize/filters/Exiv2ImageFilter.cc
+index 17ba2b3..ceac398 100644
+--- a/Tokenize/filters/Exiv2ImageFilter.cc
++++ b/Tokenize/filters/Exiv2ImageFilter.cc
+@@ -1,5 +1,5 @@
+ /*
+- *  Copyright 2011-2012 Fabrice Colin
++ *  Copyright 2011-2019 Fabrice Colin
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -16,6 +16,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+@@ -25,7 +26,12 @@
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
+ #include <exiv2/iptc.hpp>
++#ifdef HAVE_EXIV2_XMP_EXIV2_HPP
++#include <exiv2/xmp_exiv2.hpp>
++#include <exiv2/error.hpp>
++#else
+ #include <exiv2/xmp.hpp>
++#endif
+ 
+ #include "config.h"
+ #include "Exiv2ImageFilter.h"
+diff --git a/configure.in b/configure.in
+index 64f93d6..5c26e34 100644
+--- a/configure.in
++++ b/configure.in
+@@ -420,6 +420,7 @@ AC_SUBST(SHARED_MIME_INFO_PREFIX)
+ AC_DEFINE_UNQUOTED(SHARED_MIME_INFO_PREFIX,"$SHARED_MIME_INFO_PREFIX",
+     [the shared-mime-info prefix])
+ PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.18 )
++AC_CHECK_HEADERS([exiv2/xmp_exiv2.hpp])
+ AC_SUBST(EXIV2_CFLAGS)
+ AC_SUBST(EXIV2_LIBS)
+ PKG_CHECK_MODULES(TAGLIB, taglib >= 1.4 )
diff -Nru pinot-1.05/debian/patches/series pinot-1.05/debian/patches/series
--- pinot-1.05/debian/patches/series	2019-10-18 03:28:43.000000000 +0000
+++ pinot-1.05/debian/patches/series	2020-02-06 03:21:55.000000000 +0000
@@ -3,3 +3,4 @@
 openssl-1.1+new-glib.patch
 fix-gpl-openssl-clash.patch
 gmime3.patch
+handle-newer-exiv2.patch