Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hugin for openSUSE:Factory checked in at 2021-08-30 13:55:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hugin (Old)
and /work/SRC/openSUSE:Factory/.hugin.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin"
Mon Aug 30 13:55:21 2021 rev:69 rq:914957 version:2020.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2021-08-16 10:17:30.170665076 +0200
+++ /work/SRC/openSUSE:Factory/.hugin.new.1899/hugin.changes 2021-08-30 13:55:41.069859076 +0200
@@ -1,0 +2,12 @@
+Thu Aug 12 01:47:14 UTC 2021 - Atri Bhattacharya
+
+- Add hugin-EGL-link-against-X11.patch: Link against X11 even when
+ building with EGL support
+ (https://bugs.launchpad.net/hugin/+bug/1938453).
+- Set up conditionals for building with EGL, but disable EGL
+ support until glew bug is fixed (gh#nigels-com/glew#315).
+- Switch bcond_with to build with system flann: library is now
+ available on all supported openSUSE versions.
+- Minor cleanup with spec-cleaner.
+
+-------------------------------------------------------------------
New:
----
hugin-EGL-link-against-X11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hugin.spec ++++++
--- /var/tmp/diff_new_pack.z8wmqq/_old 2021-08-30 13:55:41.721859913 +0200
+++ /var/tmp/diff_new_pack.z8wmqq/_new 2021-08-30 13:55:41.729859923 +0200
@@ -16,11 +16,25 @@
#
+%define mversion 2020.0
%bcond_with hsi
-%bcond_with system_flann
+%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
+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/
+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
@@ -28,47 +42,39 @@
BuildRequires: exiftool
BuildRequires: fdupes
BuildRequires: fftw3-devel
-BuildRequires: libboost_filesystem-devel
-BuildRequires: libboost_system-devel
-%if %{with system_flann}
-BuildRequires: flann-devel
-%endif
BuildRequires: gcc-c++
BuildRequires: glew-devel
-%if %{with lapack}
-BuildRequires: lapack-devel
-%endif
+BuildRequires: libboost_filesystem-devel
+BuildRequires: libboost_system-devel
BuildRequires: libexiv2-devel
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpano-devel >= 2.9.19
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
-%if %{with hsi}
-BuildRequires: python-wxWidgets >= 3
-BuildRequires: swig
-%endif
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
BuildRequires: update-desktop-files
BuildRequires: vigra-devel
-BuildRequires: wxGTK3-devel >= 3
-%define mversion 2020.0
-Version: 2020.0.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/
-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
+BuildRequires: wxGTK3-devel >= 3.1.5
Requires: enblend-enfuse >= 3.2
# needed for photo stiching (bnc#822775)
Requires: make
Recommends: autopano-sift-C
Recommends: exiftool
+%if %{with system_flann}
+BuildRequires: flann-devel
+%endif
+%if %{with lapack}
+BuildRequires: lapack-devel
+%endif
+%if %{with hsi}
+BuildRequires: python-wxWidgets >= 3
+BuildRequires: swig
+%endif
+%if %{with egl}
+BuildRequires: pkgconfig(egl)
+%endif
%description
Hugin can be used to stitch multiple images together. The resulting
@@ -83,6 +89,7 @@
%setup -q
%patch0
%patch1 -p1
+%patch2 -p1
chmod -x AUTHORS authors.txt Changes.txt README COPYING.txt
@@ -99,7 +106,8 @@
-DENABLE_LAPACK=%{?with_lapack:ON}%{!?with_lapack:OFF} \
-DBUILD_HSI=%{?with_hsi:ON}%{!?with_hsi:OFF} \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DUSE_GDKBACKEND_X11:BOOL=ON
+ -DBUILD_WITH_EGL:BOOL=%{?with_egl:ON}%{!?with_egl:OFF} \
+ -DUSE_GDKBACKEND_X11:BOOL=%{?with_egl:OFF}%{!?with_egl:ON}
%cmake_build
@@ -110,7 +118,7 @@
%suse_update_desktop_file PTBatcherGUI 2DGraphics
%suse_update_desktop_file calibrate_lens_gui 2DGraphics
# locales
-%{find_lang} %{name}
+%find_lang %{name}
# Use better place for MIME icon.
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
@@ -135,6 +143,6 @@
%{_datadir}/metainfo/*xml
%dir %{_libdir}/hugin
%{_libdir}/hugin/*.so.*
-%doc %{_mandir}/man?/*.*
+%{_mandir}/man?/*.*
%changelog
++++++ hugin-EGL-link-against-X11.patch ++++++
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()