Skip to contentSkip to conversation

opencv: Update to 3.1 and remove bl

PATCH In review Ricardo Ribalda Delgado 4 participants 13 messages Apr 1, 2016 – Apr 3, 2016

lore
Share & tools
lore
#0 lore raw

v7 cover opencv: Update to 3.1 and remove bl

What can I say... Sorry about all the spam :S. This should have never reach v7.

Hopefully all the dependecies are ok this time. It also predownloads the Intel IPP, using bitbake.

I have decided to resend the whole patchset because it is now a mess of v7, v6, v5...

It is also available on
https://github.com/ribalda/meta-openembedded/tree/opencv-v7

Regards

Ricardo Ribalda Delgado (7):
opencv: Fix use before set error on meta package
opencv: Update to version 3.1
opencv: Fix pkg-config file.
opencv: Add missing dependencies
opencv: Use pre-downloaded ipp
opencv: Fix build on x86 platform
opencv: Remove blacklist

 ...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 28 +++++++++++++++++++++
 .../opencv/opencv/fixpkgconfig.patch               | 29 ++++++++++++++++++++++
 .../opencv/{opencv_3.0.bb => opencv_3.1.bb}        | 28 +++++++++++++++------
 3 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
 create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
 rename meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} (86%)
Signature · 1 line
2.8.0.rc3
#1 lore raw

PATCH v7 1/7 opencv: Fix use before set error on meta package

This bug was introducing a loop dependency of opencv->opencv that was confusing dpkg.

---
 meta-oe/recipes-support/opencv/opencv_3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.0.bb +1 -1
index 99ca8b35727d..f6c4ca8fac16 100644
@@ -86,8 +86,8 @@ python populate_packages_prepend () {
             metapkg_rdepends.append(pkg)
     d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends))
 
-    blacklist = [ metapkg ]
     metapkg =  pn
+    blacklist = [ metapkg ]
     metapkg_rdepends = [ ]
     for pkg in packages[1:]:
         if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') :
Signature · 1 line
2.8.0.rc3
#2 lore raw

PATCH v7 2/7 opencv: Update to version 3.1

In reply to Ricardo Ribalda Delgado

The first major update in 3.0 release series

---
 meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} (97%)
meta-oe/recipes-support/opencv/opencv_3.1.bb renamed from meta-oe/recipes-support/opencv/opencv_3.0.bb +4 -4
similarity index 97%
rename from meta-oe/recipes-support/opencv/opencv_3.0.bb
rename to meta-oe/recipes-support/opencv/opencv_3.1.bb
index f6c4ca8fac16..b8fb6a51376f 100644
@@ -10,15 +10,15 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
+DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp"
 
-SRCREV_opencv = "424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69"
-SRCREV_contrib = "844c30e8b2f2f4b34b96a169fafe9beea3c45e87"
+SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
+SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
 SRCREV_FORMAT = "opencv"
 SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
 	   git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib"
 
-PV = "3.0+git${SRCPV}"
+PV = "3.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.8.0.rc3
#3 lore raw

PATCH v7 3/7 opencv: Fix pkg-config file.

In reply to Ricardo Ribalda Delgado

Libdir was pointing to the wrong location

also fix for QA Issue: opencv.pc failed sanity test (tmpdir) in path

---
 .../opencv/opencv/fixpkgconfig.patch               | 29 ++++++++++++++++++++++
 meta-oe/recipes-support/opencv/opencv_3.1.bb       |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch new file +29 -0
