SHA256
1
0
forked from pool/hugin

Accepting request 1010482 from graphics

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1010482
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger 2022-10-14 13:42:02 +00:00 committed by Git OBS Bridge
commit f908bcab06
3 changed files with 25 additions and 0 deletions

12
hugin-flann-lz4.patch Normal file
View File

@ -0,0 +1,12 @@
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)

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Oct 6 13:38:13 UTC 2022 - pgajdos@suse.com
- require liblz4-devel temporarily for build, it should be required
by flann-devel
- added patches
workaround, lz4 is not returned by pkg_check_modules(), hardcode it now
+ hugin-flann-lz4.patch
-------------------------------------------------------------------
Wed May 4 08:46:42 UTC 2022 - Marcus Meissner <meissner@suse.com>

View File

@ -31,6 +31,8 @@ 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
@ -60,6 +62,8 @@ 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