forked from pool/hugin
Accepting request 950737 from graphics
- Update to version 2020.0.0:
* Fast preview window can be panned in zoomed state with middle
mouse button.
* New overview mode: inside panorama sphere (similar to a
interactive panorama viewer)
* Updated build system for OpenEXR3.
* Several bug fixes.
- Drop upstream patches:
* hugin-EGL-link-against-X11.patch
* hugin-openexr3.patch (forwarded request 949737 from StefanBruens)
OBS-URL: https://build.opensuse.org/request/show/950737
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b458975d5b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
|
||||
size 10371301
|
||||
3
hugin-2021.0.0.tar.bz2
Normal file
3
hugin-2021.0.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9
|
||||
size 10333565
|
||||
@ -1,13 +0,0 @@
|
||||
Index: hugin-2020.0.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- hugin-2020.0.0.orig/CMakeLists.txt
|
||||
+++ hugin-2020.0.0/CMakeLists.txt
|
||||
@@ -256,7 +256,7 @@ IF(NOT HUGIN_SHARED OR NOT WIN32)
|
||||
ADD_DEFINITIONS(-DGLEW_STATIC)
|
||||
ENDIF()
|
||||
|
||||
-IF(NOT APPLE AND NOT WIN32 AND NOT HAVE_EGL)
|
||||
+IF(NOT APPLE AND NOT WIN32)
|
||||
MESSAGE(STATUS "Searching X11 header")
|
||||
FIND_PACKAGE(X11 REQUIRED)
|
||||
ENDIF()
|
||||
@ -1,54 +0,0 @@
|
||||
Index: hugin-2020.0.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- hugin-2020.0.0.orig/CMakeLists.txt
|
||||
+++ hugin-2020.0.0/CMakeLists.txt
|
||||
@@ -214,7 +214,18 @@ ENDIF()
|
||||
|
||||
ENDIF()
|
||||
|
||||
-FIND_PACKAGE(OpenEXR REQUIRED)
|
||||
+FIND_PACKAGE(Imath CONFIG)
|
||||
+IF(TARGET Imath::Imath)
|
||||
+ FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
|
||||
+ FIND_PACKAGE(ZLIB REQUIRED)
|
||||
+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ list(APPEND OPENEXR_INCLUDE_DIR ${IMATH_INCLUDE_DIR})
|
||||
+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR Imath::Imath ${ZLIB_LIBRARIES})
|
||||
+ set(OPENEXR_FOUND TRUE)
|
||||
+ELSE()
|
||||
+ FIND_PACKAGE(OpenEXR REQUIRED)
|
||||
+ENDIF()
|
||||
include_directories(${OPENEXR_INCLUDE_DIR})
|
||||
|
||||
FIND_PACKAGE(VIGRA 1.9.0 REQUIRED)
|
||||
Index: hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
|
||||
===================================================================
|
||||
--- hugin-2020.0.0.orig/src/hugin_base/vigra_ext/ReduceOpenEXR.h
|
||||
+++ hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
|
||||
@@ -25,8 +25,8 @@
|
||||
#include <vigra_ext/HDRUtils.h>
|
||||
#include <vigra_ext/FileRAII.h>
|
||||
|
||||
-#include <ImfRgbaFile.h>
|
||||
-#include <ImfArray.h>
|
||||
+#include <OpenEXR/ImfRgbaFile.h>
|
||||
+#include <OpenEXR/ImfArray.h>
|
||||
|
||||
|
||||
// hack to read pgm header
|
||||
Index: hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
|
||||
===================================================================
|
||||
--- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake
|
||||
+++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
|
||||
@@ -75,6 +75,9 @@ IF (VIGRA_FOUND)
|
||||
)
|
||||
STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
|
||||
IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
|
||||
+ ELSEIF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libiopenexr")
|
||||
+ MESSAGE(STATUS "OpenEXR is version 3 or greter.")
|
||||
+ ELSE()
|
||||
MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
|
||||
ENDIF()
|
||||
ELSE()
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Index: platforms/linux/appdata/PTBatcherGUI.appdata.xml
|
||||
===================================================================
|
||||
--- platforms/linux/appdata/PTBatcherGUI.appdata.xml.orig
|
||||
+++ platforms/linux/appdata/PTBatcherGUI.appdata.xml
|
||||
--- a/platforms/linux/appdata/PTBatcherGUI.appdata.xml
|
||||
+++ b/platforms/linux/appdata/PTBatcherGUI.appdata.xml
|
||||
@@ -13,7 +13,7 @@
|
||||
<metadata_license>GFDL</metadata_license>
|
||||
<project_license>GPL-2.0-or-later</project_license>
|
||||
@ -13,8 +13,8 @@ Index: platforms/linux/appdata/PTBatcherGUI.appdata.xml
|
||||
<p>
|
||||
Index: platforms/linux/appdata/calibrate_lens_gui.appdata.xml
|
||||
===================================================================
|
||||
--- platforms/linux/appdata/calibrate_lens_gui.appdata.xml.orig
|
||||
+++ 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 @@
|
||||
<metadata_license>GFDL</metadata_license>
|
||||
<project_license>GPL-2.0-or-later</project_license>
|
||||
@ -26,8 +26,8 @@ Index: platforms/linux/appdata/calibrate_lens_gui.appdata.xml
|
||||
<p>
|
||||
Index: platforms/linux/appdata/hugin.appdata.xml
|
||||
===================================================================
|
||||
--- platforms/linux/appdata/hugin.appdata.xml.orig
|
||||
+++ platforms/linux/appdata/hugin.appdata.xml
|
||||
--- a/platforms/linux/appdata/hugin.appdata.xml
|
||||
+++ b/platforms/linux/appdata/hugin.appdata.xml
|
||||
@@ -13,7 +13,7 @@
|
||||
<metadata_license>GFDL</metadata_license>
|
||||
<project_license>GPL-2.0-or-later</project_license>
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 28 14:27:10 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Update to version 2020.0.0:
|
||||
* Fast preview window can be panned in zoomed state with middle
|
||||
mouse button.
|
||||
* New overview mode: inside panorama sphere (similar to a
|
||||
interactive panorama viewer)
|
||||
* Updated build system for OpenEXR3.
|
||||
* Several bug fixes.
|
||||
- Drop upstream patches:
|
||||
* hugin-EGL-link-against-X11.patch
|
||||
* hugin-openexr3.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 12 01:47:14 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
22
hugin.spec
22
hugin.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package hugin
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 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 2020.0
|
||||
%define mversion 2021.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: 2020.0.0
|
||||
Version: 2021.0.0
|
||||
Release: 0
|
||||
Summary: Toolchain for Stitching of Images and Creating Panoramas
|
||||
License: GPL-2.0-or-later
|
||||
@ -31,10 +31,6 @@ Group: Productivity/Graphics/Other
|
||||
URL: http://hugin.sourceforge.net/
|
||||
Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2
|
||||
Patch0: hugin.appdata.patch
|
||||
# https://src.fedoraproject.org/rpms/hugin/blob/rawhide/f/hugin-openexr3.patch
|
||||
Patch1: hugin-openexr3.patch
|
||||
# PATCH-FIX-UPSTREAM hugin-EGL-link-against-X11.patch badshah400@gmail.com -- Link against X11 even when building with EGL support
|
||||
Patch2: hugin-EGL-link-against-X11.patch
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: OpenEXR-devel
|
||||
BuildRequires: cmake >= 3.1.0
|
||||
@ -69,7 +65,7 @@ BuildRequires: flann-devel
|
||||
BuildRequires: lapack-devel
|
||||
%endif
|
||||
%if %{with hsi}
|
||||
BuildRequires: python-wxWidgets >= 3
|
||||
BuildRequires: python3-wxPython
|
||||
BuildRequires: swig
|
||||
%endif
|
||||
%if %{with egl}
|
||||
@ -86,10 +82,7 @@ chromatic abberation, create HDR images, provide automatic feature
|
||||
detection and extraction of key points.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%autosetup -p1
|
||||
|
||||
chmod -x AUTHORS authors.txt Changes.txt README COPYING.txt
|
||||
|
||||
@ -120,11 +113,6 @@ rm CMakeModules/FindZLIB.cmake
|
||||
# locales
|
||||
%find_lang %{name}
|
||||
|
||||
# Use better place for MIME icon.
|
||||
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
|
||||
mv -f %{buildroot}%{_datadir}/icons/{gnome,hicolor}/48x48/mimetypes/application-x-ptoptimizer-script.png
|
||||
rmdir -p --ignore-fail-on-non-empty %{buildroot}%{_datadir}/icons/gnome/48x48/mimetypes
|
||||
|
||||
# Install manually so it can be dedup'ed with the one in the program resources
|
||||
install -m644 -D -t %{buildroot}%{_licensedir}/hugin/ COPYING.txt
|
||||
%fdupes %{buildroot}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user