From fdb4f538494049c69b37e21d212e51b31026eef4a42ba74c207c0d42563aa735 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 26 Oct 2022 11:05:45 +0000 Subject: [PATCH] Accepting request 1012014 from home:pgajdos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fixed on flann side by Stefan Brüns - deleted patches - hugin-flann-lz4.patch (not needed) OBS-URL: https://build.opensuse.org/request/show/1012014 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=120 --- hugin-flann-lz4.patch | 12 ------------ hugin.changes | 7 +++++++ hugin.spec | 4 ---- 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 hugin-flann-lz4.patch diff --git a/hugin-flann-lz4.patch b/hugin-flann-lz4.patch deleted file mode 100644 index 264f7c8..0000000 --- a/hugin-flann-lz4.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: hugin-2021.0.0/CMakeModules/FindFLANN.cmake -=================================================================== ---- hugin-2021.0.0.orig/CMakeModules/FindFLANN.cmake -+++ hugin-2021.0.0/CMakeModules/FindFLANN.cmake -@@ -11,6 +11,7 @@ - if(UNIX) - find_package(PkgConfig QUIET) - pkg_check_modules(FLANN flann) -+ set(FLANN_LIBRARIES "lz4;${FLANN_LIBRARIES}") - else() - find_path(FLANN_INCLUDE_DIRS flann/flann.hpp) - diff --git a/hugin.changes b/hugin.changes index c013c5d..193aa07 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 17 07:41:24 UTC 2022 - pgajdos@suse.com + +- fixed on flann side by Stefan Brüns +- deleted patches + - hugin-flann-lz4.patch (not needed) + ------------------------------------------------------------------- Thu Oct 6 13:38:13 UTC 2022 - pgajdos@suse.com diff --git a/hugin.spec b/hugin.spec index 65c2571..5cc6d04 100644 --- a/hugin.spec +++ b/hugin.spec @@ -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 -# workaround, lz4 is not returned by pkg_check_modules(), hardcode it now -Patch1: hugin-flann-lz4.patch BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel BuildRequires: cmake >= 3.1.0 @@ -62,8 +60,6 @@ Recommends: autopano-sift-C Recommends: exiftool %if %{with system_flann} BuildRequires: flann-devel -# until rq#1008410 is not accepted and propagated into factory -BuildRequires: liblz4-devel %endif %if %{with lapack} BuildRequires: lapack-devel