[meta-oe][PATCH v2 1/4] opencv_3: Fix use before set error on meta package

[meta-oe][PATCH v2 1/4] opencv_3: Fix use before set error on meta package

[Ricardo Ribalda Delgado]

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

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index 99ca8b35727d..f6c4ca8fac16 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -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') :
-- 
2.7.0

[meta-oe][PATCH v2 2/4] opencv: Remove blacklist

[Ricardo Ribalda Delgado]

Version 3.0 builds fine with ffmpeg v3

[ 32%] Building CXX object
modules/videoio/CMakeFiles/opencv_videoio.dir/src/cap_ffmpeg.cpp.o
DEBUG: Shell function do_compile finished

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_3.0.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index f6c4ca8fac16..1a34efa7f01f 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -130,7 +130,4 @@ do_install_append() {
 
     install -d ${D}${datadir}/OpenCV/samples/bin/
     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"
+}
\ No newline at end of file
-- 
2.7.0

[meta-oe][PATCH v2 3/4] opencv: Update to version 3.1

[Ricardo Ribalda Delgado]

The first major update in 3.0 release series

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 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%)

diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
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 1a34efa7f01f..9fd3b12e3631 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -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"
 
-- 
2.7.0

[meta-oe][PATCH v2 4/4] opencv: Fix pkg-config file.

[Ricardo Ribalda Delgado]

It was pointing to the wrong location

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch | 12 ++++++++++++
 meta-oe/recipes-support/opencv/opencv_3.1.bb             |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch

diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
new file mode 100644
index 000000000000..4ac3e888e1f0
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
+index b8cb8777c06b..081c62dafd77 100644
+--- a/cmake/OpenCVGenPkgconfig.cmake
++++ b/cmake/OpenCVGenPkgconfig.cmake
+@@ -66,6 +66,7 @@ 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)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 9fd3b12e3631..c403852cf405 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -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}"
 
-- 
2.7.0

Re: [meta-oe][PATCH v2 2/4] opencv: Remove blacklist

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

On Mon, Mar 14, 2016 at 01:13:36PM +0100, Ricardo Ribalda Delgado wrote:
> Version 3.0 builds fine with ffmpeg v3

No it doesn't, 3.1 might

http://errors.yoctoproject.org/Errors/Details/55791/

> 
> [ 32%] Building CXX object
> modules/videoio/CMakeFiles/opencv_videoio.dir/src/cap_ffmpeg.cpp.o
> DEBUG: Shell function do_compile finished
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  meta-oe/recipes-support/opencv/opencv_3.0.bb | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
> index f6c4ca8fac16..1a34efa7f01f 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
> @@ -130,7 +130,4 @@ do_install_append() {
>  
>      install -d ${D}${datadir}/OpenCV/samples/bin/
>      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"
> +}
> \ No newline at end of file
> -- 
> 2.7.0
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-oe][PATCH v2 2/4] opencv: Remove blacklist

[Ricardo Ribalda Delgado]

That is really weird. I was pretty sure that I tried it fine on my build.

Let me build it again from scratch.

Sorry!

On Tue, Mar 15, 2016 at 11:36 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Mar 14, 2016 at 01:13:36PM +0100, Ricardo Ribalda Delgado wrote:
>> Version 3.0 builds fine with ffmpeg v3
>
> No it doesn't, 3.1 might
>
> http://errors.yoctoproject.org/Errors/Details/55791/
>
>>
>> [ 32%] Building CXX object
>> modules/videoio/CMakeFiles/opencv_videoio.dir/src/cap_ffmpeg.cpp.o
>> DEBUG: Shell function do_compile finished
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> ---
>>  meta-oe/recipes-support/opencv/opencv_3.0.bb | 5 +----
>>  1 file changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
>> index f6c4ca8fac16..1a34efa7f01f 100644
>> --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
>> +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
>> @@ -130,7 +130,4 @@ do_install_append() {
>>
>>      install -d ${D}${datadir}/OpenCV/samples/bin/
>>      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"
>> +}
>> \ No newline at end of file
>> --
>> 2.7.0
>>
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Ricardo Ribalda

Re: [meta-oe][PATCH v2 4/4] opencv: Fix pkg-config file.

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2468 bytes --]

On Mon, Mar 14, 2016 at 01:13:38PM +0100, Ricardo Ribalda Delgado wrote:
> It was pointing to the wrong location
> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch | 12 ++++++++++++
>  meta-oe/recipes-support/opencv/opencv_3.1.bb             |  3 ++-
>  2 files changed, 14 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
> 
> diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
> new file mode 100644
> index 000000000000..4ac3e888e1f0
> --- /dev/null
> +++ b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
> @@ -0,0 +1,12 @@
> +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
> +index b8cb8777c06b..081c62dafd77 100644
> +--- a/cmake/OpenCVGenPkgconfig.cmake
> ++++ b/cmake/OpenCVGenPkgconfig.cmake
> +@@ -66,6 +66,7 @@ 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)
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> index 9fd3b12e3631..c403852cf405 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> @@ -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"

Please don't mix tabs and spaces, use 4 spaces everywhere.

3.1 doesn't fails with ffmpeg 3.0 but this fix isn't enough, still shows:

ERROR: QA Issue: opencv.pc failed sanity test (tmpdir) in path
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/opencv/3.1+gitAUTOINC+92387b1ef8-r0/sysroot-destdir/usr/lib/pkgconfig
[pkgconfig]

http://errors.yoctoproject.org/Errors/Details/56596/

>  
>  PV = "3.1+git${SRCPV}"
>  
> -- 
> 2.7.0
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]