rpms/libfreenect
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for OpenCV4

Browse Source
This commit is contained in:
Nicolas Chauvet 2020-01-27 13:33:42 +01:00
parent db21e1e034
commit f53d62f564
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libfreenect-opencv4.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp.cv4 libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp
--- libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp.cv4 2020-01-27 13:26:58.804395458 +0100
+++ libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/cvdemo.cpp 2020-01-27 13:26:58.808395477 +0100
@@ -1,5 +1,4 @@
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <opencv2/highgui/highgui_c.h>
#include <stdio.h>
#include "libfreenect_cv.h"
diff -up libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h.cv4 libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h
--- libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h.cv4 2020-01-27 13:26:58.804395458 +0100
+++ libfreenect-88166014859c09f6ad6a93f0862bdcc4e46dc87e/wrappers/opencv/libfreenect_cv.h 2020-01-27 13:29:39.237158488 +0100
@@ -1,6 +1,6 @@
#pragma once
-#include <opencv/cv.h>
+#include <opencv2/core/core_c.h>
#ifdef __cplusplus
extern "C" {

8
libfreenect.spec
View File

@ -8,7 +8,7 @@
Name: libfreenect
Version: 0.5.7
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Device driver for the Kinect
# Core libfreenect is available as ASL 2.0 OR GPLv2
# OpenNI driver is available as ASL 2.0
@ -30,6 +30,8 @@ Patch7: %{name}-0.5.5-py3.patch
# https://github.com/OpenKinect/libfreenect/pull/555
Patch8: 0001-Build-libfreenect_cv-and-cvdemo-as-C-sources.patch
Patch9: 0002-Fix-bugs-in-sync-library-error-handling.patch
# Fixup of OpenCV fixes
Patch10: libfreenect-opencv4.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@ -115,6 +117,7 @@ rm -rf platform/windows
%patch7 -p1 -b .py3
%patch8 -p1
%patch9 -p1
%patch10 -p1 -b .cv4
%build
mkdir build
@ -199,6 +202,9 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/
%{_libdir}/openni2
%changelog
* Mon Jan 27 2020 Nicolas Chauvet <kwizart@gmail.com> - 0.5.7-12
- Fix for OpenCV4
* Sun Dec 29 2019 Nicolas Chauvet <kwizart@gmail.com> - 0.5.7-11
- Rebuilt for opencv4