Accepting request 760492 from graphics

OBS-URL: https://build.opensuse.org/request/show/760492
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=64

0001-Unified-inclusion-of-exiv2-library-1828925.patch

@@ -1,127 +0,0 @@
-From 20020250a02e3e6c5813a24012bb7454a6195f51 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 14 Jul 2019 19:00:49 +0200
-Subject: [PATCH] Unified inclusion of exiv2 library [1828925]
-
-Before only the needed include files were used. This is depreacated.
-Exiv2 wants only to include the main <exiv2/exiv2.hpp> file
----
- src/hugin1/hugin/AboutDialog.cpp         | 2 +-
- src/hugin1/hugin/PanoOperation.cpp       | 3 +--
- src/hugin1/hugin/RawImport.cpp           | 5 +----
- src/hugin1/hugin/TextureManager.cpp      | 3 +--
- src/hugin1/ptbatcher/FindPanoDialog.cpp  | 3 +--
- src/hugin_base/panodata/Exiv2Helper.cpp  | 5 ++---
- src/hugin_base/panodata/SrcPanoImage.cpp | 4 +---
- 7 files changed, 8 insertions(+), 17 deletions(-)
-
-diff --git a/src/hugin1/hugin/AboutDialog.cpp b/src/hugin1/hugin/AboutDialog.cpp
-index 5603957..d1291aa 100755
---- a/src/hugin1/hugin/AboutDialog.cpp
-+++ b/src/hugin1/hugin/AboutDialog.cpp
-@@ -42,7 +42,7 @@ extern "C"
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
-+#include <exiv2/exiv2.hpp>
- #include "lensdb/LensDB.h"
- #include "sqlite3.h"
- #include <lcms2.h>
-diff --git a/src/hugin1/hugin/PanoOperation.cpp b/src/hugin1/hugin/PanoOperation.cpp
-index cf7a6c3..7a3f0d7 100755
---- a/src/hugin1/hugin/PanoOperation.cpp
-+++ b/src/hugin1/hugin/PanoOperation.cpp
-@@ -36,8 +36,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "base_wx/LensTools.h"
- #include "base_wx/wxLensDB.h"
- #include "hugin/ResetDialog.h"
-diff --git a/src/hugin1/hugin/RawImport.cpp b/src/hugin1/hugin/RawImport.cpp
-index 2dd4eb9..73bb143 100755
---- a/src/hugin1/hugin/RawImport.cpp
-+++ b/src/hugin1/hugin/RawImport.cpp
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/exiv2.hpp>
- #ifdef __WXMSW__
- #include <wx/msw/registry.h>
- #endif
-diff --git a/src/hugin1/hugin/TextureManager.cpp b/src/hugin1/hugin/TextureManager.cpp
-index 0d2f5da..9a0822a 100755
---- a/src/hugin1/hugin/TextureManager.cpp
-+++ b/src/hugin1/hugin/TextureManager.cpp
-@@ -65,8 +65,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
--#include "exiv2/preview.hpp"
-+#include <exiv2/exiv2.hpp>
- 
- TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
- {
-diff --git a/src/hugin1/ptbatcher/FindPanoDialog.cpp b/src/hugin1/ptbatcher/FindPanoDialog.cpp
-index 64774fb..96cd762 100755
---- a/src/hugin1/ptbatcher/FindPanoDialog.cpp
-+++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp
-@@ -36,8 +36,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
--#include "exiv2/preview.hpp"
-+#include <exiv2/exiv2.hpp>
- #ifdef _WIN32
- #include <commctrl.h>
- #endif
-diff --git a/src/hugin_base/panodata/Exiv2Helper.cpp b/src/hugin_base/panodata/Exiv2Helper.cpp
-index bc4c12a..5f8bcea 100755
---- a/src/hugin_base/panodata/Exiv2Helper.cpp
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp
-@@ -28,8 +28,7 @@
- #include "Exiv2Helper.h"
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"  
--#include "exiv2/easyaccess.hpp"
--#include "exiv2/version.hpp"
-+#include <exiv2/exiv2.hpp>
- 
- namespace HuginBase
- {
-@@ -601,4 +600,4 @@ namespace HuginBase
-         };
- 
-     }; //namespace Exiv2Helper
--}; //namespace HuginBase
-\ No newline at end of file
-+}; //namespace HuginBase
-diff --git a/src/hugin_base/panodata/SrcPanoImage.cpp b/src/hugin_base/panodata/SrcPanoImage.cpp
-index cc6a565..8484dd9 100755
---- a/src/hugin_base/panodata/SrcPanoImage.cpp
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp
-@@ -40,9 +40,7 @@
- #include <vigra/diff2d.hxx>
- #include <vigra/imageinfo.hxx>
- #include <hugin_utils/utils.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <lensdb/LensDB.h>
- #include "Exiv2Helper.h"
- 
--- 
-2.22.0
-

find-hugin-provides.prov

