Re: [meta-oe][PATCH] opencv: Upgrade to 2.4.11

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

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

On Wed, Mar 04, 2015 at 09:20:52AM +0100, Mike Looijmans wrote:
> Upgrade OpenCV to the 2.4.11 release.
> 
> Remove the opencv-fix-pkgconfig-generation patch which has been integrated upstream,
> be it in modified form.
> ---
>  .../opencv/opencv-fix-pkgconfig-generation.patch   | 44 ----------------------
>  meta-oe/recipes-support/opencv/opencv_2.4.bb       |  8 ++--
>  2 files changed, 3 insertions(+), 49 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
> 
> diff --git a/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch b/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
> deleted file mode 100644
> index d352778..0000000
> --- a/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -Fix pkg-config generation
> -
> -Replace absolute library path with library name spec and library search
> -path option.
> -
> -The fix has been provided by Ray Rashif (code.opencv.org/issues/1925)
> -
> -Upstream-Status: Pending
> -
> -diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
> ---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake	2012-11-04 08:40:14.243505926 +0000
> -+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake	2012-11-04 08:40:42.286649120 +0000
> -@@ -10,7 +10,7 @@
> - # -------------------------------------------------------------------------------------------
> - set(prefix      "${CMAKE_INSTALL_PREFIX}")
> - set(exec_prefix "\${prefix}")
> --set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
> -+set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
> - set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
> - set(VERSION     ${OPENCV_VERSION})
> - 
> -@@ -36,10 +36,11 @@
> - ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
> - 
> - #build the list of components
> --set(OpenCV_LIB_COMPONENTS_ "")
> -+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
> - foreach(CVLib ${OpenCV_LIB_COMPONENTS})
> -   get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
> -   get_filename_component(libname "${libpath}" NAME)
> -+  get_filename_component(lname "${libpath}" NAME_WE)
> - 
> -   if(INSTALL_TO_MANGLED_PATHS)
> -     set(libname "${libname}.${OPENCV_VERSION}")
> -@@ -52,7 +53,8 @@
> -     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
> -   endif()
> - 
> --  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
> -+  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
> -+  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
> - endforeach()
> - 
> - # add extra dependencies required for OpenCV
> diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> index 63d7c8b..e57f9a6 100644
> --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> @@ -9,12 +9,10 @@ ARM_INSTRUCTION_SET = "arm"
>  
>  DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
>  
> -SRCREV = "df8e28283f09825cca0c2902160b7abebcfe1b64"
> -SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
> -           file://opencv-fix-pkgconfig-generation.patch \
> -"
> +SRCREV = "2c9547e3147779001811d01936aed38f560929fc"
> +SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4"
>  
> -PV = "2.4.9+git${SRCPV}"
> +PV = "2.4.11+git${SRCPV}"

Please Fix this issue first:
WARNING: QA Issue: libopencv-highgui rdepends on jasper, but it isn't a
build dependency? [build-deps]
WARNING: QA Issue: libopencv-highgui rdepends on libdc1394, but it isn't
a build dependency? [build-deps]

>  S = "${WORKDIR}/git"
>  
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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

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