Attachment 1044375 Details for Bug 1236596 – opencv includes should contain "opencv/"

[patch] opencv includes should contain "opencv/"

simon-opencv3.patch (text/plain), 5.97 KB, created by Jozef Mlich on 2015-06-29 13:44:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jozef Mlich

Created: 2015-06-29 13:44:36 UTC

Size: 5.97 KB

patch

obsolete

>diff --git a/simon-0.4.1-opencv3.patch b/simon-0.4.1-opencv3.patch
>new file mode 100644
>index 0000000..d3c41d6
>--- /dev/null
>+++ b/simon-0.4.1-opencv3.patch
>@@ -0,0 +1,100 @@
>+diff -Naur ./simon-0.4.1/plugins/Conditions/FaceDetection/facedetectioncondition.cpp ./simon-0.4.1-opencv3/plugins/Conditions/FaceDetection/facedetectioncondition.cpp
>+--- ./simon-0.4.1/plugins/Conditions/FaceDetection/facedetectioncondition.cpp	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/plugins/Conditions/FaceDetection/facedetectioncondition.cpp	2015-06-29 14:50:05.581940379 +0200
>+@@ -22,8 +22,8 @@
>+ #include "createfacedetectionconditionwidget.h"
>+ #include <QWidget>
>+ #include "simonvision/faceanalyzer.h"
>+-#include <highgui.h>
>+-#include <cv.h>
>++#include <opencv/highgui.h>
>++#include <opencv/cv.h>
>+ K_PLUGIN_FACTORY(FaceDetectionPluginFactory,
>+                  registerPlugin< FaceDetectionCondition >();
>+                 )
>+diff -Naur ./simon-0.4.1/plugins/Conditions/LipDetection/lipdetectioncondition.cpp ./simon-0.4.1-opencv3/plugins/Conditions/LipDetection/lipdetectioncondition.cpp
>+--- ./simon-0.4.1/plugins/Conditions/LipDetection/lipdetectioncondition.cpp	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/plugins/Conditions/LipDetection/lipdetectioncondition.cpp	2015-06-29 14:51:06.485691289 +0200
>+@@ -22,8 +22,8 @@
>+ #include "createlipdetectionconditionwidget.h"
>+ #include <QWidget>
>+ #include "simonvision/lipanalyzer.h"
>+-#include <highgui.h>
>+-#include <cv.h>
>++#include <opencv/highgui.h>
>++#include <opencv/cv.h>
>+ K_PLUGIN_FACTORY(LipDetectionPluginFactory,
>+                  registerPlugin< LipDetectionCondition >();
>+                 )
>+diff -Naur ./simon-0.4.1/simonlib/simonvision/config/simonwebcamconfiguration.h ./simon-0.4.1-opencv3/simonlib/simonvision/config/simonwebcamconfiguration.h
>+--- ./simon-0.4.1/simonlib/simonvision/config/simonwebcamconfiguration.h	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/simonlib/simonvision/config/simonwebcamconfiguration.h	2015-06-29 14:44:50.906060596 +0200
>+@@ -23,8 +23,8 @@
>+ #include <KCModule>
>+ #include <QVariantList>
>+ #include<QImage>
>+-#include<cv.h>
>+-#include<highgui.h>
>++#include<opencv/cv.h>
>++#include<opencv/highgui.h>
>+ #include "webcamconfigurationanalyzer.h"
>+ #include "ui_simonwebcamconfiguration.h"
>+ #include<QTimer>
>+diff -Naur ./simon-0.4.1/simonlib/simonvision/imageanalyzer.h ./simon-0.4.1-opencv3/simonlib/simonvision/imageanalyzer.h
>+--- ./simon-0.4.1/simonlib/simonvision/imageanalyzer.h	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/simonlib/simonvision/imageanalyzer.h	2015-06-29 14:44:32.106828812 +0200
>+@@ -19,8 +19,8 @@
>+ 
>+ #ifndef IMAGEANALYZER_H
>+ #define IMAGEANALYZER_H
>+-#include <cv.h>
>+-#include <highgui.h>
>++#include <opencv/cv.h>
>++#include <opencv/highgui.h>
>+ #include<QObject>
>+ #include "simonvision_export.h"
>+ 
>+diff -Naur ./simon-0.4.1/simonlib/simonvision/simoncv.h ./simon-0.4.1-opencv3/simonlib/simonvision/simoncv.h
>+--- ./simon-0.4.1/simonlib/simonvision/simoncv.h	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/simonlib/simonvision/simoncv.h	2015-06-29 14:44:40.746935340 +0200
>+@@ -1,9 +1,9 @@
>+ #ifndef SIMONCV_H
>+ #define SIMONCV_H
>+ 
>+-#include "cv.h"
>+-#include "highgui.h"
>+-#include "cxcore.h"
>++#include "opencv/cv.h"
>++#include "opencv/highgui.h"
>++#include "opencv/cxcore.h"
>+ #include<QImage>
>+ #include "simonvision_export.h"
>+ using namespace cv;
>+diff -Naur ./simon-0.4.1/simonlib/simonvision/webcamdispatcher.cpp ./simon-0.4.1-opencv3/simonlib/simonvision/webcamdispatcher.cpp
>+--- ./simon-0.4.1/simonlib/simonvision/webcamdispatcher.cpp	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/simonlib/simonvision/webcamdispatcher.cpp	2015-06-29 14:45:27.972517606 +0200
>+@@ -23,8 +23,8 @@
>+ #include <KDebug>
>+ #include<QThread>
>+ #include <QDateTime>
>+-#include<highgui.h>
>+-#include<cv.h>
>++#include<opencv/highgui.h>
>++#include<opencv/cv.h>
>+ #include "webcamconfiguration.h"
>+ 
>+ using namespace cv;
>+diff -Naur ./simon-0.4.1/simonlib/simonvision/webcamdispatcher.h ./simon-0.4.1-opencv3/simonlib/simonvision/webcamdispatcher.h
>+--- ./simon-0.4.1/simonlib/simonvision/webcamdispatcher.h	2013-06-23 23:57:29.000000000 +0200
>++++ ./simon-0.4.1-opencv3/simonlib/simonvision/webcamdispatcher.h	2015-06-29 14:44:24.411733936 +0200
>+@@ -21,8 +21,8 @@
>+ #define WEBCAMDISPATCHER_H
>+ 
>+ #include "imageanalyzer.h"
>+-#include <cv.h>
>+-#include <highgui.h>
>++#include <opencv/cv.h>
>++#include <opencv/highgui.h>
>+ #include<QList>
>+ #include "simonvision_export.h"
>+ #include<QThread>
>diff --git a/simon.spec b/simon.spec
>index 949264e..5f5ac70 100644
>--- a/simon.spec
>+++ b/simon.spec
>@@ -1,7 +1,7 @@
> Name:    simon
> Summary: Speech recognition
> Version: 0.4.1
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> 
> License: GPLv2+
> URL:     http://www.simon-listens.org/
>@@ -16,6 +16,7 @@ Patch50: simon-0.4.0-LIB_SUFFIX.patch
> Patch51: simon-0.4.0-libeventsimulation_soname.patch
> # don't pass absolute path to KConfig so global simonmodelcompilationrc is found
> Patch52: simon-0.4.0-speechmodelcompilation-kconfig.patch
>+Patch53: simon-0.4.1-opencv3.patch
> 
> ## upstream patches
> # don't mix-n-match double and qreal
>@@ -34,6 +35,7 @@ BuildRequires: pkgconfig(pocketsphinx)
> BuildRequires: pkgconfig(qwt) >= 6
> BuildRequires: pkgconfig(samplerate)
> BuildRequires: qaccessibilityclient-devel
>+BuildRequires: qt-webkit-devel
> 
> # Simon needs binaries from these packages, only -libs autorequired
> Requires: sphinxbase pocketsphinx
>@@ -78,6 +80,7 @@ BuildArch: noarch
> %patch50 -p1 -b .LIB_SUFFIX
> %patch51 -p1 -b .libeventsimulation_soname
> %patch52 -p1 -b .speechmodelcompilation-kconfig
>+%patch53 -p2 -b .opencv3
> %patch100 -p1 -b .qreal
> 
> # drop broken FindOpenCV.cmake
>@@ -170,6 +173,9 @@ fi
> 
> 
> %changelog
>+* Mon Jun 29 2015 Jozef Mlich <jmlich@redhat.com> - 0.4.1-5
>+- includes of opencv headers should contain "opencv/"
>+
> * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1236596: 1044375 | 1062970 | 1062972