Skip to contentSkip to conversation

OpenCV Update to 3.1 and remove blacklist

PATCH Superseded Ricardo Ribalda Delgado 2 participants 11 messages Mar 31, 2016

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v4 cover OpenCV Update to 3.1 and remove blacklist

Hi, I hope this is the last patchset version (cross fingers).

It has been tested with x86 and x86-64.

Depends on pyton-numpy: Add definition of off_t size (from oe-core)

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}        | 24 ++++++++++++------
 3 files changed, 73 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} (87%)
Signature · 1 line
2.8.0.rc3
#1 lore raw

PATCH v4 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 v4 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 v4 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 v4 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 v4 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       |  8 +++++++
 2 files changed, 36 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 +8 -0
index de6d8d9fe345..84a592799c0a 100644
@@ -14,9 +14,15 @@ DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libw
 
 SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
 SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
+IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
+SRC_URI[ipp.md5sum] = "${IPP_MD5}"
+SRC_URI[ipp.sha256sum] = "4333833e40afaa22c804169e44f9a63e357e21476b765a5683bcb3760107f0da"
+
 SRCREV_FORMAT = "opencv"
 SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
             git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
+            https://raw.githubusercontent.com/Itseez/opencv_3rdparty/81a676001ca8075ada498583e4166079e5744668/ippicv/ippicv_linux_20151201.tgz;name=ipp \
+            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
             file://fixpkgconfig.patch"
 
 PV = "3.1+git${SRCPV}"
@@ -27,6 +33,8 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
 		 -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

Re: [meta-oe][PATCH v4 5/7] opencv: Use pre-downloaded ipp

Quoted 48 lines · 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       |  8 +++++++
 2 files changed, 36 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 +0 -0
index de6d8d9fe345..84a592799c0a 100644

meta-oe/recipes-support/opencv/opencv_3.1.bb DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libw · line 20

Quoted 7 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +4 -0
@@ -14,9 +14,15 @@ DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libw
 
 SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
 SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
+IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
+SRC_URI[ipp.md5sum] = "${IPP_MD5}"
+SRC_URI[ipp.sha256sum] = "4333833e40afaa22c804169e44f9a63e357e21476b765a5683bcb3760107f0da"
+

Why don't you add normal git repo https://github.com/Itseez/opencv_3rdparty
in corresponding branch/revision?

Quoted 20 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +4 -0
 SRCREV_FORMAT = "opencv"
 SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
             git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
+            https://raw.githubusercontent.com/Itseez/opencv_3rdparty/81a676001ca8075ada498583e4166079e5744668/ippicv/ippicv_linux_20151201.tgz;name=ipp \
+            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
             file://fixpkgconfig.patch"
 
 PV = "3.1+git${SRCPV}"
@@ -27,6 +33,8 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
 		 -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
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#7 lore raw

Re: [meta-oe][PATCH v4 5/7] opencv: Use pre-downloaded ipp

Hi Martin

Quoted 9 lines

meta-oe/recipes-support/opencv/opencv_3.1.bb DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libw · line 20

Quoted 6 lines

SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"

meta-oe/recipes-support/opencv/opencv_3.1.bb +4 -0
+IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
+SRC_URI[ipp.md5sum] = "${IPP_MD5}"
+SRC_URI[ipp.sha256sum] = "4333833e40afaa22c804169e44f9a63e357e21476b765a5683bcb3760107f0da"
+

Why don't you add normal git repo https://github.com/Itseez/opencv_3rdparty
in corresponding branch/revision?

Because this mimics better what is done by the configure script, there are less things to download, and the unpack of the .tgz is automagically done

But if you dont like it I can change it.

--
Ricardo Ribalda

#8 lore raw

PATCH v4 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 84a592799c0a..7f09168784d9 100644
@@ -41,6 +41,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
#9 lore raw

Re: [meta-oe][PATCH v4 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 84a592799c0a..7f09168784d9 100644

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

Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -0
@@ -41,6 +41,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"

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

Quoted 6 lines
meta-oe/recipes-support/opencv/opencv_3.1.bb +0 -0
 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
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#10 lore raw

PATCH v4 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 7f09168784d9..a0e7bf948ece 100644
@@ -142,5 +142,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