CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv: backport commit to compile with ppc

Browse Source 
During the testing of the meta-ros layer, I discovered that opencv
does not cross-compile for the ppc architecture. The error is
reported in the meta-ros issue tracker #355 [1]. To address this
error,  this commit applies a patch that is already provided upstream
in the opencv version 3.0.

[1] https://github.com/bmwcarit/meta-ros/issues/355

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Lukas Bulwahn 2015-09-18 16:25:46 +02:00 committed by Martin Jansa
parent f4533380c8
commit 97dfbbbf6b
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
meta-oe/recipes-support/opencv/opencv/0001-Use-__vector-instead-of-vector-as-suggests-Eigen.patch Normal file
View File

@ -0,0 +1,49 @@
From 711f07a34ceb504e8f75e978692201efa58268ca Mon Sep 17 00:00:00 2001
From: Dinar Valeev <dvaleev@suse.com>
Date: Thu, 16 Jan 2014 21:53:49 +0100
Subject: [PATCH] Use __vector instead of vector as suggests Eigen
This fixes build on PowerPC where Eigen unsets vector, bool and pixel
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
This patch is already part of OpenCV v3.0. The patch can be obtained
from:
https://github.com/Itseez/opencv/commit/711f07a34ceb504e8f75e978692201efa58268ca.patch
Upstream-Status: Backport [commit 711f07a34c, part of version 3.0]
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
3rdparty/include/opencl/1.2/CL/cl_platform.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/3rdparty/include/opencl/1.2/CL/cl_platform.h b/3rdparty/include/opencl/1.2/CL/cl_platform.h
index e94949a..42c35d5 100644
--- a/3rdparty/include/opencl/1.2/CL/cl_platform.h
+++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h
@@ -332,13 +332,13 @@ typedef unsigned int cl_GLenum;
/* Define basic vector types */
#if defined( __VEC__ )
#include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
- typedef vector unsigned char __cl_uchar16;
- typedef vector signed char __cl_char16;
- typedef vector unsigned short __cl_ushort8;
- typedef vector signed short __cl_short8;
- typedef vector unsigned int __cl_uint4;
- typedef vector signed int __cl_int4;
- typedef vector float __cl_float4;
+ typedef __vector unsigned char __cl_uchar16;
+ typedef __vector signed char __cl_char16;
+ typedef __vector unsigned short __cl_ushort8;
+ typedef __vector signed short __cl_short8;
+ typedef __vector unsigned int __cl_uint4;
+ typedef __vector signed int __cl_int4;
+ typedef __vector float __cl_float4;
#define __CL_UCHAR16__ 1
#define __CL_CHAR16__ 1
#define __CL_USHORT8__ 1
--
1.9.3

3
meta-oe/recipes-support/opencv/opencv_2.4.bb
View File

@ -10,7 +10,8 @@ ARM_INSTRUCTION_SET = "arm"
DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
SRCREV = "2c9547e3147779001811d01936aed38f560929fc"
SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4"
SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
file://0001-Use-__vector-instead-of-vector-as-suggests-Eigen.patch"
PV = "2.4.11+git${SRCPV}"