diff options
| author |   Koen Kooi <koen@openembedded.org> | 2011-02-22 11:01:33 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2011-02-22 11:29:27 +0100 |
| commit | 0c1366f3bbd5808d69e9576bd18bbdd4b0798003 (patch) | |
| tree | dcf67f5cec9770975fdad710f572788c9b8e815e | |
| parent | 8e4bd2fd4cbf1c75acd30adbd3aaa074c3175a3e (diff) | |
| download | openembedded-0c1366f3bbd5808d69e9576bd18bbdd4b0798003.tar.gz | |
opencv 2.2: unbreak SIFT for ARM
https://code.ros.org/trac/opencv/ticket/910
Signed-off-by: Koen Kooi <koen@openembedded.org>
| -rw-r--r-- | recipes/opencv/opencv/0001-SIFT-unbreak-non-android-ARM-builds.patch | 30 | ||||
| -rw-r--r-- | recipes/opencv/opencv_2.2.bb | 5 |
2 files changed, 32 insertions, 3 deletions
diff --git a/recipes/opencv/opencv/0001-SIFT-unbreak-non-android-ARM-builds.patch b/recipes/opencv/opencv/0001-SIFT-unbreak-non-android-ARM-builds.patch new file mode 100644 index 0000000000..977c379604 --- /dev/null +++ b/recipes/opencv/opencv/0001-SIFT-unbreak-non-android-ARM-builds.patch @@ -0,0 +1,30 @@ +From 041de20b0c9f3c35d02ab38fa743900cbfe1268b Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 22 Feb 2011 10:53:52 +0100 +Subject: [PATCH] SIFT: unbreak non-android ARM builds + +https://code.ros.org/trac/opencv/ticket/910 + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + opencv/modules/features2d/src/sift.cpp | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/opencv/modules/features2d/src/sift.cpp b/opencv/modules/features2d/src/sift.cpp +index e763db2..f518c92 100644 +--- a/opencv/modules/features2d/src/sift.cpp ++++ b/opencv/modules/features2d/src/sift.cpp +@@ -48,10 +48,6 @@ + + #include "precomp.hpp" + +-#ifdef __arm__ +-#define ARM_NO_SIFT +-#endif +- + #ifdef ANDROID + #undef ARM_NO_SIFT + #endif //ANDROID +-- +1.6.6.1 + diff --git a/recipes/opencv/opencv_2.2.bb b/recipes/opencv/opencv_2.2.bb index c962df91e6..3df13df2ad 100644 --- a/recipes/opencv/opencv_2.2.bb +++ b/recipes/opencv/opencv_2.2.bb @@ -9,20 +9,19 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "python-numpy ffmpeg gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0" SRC_URI = "svn://code.ros.org/svn/opencv/branches/2.2;module=opencv;proto=https \ + file://0001-SIFT-unbreak-non-android-ARM-builds.patch;striplevel=2 \ " PARALLEL_MAKE = "" SRCREV = "4462" PV = "2.2.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/opencv" inherit distutils-base pkgconfig cmake -EXTRA_OECMAKE = "-DBUILD_TESTS=0" - export BUILD_SYS export HOST_SYS export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" |