diff -Nru exempi-2.6.1/debian/changelog exempi-2.6.1/debian/changelog --- exempi-2.6.1/debian/changelog 2022-02-13 18:15:36.000000000 +0000 +++ exempi-2.6.1/debian/changelog 2022-06-15 04:13:07.000000000 +0000 @@ -1,3 +1,10 @@ +exempi (2.6.1-2) unstable; urgency=medium + + * XMPFiles/source/XMPFiles_Impl.cpp: fix arm build with gcc 10 + (Closes: #1009733) + + -- Michael Biebl Wed, 15 Jun 2022 06:13:07 +0200 + exempi (2.6.1-1) unstable; urgency=medium * New upstream version 2.6.1 diff -Nru exempi-2.6.1/debian/patches/0001-XMPFiles-source-XMPFiles_Impl.cpp-fix-arm-build-with.patch exempi-2.6.1/debian/patches/0001-XMPFiles-source-XMPFiles_Impl.cpp-fix-arm-build-with.patch --- exempi-2.6.1/debian/patches/0001-XMPFiles-source-XMPFiles_Impl.cpp-fix-arm-build-with.patch 1970-01-01 00:00:00.000000000 +0000 +++ exempi-2.6.1/debian/patches/0001-XMPFiles-source-XMPFiles_Impl.cpp-fix-arm-build-with.patch 2022-06-15 04:13:07.000000000 +0000 @@ -0,0 +1,37 @@ +From: Fabrice Fontaine +Date: Thu, 17 Mar 2022 17:27:28 +0100 +Subject: XMPFiles/source/XMPFiles_Impl.cpp: fix arm build with gcc 10 + +Fix the following build failure with exempi on arm with gcc 10 raised +since version 2.6.0 and +https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f +https://github.com/adobe/XMP-Toolkit-SDK/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../XMPFiles/source/.libs/libXMPFiles.a(XMPFiles_Impl.o):(.rodata+0x5c): multiple definition of `typeinfo name for TXMPMeta, std::allocator > >'; XMPFilesCoverage.o:(.rodata+0x0): first defined here + +More information can be found on a similar issue here: +https://github.com/OpenKinect/libfreenect2/issues/157 + +Fixes: + - http://autobuild.buildroot.org/results/c440719de02a154c6bdae11bda06ea30c131c71d + +Signed-off-by: Fabrice Fontaine +--- + XMPFiles/source/XMPFiles_Impl.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp +index 2f918ac..ff45040 100644 +--- a/XMPFiles/source/XMPFiles_Impl.cpp ++++ b/XMPFiles/source/XMPFiles_Impl.cpp +@@ -47,7 +47,9 @@ using namespace std; + /// This file ... + /// + // ================================================================================================= +-#include "public/include/XMP.incl_cpp" ++#if ! XMP_StaticBuild ++ #include "public/include/XMP.incl_cpp" ++#endif + + #if XMP_WinBuild + #pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) diff -Nru exempi-2.6.1/debian/patches/series exempi-2.6.1/debian/patches/series --- exempi-2.6.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ exempi-2.6.1/debian/patches/series 2022-06-15 04:13:07.000000000 +0000 @@ -0,0 +1 @@ +0001-XMPFiles-source-XMPFiles_Impl.cpp-fix-arm-build-with.patch