new file mode 100644
index 000000000000..3aeda7d4439d
@@ -0,0 +1,29 @@
+diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
+index b8cb8777c06b..75281ee964fd 100644
+--- a/cmake/OpenCVGenPkgconfig.cmake
++++ b/cmake/OpenCVGenPkgconfig.cmake
+@@ -27,7 +27,7 @@ macro(fix_prefix lst isown)
+       get_filename_component(libdir "${item}" PATH)
+       get_filename_component(libname "${item}" NAME_WE)
+       string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}")
+-      list(APPEND _lst "-L${libdir}" "-l${libname}")
++      list(APPEND _lst "-l${libname}")
+     else()
+       list(APPEND _lst "-l${item}")
+     endif()
+@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty)
+ 
+ set(OPENCV_PC_LIBS
+   "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
++  "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
+   "${_modules}"
+ )
+ if (BUILD_SHARED_LIBS)
+-  set(OPENCV_PC_LIBS_PRIVATE "${_extra}")
++  set(OPENCV_PC_LIBS_PRIVATE
++    "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
++    "${_extra}"
++  )
+ else()
+   set(OPENCV_PC_LIBS_PRIVATE
+     "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
meta-oe/recipes-support/opencv/opencv_3.1.bb +2 -1
index b8fb6a51376f..6f0c83829809 100644
@@ -16,7 +16,8 @@ SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
 SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
 SRCREV_FORMAT = "opencv"
 SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
-	   git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib"
+            git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
+            file://fixpkgconfig.patch"
 
 PV = "3.1+git${SRCPV}"
 
Signature · 1 line
2.8.0.rc3
#4 lore raw

PATCH v7 4/7 opencv: Add missing dependencies

In reply to Ricardo Ribalda Delgado

opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-videoio rdepends on libgphotoport, but it isn't a build dependency, missing libgphoto2 in DEPENDS or PACKAGECONFIG? [build-deps] opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-videoio rdepends on libgphoto2, but it isn't a build dependency, missing libgphoto2 in DEPENDS or PACKAGECONFIG? [build-deps] opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-dnn rdepends on protobuf, but it isn't a build dependency, missing protobuf in DEPENDS or PACKAGECONFIG? [build-deps]

Credit-to: Martin Jansa <[email protected]>

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -1
index 6f0c83829809..de6d8d9fe345 100644
@@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp"
+DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp libgphoto2 protobuf protobuf-native"
 
 SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
 SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
Signature · 1 line
2.8.0.rc3
#5 lore raw

PATCH v7 5/7 opencv: Use pre-downloaded ipp

In reply to Ricardo Ribalda Delgado

We should not rely on cmake downloading ipp at configure time.

---
 ...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 28 ++++++++++++++++++++++
 meta-oe/recipes-support/opencv/opencv_3.1.bb       | 12 ++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch new file +28 -0
new file mode 100644
index 000000000000..d568018b8d91
@@ -0,0 +1,28 @@
+From 049f931207631aa54af55a2917318d032b2ef3fa Mon Sep 17 00:00:00 2001
+From: Ricardo Ribalda Delgado <[email protected]>
+Date: Thu, 31 Mar 2016 00:20:15 +0200
+Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp
+
+Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
+---
+ 3rdparty/ippicv/downloader.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake
+index a6016dbe10bc..af4062c8e95e 100644
+--- a/3rdparty/ippicv/downloader.cmake
++++ b/3rdparty/ippicv/downloader.cmake
+@@ -31,8 +31,10 @@ function(_icv_downloader)
+     return() # Not supported
+   endif()
+ 
++  if(NOT DEFINED OPENCV_ICV_PATH)
+   set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack")
+   set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}")
++  endif()
+ 
+   if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED
+        AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH
+-- 
+2.8.0.rc3
+
meta-oe/recipes-support/opencv/opencv_3.1.bb +12 -0
index de6d8d9fe345..63955a862d4a 100644
@@ -14,19 +14,31 @@ DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libw
 
 SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
 SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
+SRCREV_party3 = "81a676001ca8075ada498583e4166079e5744668"
+IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
+
 SRCREV_FORMAT = "opencv"
 SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
             git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
+            git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \
+            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
             file://fixpkgconfig.patch"
 
 PV = "3.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
+do_unpack_extra() {
+    tar xzf ${WORKDIR}/party3/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR}
+}
+addtask unpack_extra after do_unpack before do_patch
+
 EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \
 		 -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
                  -DWITH_1394=OFF \
                  -DCMAKE_SKIP_RPATH=ON \
+                 -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \
+                 -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \
                  ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
                  ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
                  ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