@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# Combined library.prov, desktop-file.prov and appdata.prov for hugin
-#
-# Transform appdata xml file into RPM appdata(filename) provides
-# Author: Michael Schroeder <mls@suse.de>
-#
-# Transform desktop mimetype info into RPM mimehandler(type) provides
-# Author: Richard Hughes <richard@hughsie.com>
-#
-# Also based on library provides scripts from RPM
-
-OLD_IFS="$IFS"
-mark64=$(uname -m |grep -o 64)
-
-while read instfile ; do
-	case "$instfile" in
-	*.desktop)
-                if ! grep -q '^Type=Application$' "$instfile"; then continue; fi
-                if ! grep -q '^Exec=' "$instfile"; then continue; fi
-                echo "application()"
-                echo "application(${instfile##*/applications/})"
-                mime=`grep '^MimeType=' "$instfile" | cut -d'=' -f2`
-                IFS=';'
-                for type in $mime ; do
-                echo 'mimehandler('$type')'
-                done
-                ;;
-        *.appdata.xml)
-                echo "appdata()"
-                echo "appdata(${instfile##*/appdata/})"
-                ;;
-        */usr/lib$mark64/*.so.?.?)
-                soname=$(objdump -p $instfile | awk '/SONAME/ {print $2}')
-            if [ $mark64 -eq 64 ] ; then
-                lib64="()(64bit)" ;
-            else
-                lib64="" ;
-            fi
-                echo "$soname$lib64"
-                ;;
-        esac
- done
-
-IFS=$OLD_IFS
-

hugin-2019.0.0.tar.bz2

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

hugin-2019.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e
+size 10335030

hugin.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jan  2 18:43:08 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- update to version 2019.2.0
+  * 2019.2.0 is mainly a bug fix release.
+  * Fixes bugs in verdandi/internal blender.
+  * Scripting interface needs now Python3.
+  * Improvements for high dpi displays (Windows, GTK+3).
+  * Fixes for several small bugs...
+- Some minor spec file cleanup
+- Drop obsolete 0001-Unified-inclusion-of-exiv2-library-1828925.patch
+- Remove obsolete find-hugin-provides.prov
+- Change autopano-sift Recommends to autopano-sift-C, the former
+  does not exist anymore.
+
 -------------------------------------------------------------------
 Sun Jul 14 16:12:38 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

hugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hugin
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,17 +23,13 @@
 Name:           hugin
 BuildRequires:  Mesa-devel
 BuildRequires:  OpenEXR-devel
-%if 0%{?suse_version} > 1325 || 0%{?sle_version} >= 150000
-BuildRequires:  libboost_filesystem-devel
-BuildRequires:  libboost_system-devel
-%else
-BuildRequires:  boost-devel
-%endif
 BuildRequires:  cmake >= 3.1.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiftool
 BuildRequires:  fdupes
 BuildRequires:  fftw3-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_system-devel
 %if %{with system_flann}
 BuildRequires:  flann-devel
 %endif
@@ -58,28 +54,20 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  vigra-devel
 BuildRequires:  wxWidgets-devel >= 3
-%define mversion 2019.0
+%define mversion 2019.2
-Version:        2019.0.0
+Version:        2019.2.0
 Release:        0
 Summary:        Toolchain for Stitching of Images and Creating Panoramas
 License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Other
-Url:            http://hugin.sourceforge.net/
+URL:            http://hugin.sourceforge.net/
 Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2
-# This script is a combined appdata.prov and desktop-file.prov to enable hugin to provide appdata.xml and desktop files see boo#952324
-Source1:        find-hugin-provides.prov
 Patch0:         hugin.appdata.patch
-# PATCH-FIX-UPSTREAM https://sourceforge.net/p/hugin/hugin/ci/01e87b730bb3d2fba65e5738e4e20c25900d7ab0/
-Patch1:         0001-Unified-inclusion-of-exiv2-library-1828925.patch
 Requires:       enblend-enfuse >= 3.2
 # needed for photo stiching (bnc#822775)
 Requires:       make
-Recommends:     autopano-sift
+Recommends:     autopano-sift-C
 Recommends:     exiftool
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%define __find_provides %{SOURCE1}
-#%%debug_package
 
 %description
 Hugin can be used to stitch multiple images together. The resulting
@@ -93,18 +81,14 @@ detection and extraction of key points.
 %prep
 %setup -q
 %patch0
-%patch1 -p1
 
-chmod -x AUTHORS authors.txt Changes.txt README TODO COPYING.txt
+chmod -x AUTHORS authors.txt Changes.txt README COPYING.txt
 
 # Rename Czech in Czech Republic to Czech.
 mv src/translations/cs_CZ.po src/translations/cs.po
 #sed -i "s/ca_ES/ca/;s/cs_CZ/cs/" src/hugin/po/LINGUAS
-chmod 0755 %{SOURCE1}
 
 %build
-echo -n be8da0221960 > rev.txt
-
 %cmake \
 	-DENABLE_LAPACK=%{?with_lapack:ON}%{!?with_lapack:OFF} \
 	-DBUILD_HSI=%{?with_hsi:ON}%{!?with_hsi:OFF} \
@@ -146,7 +130,7 @@ install -m644 -D -t %{buildroot}%{_licensedir}/hugin/ COPYING.txt
 
 %files -f %{name}.lang
 %license COPYING.txt
-%doc AUTHORS authors.txt Changes.txt README TODO
+%doc AUTHORS authors.txt Changes.txt README
 %{_bindir}/*
 %{_datadir}/hugin
 %{_datadir}/applications/*.desktop