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

[Martin Jansa <martin.jansa@gmail.com>]

[-- 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 --]