Signature · 1 line
2.8.0.rc3
#6 lore raw

PATCH v7 6/7 opencv: Fix build on x86 platform

In reply to Ricardo Ribalda Delgado

OpenCV wrongly assumes that the X86 variable would be set on Intel 32 bit architectures.

This patch adds the missing definition on those cases.

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -0
index 63955a862d4a..b89fbbb214f6 100644
@@ -45,6 +45,7 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
                  ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
+EXTRA_OECMAKE_append_x86 = "-DX86=ON"
 
 PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \
                    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
Signature · 1 line
2.8.0.rc3
#7 lore raw

Re: [meta-oe][PATCH v7 6/7] opencv: Fix build on x86 platform

Quoted 15 lines · Ricardo Ribalda Delgado

OpenCV wrongly assumes that the X86 variable would be set on Intel 32 bit architectures.

This patch adds the missing definition on those cases.

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -0
index 63955a862d4a..b89fbbb214f6 100644

meta-oe/recipes-support/opencv/opencv_3.1.bb EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI · line 48

Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -0
@@ -45,6 +45,7 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
                  ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
+EXTRA_OECMAKE_append_x86 = "-DX86=ON"

That should be:

EXTRA_OECMAKE_append_x86 = " -DX86=ON"

Note the leading space. See:

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

Quoted 6 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -1
 PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \
                    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
--

2.8.0.rc3

#8 lore raw

Re: [meta-oe][PATCH v7 6/7] opencv: Fix build on x86 platform

Hi Andre

+= does not add the leading space?

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

I thought += was preferred.

I am confused. What shall I resend += " foo" or = " foo" ?

Regards

Quoted 36 lines · Andre McCurdy
Quoted 15 lines · Ricardo Ribalda Delgado

OpenCV wrongly assumes that the X86 variable would be set on Intel 32 bit architectures.

This patch adds the missing definition on those cases.

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -0
index 63955a862d4a..b89fbbb214f6 100644

meta-oe/recipes-support/opencv/opencv_3.1.bb EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI · line 48

Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -0
@@ -45,6 +45,7 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
                  ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
+EXTRA_OECMAKE_append_x86 = "-DX86=ON"

That should be:

EXTRA_OECMAKE_append_x86 = " -DX86=ON"

Note the leading space. See:

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

Quoted 6 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -1
 PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \
                    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
--

2.8.0.rc3

Signature · 1 line
Ricardo Ribalda
#9 lore raw

Re: [meta-oe][PATCH v7 6/7] opencv: Fix build on x86 platform

Quoted 10 lines · Ricardo Ribalda Delgado

Hi Andre

+= does not add the leading space?

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

I thought += was preferred.

its not a designed behavior but a byproduct.

Quoted 2 lines

I am confused. What shall I resend += " foo" or = " foo”

append/prepend without any override style syntax is much cleaner to understand

Quoted 52 lines

?

Regards

Quoted 24 lines · Andre McCurdy
Quoted 17 lines · Ricardo Ribalda Delgado

OpenCV wrongly assumes that the X86 variable would be set on Intel 32 bit architectures.

This patch adds the missing definition on those cases.

---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 +

1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -0
index 63955a862d4a..b89fbbb214f6 100644
@@ -45,6 +45,7 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
                 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                 ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
Quoted 2 lines

"
+EXTRA_OECMAKE_append_x86 = "-DX86=ON"

That should be:

Quoted 12 lines

EXTRA_OECMAKE_append_x86 = " -DX86=ON"

Note the leading space. See:

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

Quoted 6 lines

PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \

                   ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \

--
2.8.0.rc3

--
Ricardo Ribalda
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#10 lore raw

Re: [meta-oe][PATCH v7 6/7] opencv: Fix build on x86 platform

In reply to Ricardo Ribalda Delgado
Quoted 3 lines · Ricardo Ribalda Delgado

Hi Andre

+= does not add the leading space?

It does. But the preferred way is not to combine _append and +=. Therefore if you use _append, you should combine it with = and add the leading space explicitly.

Quoted 3 lines

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

I thought += was preferred.

