rpm/hugin
SHA256
1
0
Fork 0
forked from pool/hugin
Code Pull Requests Activity

Accepting request 1136148 from graphics

Browse Source 
- Update to version 2023.0.0.
- Drop fix_build_with_exiv2_08.pach: upstreamed. (forwarded request 1136080 from badshah400)

OBS-URL: https://build.opensuse.org/request/show/1136148
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2024-01-03 11:29:59 +00:00 committed by Git OBS Bridge
commit 126785e0b6
6 changed files with 37 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
fix_build_with_exiv2_0-28.pach
View File

@ -1,90 +0,0 @@
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
{

3
hugin-2022.0.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
size 10374360

3
hugin-2023.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04a39fccc6017e0544c639bd22309472c574d35b3455cbade1fc3870e631632b
size 10336322

24
hugin.appdata.patch
View File

@ -1,8 +1,8 @@
Index: platforms/linux/appdata/PTBatcherGUI.appdata.xml
Index: hugin-2023.0.0/platforms/linux/appdata/PTBatcherGUI.appdata.xml
===================================================================
--- a/platforms/linux/appdata/PTBatcherGUI.appdata.xml
+++ b/platforms/linux/appdata/PTBatcherGUI.appdata.xml
@@ -13,7 +13,7 @@
--- hugin-2023.0.0.orig/platforms/linux/appdata/PTBatcherGUI.appdata.xml
+++ hugin-2023.0.0/platforms/linux/appdata/PTBatcherGUI.appdata.xml
@@ -17,7 +17,7 @@
<metadata_license>GFDL</metadata_license>
<project_license>GPL-2.0-or-later</project_license>
<content_rating type="oars-1.1" />
@ -11,11 +11,11 @@ Index: platforms/linux/appdata/PTBatcherGUI.appdata.xml
<summary>A GUI queue manager for stitching multiple hugin projects</summary>
<description>
<p>
Index: platforms/linux/appdata/calibrate_lens_gui.appdata.xml
Index: hugin-2023.0.0/platforms/linux/appdata/calibrate_lens_gui.appdata.xml
===================================================================
--- a/platforms/linux/appdata/calibrate_lens_gui.appdata.xml
+++ b/platforms/linux/appdata/calibrate_lens_gui.appdata.xml
@@ -13,7 +13,7 @@
--- hugin-2023.0.0.orig/platforms/linux/appdata/calibrate_lens_gui.appdata.xml
+++ hugin-2023.0.0/platforms/linux/appdata/calibrate_lens_gui.appdata.xml
@@ -17,7 +17,7 @@
<metadata_license>GFDL</metadata_license>
<project_license>GPL-2.0-or-later</project_license>
<content_rating type="oars-1.1" />
@ -24,11 +24,11 @@ Index: platforms/linux/appdata/calibrate_lens_gui.appdata.xml
<summary>Automatic lens calibration</summary>
<description>
<p>
Index: platforms/linux/appdata/hugin.appdata.xml
Index: hugin-2023.0.0/platforms/linux/appdata/hugin.appdata.xml
===================================================================
--- a/platforms/linux/appdata/hugin.appdata.xml
+++ b/platforms/linux/appdata/hugin.appdata.xml
@@ -13,7 +13,7 @@
--- hugin-2023.0.0.orig/platforms/linux/appdata/hugin.appdata.xml
+++ hugin-2023.0.0/platforms/linux/appdata/hugin.appdata.xml
@@ -17,7 +17,7 @@
<metadata_license>GFDL</metadata_license>
<project_license>GPL-2.0-or-later</project_license>
<content_rating type="oars-1.1" />

19
hugin.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Jan 2 08:32:37 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 2023.0.0:
* PTBatcherGUI can now also queue user defined assistant and
user defined output sequences.
* PTBatcherGUI: Added option to generate panorama sequences from
an existing pto template.
* Assistant: Added option to select different output options
like projection, FOV or canvas size depending on different
variables (e.g. image count, field of view, lens type).
* Allow building with epoxy instead of GLEW for OpenGL pointer
management.
* Several improvements to crop tool (outside crop, aspect ratio,
...).
* Several bug fixes (e.g. in verdandi/internal blender).
* Updated translations.
- Drop fix_build_with_exiv2_08.pach: upstreamed.
-------------------------------------------------------------------
Wed Jul 5 15:41:15 UTC 2023 - Marcel Kuehlhorn <tux93@opensuse.org>

8
hugin.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package hugin
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,14 +16,14 @@
#
%define mversion 2022.0
%define mversion 2023.0
%bcond_with hsi
%bcond_without system_flann
%bcond_without lapack
# Cannot use EGL unless glew bug https://github.com/nigels-com/glew/issues/315 is fixed
%bcond_with egl
Name: hugin
Version: 2022.0.0
Version: %{mversion}.0
Release: 0
Summary: Toolchain for Stitching of Images and Creating Panoramas
License: GPL-2.0-or-later
@ -31,8 +31,6 @@ Group: Productivity/Graphics/Other
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