Fix fails to build with opencv 3.4.2 (https://github.com/dyne/frei0r/issues/26)
This commit is contained in:
parent
44d04e8844
commit
a58907d6ce
22
27.diff
Normal file
22
27.diff
Normal file
@ -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 <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>
|
@ -6,6 +6,7 @@ Summary: Frei0r - a minimalist plugin API for video effects
|
|||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://frei0r.dyne.org/
|
URL: https://frei0r.dyne.org/
|
||||||
Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz
|
Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz
|
||||||
|
Patch1: 27.diff
|
||||||
|
|
||||||
Buildrequires: libtool
|
Buildrequires: libtool
|
||||||
|
|
||||||
@ -36,7 +37,7 @@ The %{name}-devel package contains libraries and header files for
|
|||||||
developing applications that use %{name}.
|
developing applications that use %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n frei0r-%{version}
|
%autosetup -n frei0r-%{version} -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -47,7 +48,7 @@ autoreconf -i
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install INSTALL="install -p"
|
%make_install
|
||||||
|
|
||||||
#Remove installed doc
|
#Remove installed doc
|
||||||
rm -rf %{buildroot}%{_docdir}/%{name}
|
rm -rf %{buildroot}%{_docdir}/%{name}
|
||||||
@ -72,6 +73,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}
|
|||||||
%changelog
|
%changelog
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-7
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- 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 <releng@fedoraproject.org> - 1.6.1-6
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user