Where does it say that?

Quoted 1 line

I am confused. What shall I resend += " foo" or = " foo" ?

Martin's comment (in reply to the v4 patch) was:

"Please don't combine _append and +=. _append and leading space in value (as you already have) is enough."

The version you should use is:

EXTRA_OECMAKE_append_x86 = " -DX86=ON"

Quoted 44 lines

Regards

Quoted 24 lines · Andre McCurdy
Quoted 15 lines · Ricardo Ribalda Delgado

OpenCV wrongly assumes that the X86 variable would be set on Intel 32 bit architectures.

This patch adds the missing definition on those cases.

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -0
index 63955a862d4a..b89fbbb214f6 100644

meta-oe/recipes-support/opencv/opencv_3.1.bb EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI · line 48

Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -0
@@ -45,6 +45,7 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
                  ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
+EXTRA_OECMAKE_append_x86 = "-DX86=ON"

That should be:

Quoted 12 lines

EXTRA_OECMAKE_append_x86 = " -DX86=ON"

Note the leading space. See:

http://www.yoctoproject.org/docs/2.0/bitbake-user-manual/bitbake-user-manual.html#appending-and-prepending-override-style-syntax

Quoted 6 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -1
 PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \
                    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
--

2.8.0.rc3

--
Ricardo Ribalda

#11 lore raw

PATCH v7 7/7 opencv: Remove blacklist

In reply to Ricardo Ribalda Delgado

Opencv 3.1 builds fine with ffmpeg.

ricardo@neopili:~/curro/qt5022/oe/openembedded-core/build$ bitbake
opencv
Loading cache: 100%
|############################################################################|
ETA:  00:00:00
Loaded 2018 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies

Build Configuration:

BB_VERSION        = "1.29.0"
BUILD_SYS         = "x86_64-linux"
NATIVELSBSTRING   = "Debian-testing"
TARGET_SYS        = "i586-oe-linux"
MACHINE           = "qemux86"
DISTRO            = "nodistro"
DISTRO_VERSION    = "nodistro.0"
TUNE_FEATURES     = "m32 i586"
TARGET_FPU        = ""
meta              = "master:300f858ba07c938427ccd05a3d7220027a03d461"
meta-oe           = "master:29462f7161b346dbc2ea00830da869a0a1c35fb9"

NOTE: Preparing RunQueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
NOTE: Tasks Summary: Attempted 1242 tasks of which 1228 didn't need to be rerun and all succeeded.

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -2
index b89fbbb214f6..3501db6d16ab 100644
@@ -146,5 +146,3 @@ do_install_append() {
     cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/
 }
 
-# http://errors.yoctoproject.org/Errors/Details/40660/
-PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"
Signature · 1 line
2.8.0.rc3
#12 lore raw
In reply to Ricardo Ribalda Delgado
Quoted 8 lines · Ricardo Ribalda Delgado

What can I say... Sorry about all the spam :S. This should have never reach v7.

Hopefully all the dependecies are ok this time. It also predownloads the Intel IPP, using bitbake.

I have decided to resend the whole patchset because it is now a mess of v7, v6, v5...

Previous revision failed like this:
http://errors.yoctoproject.org/Errors/Details/59759/

and latest revision doesn't look to fix this.

Can you double check?

Quoted 26 lines

It is also available on
https://github.com/ribalda/meta-openembedded/tree/opencv-v7

Regards

Ricardo Ribalda Delgado (7):
opencv: Fix use before set error on meta package
opencv: Update to version 3.1
opencv: Fix pkg-config file.
opencv: Add missing dependencies
opencv: Use pre-downloaded ipp
opencv: Fix build on x86 platform
opencv: Remove blacklist

 ...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 28 +++++++++++++++++++++
 .../opencv/opencv/fixpkgconfig.patch               | 29 ++++++++++++++++++++++
 .../opencv/{opencv_3.0.bb => opencv_3.1.bb}        | 28 +++++++++++++++------
 3 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
 create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
 rename meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} (86%)
Signature · 1 line
2.8.0.rc3
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]