Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2023-07-18 22:07:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new.3193 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin" Tue Jul 18 22:07:17 2023 rev:78 rq:1099040 version:2022.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2023-01-03 15:06:32.682922861 +0100 +++ /work/SRC/openSUSE:Factory/.hugin.new.3193/hugin.changes 2023-07-18 22:07:28.814772942 +0200 @@ -1,0 +2,5 @@ +Wed Jul 5 15:41:15 UTC 2023 - Marcel Kuehlhorn <[email protected]> + +- Add fix_build_with_exiv2_0-28.pach, fixing build with exiv2-0.28 + +------------------------------------------------------------------- New: ---- fix_build_with_exiv2_0-28.pach ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.nI7ebt/_old 2023-07-18 22:07:29.614777414 +0200 +++ /var/tmp/diff_new_pack.nI7ebt/_new 2023-07-18 22:07:29.618777437 +0200 @@ -1,7 +1,7 @@ # # spec file for package hugin # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ URL: http://hugin.sourceforge.net/ Source: https://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2 Patch0: hugin.appdata.patch +# PATCH-FIX-UPSTREAM fix build with exiv2-0.28 +Patch1: fix_build_with_exiv2_0-28.pach BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel BuildRequires: cmake >= 3.1.0 ++++++ fix_build_with_exiv2_0-28.pach ++++++ diff --git a/src/hugin_base/panodata/Exiv2Helper.cpp b/src/hugin_base/panodata/Exiv2Helper.cpp --- a/src/hugin_base/panodata/Exiv2Helper.cpp +++ b/src/hugin_base/panodata/Exiv2Helper.cpp @@ -40,7 +40,11 @@ Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName)); if (itr != exifData.end() && itr->count()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + value = itr->toInt64(); +#else value = itr->toLong(); +#endif return true; } else @@ -165,7 +169,11 @@ { if(it!=exifData.end() && it->count()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + return it->toInt64(); +#else return it->toLong(); +#endif } return 0; }; diff --git a/src/hugin_base/panodata/SrcPanoImage.cpp b/src/hugin_base/panodata/SrcPanoImage.cpp --- a/src/hugin_base/panodata/SrcPanoImage.cpp +++ b/src/hugin_base/panodata/SrcPanoImage.cpp @@ -384,7 +384,11 @@ pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels")); if (pos != xmpData.end()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + croppedWidth = pos->toInt64(); +#else croppedWidth = pos->toLong(); +#endif } else { @@ -394,7 +398,11 @@ pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels")); if (pos != xmpData.end()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + croppedHeight = pos->toInt64(); +#else croppedHeight = pos->toLong(); +#endif } else { @@ -408,7 +416,11 @@ double hfov = 0; if (pos != xmpData.end()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + hfov = 360 * croppedWidth / (double)pos->toInt64(); +#else hfov = 360 * croppedWidth / (double)pos->toLong(); +#endif } else { @@ -419,7 +431,11 @@ pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels")); if (pos != xmpData.end()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + fullHeight = pos->toInt64(); +#else fullHeight = pos->toLong(); +#endif } else { @@ -430,7 +446,11 @@ pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels")); if (pos != xmpData.end()) { +#if defined EXIV2_VERSION && EXIV2_TEST_VERSION(0,28,0) + cropTop = pos->toInt64(); +#else cropTop = pos->toLong(); +#endif } else {
