From a58907d6ce7d5f2cb6d6fd4bfb4fae3e6f87400f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Feb 2019 16:52:32 +0000 Subject: [PATCH] Fix fails to build with opencv 3.4.2 (https://github.com/dyne/frei0r/issues/26) --- 27.diff | 22 ++++++++++++++++++++++ frei0r-plugins.spec | 6 ++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 27.diff diff --git a/27.diff b/27.diff new file mode 100644 index 0000000..82d8d6c --- /dev/null +++ b/27.diff @@ -0,0 +1,22 @@ +diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp +index 6d6e8f2..10fcdb7 100644 +--- a/src/filter/facebl0r/facebl0r.cpp ++++ b/src/filter/facebl0r/facebl0r.cpp +@@ -15,10 +15,17 @@ + */ + + ++#include ++#define CV_VERSION_NUM (CV_VERSION_MAJOR * 10000 \ ++ + CV_VERSION_MINOR * 100 \ ++ + CV_VERSION_REVISION) + #include + #include + #include + #include ++#if CV_VERSION_NUM > 30401 ++#include ++#endif + + #include + #include diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index b89656c..02eb0ba 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -6,6 +6,7 @@ Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz +Patch1: 27.diff Buildrequires: libtool @@ -36,7 +37,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -n frei0r-%{version} +%autosetup -n frei0r-%{version} -p1 %build @@ -47,7 +48,7 @@ autoreconf -i %install -%make_install INSTALL="install -p" +%make_install #Remove installed doc rm -rf %{buildroot}%{_docdir}/%{name} @@ -72,6 +73,7 @@ rm -rf %{buildroot}%{_docdir}/%{name} %changelog * Thu Jan 31 2019 Fedora Release Engineering - 1.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +- Fix fails to build with opencv 3.4.2 (https://github.com/dyne/frei0r/issues/26) * Fri Jul 13 2018 Fedora Release Engineering - 1.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild