commit 3c18dfdf873139da03b6d532036757935d4fa287
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sat Jul 29 07:11:21 2023 +0200
- added exiv2 patch, release 7 (exiv2 0.28)
hugin-exiv2.patch | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
hugin.spec | 4 +++-
2 files changed, 70 insertions(+), 1 deletion(-)
---
diff --git a/hugin.spec b/hugin.spec
index 165b06b..03e8e29 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,7 +2,7 @@ Summary: Toolchain to create panoramic images
Summary(pl.UTF-8): Zestaw narzędzi do tworzenia panoramicznych zdjęć
Name: hugin
Version: 2020.0.0
-Release: 6
+Release: 7
License: GPL v2+
Group: X11/Applications/Graphics
Source0:
http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source0:
http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
Patch0: %{name}-cppflags.patch
Patch1: python-install.patch
Patch2: openexr3.patch
+Patch3: %{name}-exiv2.patch
URL: http://hugin.sourceforge.net/
BuildRequires: OpenEXR-devel
BuildRequires: OpenGL-glut-devel
@@ -67,6 +68,7 @@ ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
%patch0 -p0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# Old, broken duplicate of the system cmake one
%{__rm} CMakeModules/FindZLIB.cmake
diff --git a/hugin-exiv2.patch b/hugin-exiv2.patch
new file mode 100644
index 0000000..6bc49f9
--- /dev/null
+++ b/hugin-exiv2.patch
@@ -0,0 +1,67 @@
+--- hugin-2020.0.0/src/hugin_base/panodata/SrcPanoImage.cpp.orig
2020-09-12 12:46:03.000000000 +0200
++++ hugin-2020.0.0/src/hugin_base/panodata/SrcPanoImage.cpp 2023-07-28
22:43:30.687904298 +0200
+@@ -362,7 +362,7 @@ bool SrcPanoImage::readEXIF()
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
+ if (pos != xmpData.end())
+ {
+- croppedWidth = pos->toLong();
++ croppedWidth = pos->toInt64();
+ }
+ else
+ {
+@@ -372,7 +372,7 @@ bool SrcPanoImage::readEXIF()
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
+ if (pos != xmpData.end())
+ {
+- croppedHeight = pos->toLong();
++ croppedHeight = pos->toInt64();
+ }
+ else
+ {
+@@ -386,7 +386,7 @@ bool SrcPanoImage::readEXIF()
+ double hfov = 0;
+ if (pos != xmpData.end())
+ {
+- hfov = 360 * croppedWidth / (double)pos->toLong();
++ hfov = 360 * croppedWidth /
(double)pos->toInt64();
+ }
+ else
+ {
+@@ -397,7 +397,7 @@ bool SrcPanoImage::readEXIF()
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
+ if (pos != xmpData.end())
+ {
+- fullHeight = pos->toLong();
++ fullHeight = pos->toInt64();
+ }
+ else
+ {
+@@ -408,7 +408,7 @@ bool SrcPanoImage::readEXIF()
+ pos =
xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
+ if (pos != xmpData.end())
+ {
+- cropTop = pos->toLong();
++ cropTop = pos->toInt64();
+ }
+ else
+ {
+--- hugin-2020.0.0/src/hugin_base/panodata/Exiv2Helper.cpp.orig
2019-05-15 17:30:47.000000000 +0200
++++ hugin-2020.0.0/src/hugin_base/panodata/Exiv2Helper.cpp 2023-07-29
06:56:08.543554353 +0200
+@@ -40,7 +40,7 @@ namespace HuginBase
+ Exiv2::ExifData::iterator itr =
exifData.findKey(Exiv2::ExifKey(keyName));
+ if (itr != exifData.end() && itr->count())
+ {
+- value = itr->toLong();
++ value = itr->toInt64();
+ return true;
+ }
+ else
+@@ -165,7 +165,7 @@ namespace HuginBase
+ {
+ if(it!=exifData.end() && it->count())
+ {
+- return it->toLong();
++ return it->toInt64();
+ }
+ return 0;
+ };
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hugin.git/commitdiff/3c18dfdf873139da03b6d532036757935d4fa287
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
