Hello community, here is the log from the commit of package frei0r-plugins for openSUSE:Factory checked in at 2018-11-06 15:26:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frei0r-plugins (Old) and /work/SRC/openSUSE:Factory/.frei0r-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frei0r-plugins" Tue Nov 6 15:26:28 2018 rev:15 rq:645693 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/frei0r-plugins/frei0r-plugins.changes 2017-12-12 21:19:38.888047974 +0100 +++ /work/SRC/openSUSE:Factory/.frei0r-plugins.new/frei0r-plugins.changes 2018-11-06 15:26:44.400398617 +0100 @@ -1,0 +2,7 @@ +Wed Oct 31 09:37:20 UTC 2018 - Christophe Giboudeaux <[email protected]> + +- Add frei0r-plugins-openCV-3.4.2-compatibility.patch to fix a + build failure with openCV > 3.4.1 +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- frei0r-plugins-openCV-3.4.2-compatibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frei0r-plugins.spec ++++++ --- /var/tmp/diff_new_pack.riNZ1N/_old 2018-11-06 15:26:46.176395921 +0100 +++ /var/tmp/diff_new_pack.riNZ1N/_new 2018-11-06 15:26:46.176395921 +0100 @@ -1,7 +1,7 @@ # # spec file for package frei0r-plugins # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,14 +21,16 @@ Release: 0 Summary: Collection of video sources and filters plugins # Upstream says 2.0+ but quite few of their plugins are GPL-3.0+ -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors -Url: http://frei0r.dyne.org/ +URL: http://frei0r.dyne.org/ Source0: http://files.dyne.org/frei0r/releases/frei0r-plugins-%{version}.tar.gz # PATCH-FIX-UPSTREAM frei0r-plugins-1.4-missing_include.patch http://www.piksel.no/projects/frei0r/ticket/41 [email protected] -- Add missing header Patch0: frei0r-plugins-1.4-missing_include.patch # PATCH-FIX-UPSTREAM frei0r-plugins-openCV-3.0-compatibility.patch [email protected] -- Make it compile with openCV3. This is a rebase of the two usptream commits by Dan Dennedy Patch1: frei0r-plugins-openCV-3.0-compatibility.patch +# PATCH-FIX-UPSTREAM frei0r-plugins-openCV-3.4.2-compatibility.patch -- Fix build with opencv > 3.4.1 +Patch2: frei0r-plugins-openCV-3.4.2-compatibility.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -66,6 +68,7 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build autoreconf -fvi @@ -77,12 +80,14 @@ rm %{buildroot}%{_datadir}/doc/frei0r-plugins/{AUTHORS.txt,ChangeLog.txt,README.txt,TODO.txt} %files -%doc AUTHORS.txt ChangeLog.txt COPYING.txt README.txt +%license COPYING.txt +%doc AUTHORS.txt ChangeLog.txt README.txt %{_libdir}/frei0r-1/ %exclude %{_libdir}/frei0r-1/facebl0r.so %exclude %{_libdir}/frei0r-1/facedetect.so %files opencv +%license COPYING.txt %dir %{_libdir}/frei0r-1 %{_libdir}/frei0r-1/facebl0r.so %{_libdir}/frei0r-1/facedetect.so ++++++ frei0r-plugins-openCV-3.4.2-compatibility.patch ++++++ Author: Christoph Willing <[email protected]> Date: Sun Jul 15 10:30:23 2018 +1000 Check opencv version Signed-off-by: Christoph Willing <[email protected]> diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp index 6d6e8f2..7bd7794 100644 --- a/src/filter/facebl0r/facebl0r.cpp +++ b/src/filter/facebl0r/facebl0r.cpp @@ -14,11 +14,17 @@ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - +#include <opencv2/core/version.hpp> +#define CV_VERSION_NUM (CV_VERSION_MAJOR * 10000 \ + + CV_VERSION_MINOR * 100 \ + + CV_VERSION_REVISION) #include <stdio.h> #include <stdlib.h> #include <opencv/cv.h> #include <opencv/highgui.h> +#if CV_VERSION_NUM > 30401 +#include <opencv2/imgproc.hpp> +#endif #include <frei0r.hpp> #include <frei0r_math.h>
