* [meta-oe][PATCH] opencv: Upgrade to 2.4.11 @ 2015-03-04 8:20 Mike Looijmans 2015-03-04 22:03 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Mike Looijmans @ 2015-03-04 8:20 UTC (permalink / raw) To: openembedded-devel 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}" S = "${WORKDIR}/git" -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] opencv: Upgrade to 2.4.11 2015-03-04 8:20 [meta-oe][PATCH] opencv: Upgrade to 2.4.11 Mike Looijmans @ 2015-03-04 22:03 ` Martin Jansa 2015-03-05 7:33 ` Mike Looijmans 0 siblings, 1 reply; 5+ messages in thread From: Martin Jansa @ 2015-03-04 22:03 UTC (permalink / raw) To: openembedded-devel [-- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] opencv: Upgrade to 2.4.11 2015-03-04 22:03 ` Martin Jansa @ 2015-03-05 7:33 ` Mike Looijmans 2015-03-05 8:21 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Mike Looijmans @ 2015-03-05 7:33 UTC (permalink / raw) To: openembedded-devel On 04-03-15 23:03, Martin Jansa wrote: > 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] I didn't get any warnings, which platform did you use? I guess the recipe needs some explicit "disable" calls, it probably auto-detected these on your system. > >> S = "${WORKDIR}/git" >> >> -- >> 1.9.1 >> >> -- >> Met vriendelijke groet / kind regards, Mike Looijmans System Expert TOPIC Embedded Systems Eindhovenseweg 32-C, NL-5683 KH Best Postbus 440, NL-5680 AK Best Telefoon: (+31) (0) 499 33 69 79 Telefax: (+31) (0) 499 33 69 70 E-mail: mike.looijmans@topic.nl Website: www.topic.nl Please consider the environment before printing this e-mail Topic zoekt gedreven (embedded) software specialisten! http://topic.nl/vacatures/topic-zoekt-software-engineers/ _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] opencv: Upgrade to 2.4.11 2015-03-05 7:33 ` Mike Looijmans @ 2015-03-05 8:21 ` Martin Jansa 2015-03-05 10:24 ` [meta-oe][PATCH v2] " Mike Looijmans 0 siblings, 1 reply; 5+ messages in thread From: Martin Jansa @ 2015-03-05 8:21 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 5683 bytes --] On Thu, Mar 05, 2015 at 08:33:08AM +0100, Mike Looijmans wrote: > On 04-03-15 23:03, Martin Jansa wrote: > > 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] > > I didn't get any warnings, which platform did you use? See http://www.openembedded.org/wiki/Bitbake_World_Status_Setup > I guess the recipe needs some explicit "disable" calls, it probably > auto-detected these on your system. You'll see these warnings only if you build jasper from meta-oe and libdc1394 from meta-multimedia before building opencv. And yes, it needs to be explicitly disabled. > >> S = "${WORKDIR}/git" > >> > >> -- > >> 1.9.1 > >> > >> -- > >> > > Met vriendelijke groet / kind regards, > > Mike Looijmans > System Expert > > > TOPIC Embedded Systems > Eindhovenseweg 32-C, NL-5683 KH Best > Postbus 440, NL-5680 AK Best > Telefoon: (+31) (0) 499 33 69 79 > Telefax: (+31) (0) 499 33 69 70 > E-mail: mike.looijmans@topic.nl > Website: www.topic.nl > > Please consider the environment before printing this e-mail > > Topic zoekt gedreven (embedded) software specialisten! > http://topic.nl/vacatures/topic-zoekt-software-engineers/ > > _______________________________________________ > >> Openembedded-devel mailing list > >> Openembedded-devel@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > > > > > > -- > _______________________________________________ > 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [meta-oe][PATCH v2] opencv: Upgrade to 2.4.11 2015-03-05 8:21 ` Martin Jansa @ 2015-03-05 10:24 ` Mike Looijmans 0 siblings, 0 replies; 5+ messages in thread From: Mike Looijmans @ 2015-03-05 10:24 UTC (permalink / raw) To: openembedded-devel 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. Disable 1394 support by default to get a deterministic build. Fix "jasper" dependency, the BUILD_JASPER parameter served only to build an internal library, while WITH_JASPER actually controls whether jpeg2000 support was desired. --- v2: Fix non-deterministic jasper and lib1394 dependencies. Tested by first building these libraries and building opencv after that. .../opencv/opencv-fix-pkgconfig-generation.patch | 44 ---------------------- meta-oe/recipes-support/opencv/opencv_2.4.bb | 11 +++--- 2 files changed, 5 insertions(+), 50 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..2754616 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}" S = "${WORKDIR}/git" @@ -25,6 +23,7 @@ OECMAKE_BUILDPATH = "${WORKDIR}/build-${TARGET_ARCH}" EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ -DBUILD_PYTHON_SUPPORT=ON \ -DWITH_GSTREAMER=OFF \ + -DWITH_1394=OFF \ -DCMAKE_SKIP_RPATH=ON \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ @@ -40,7 +39,7 @@ PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," -PACKAGECONFIG[jasper] = "-DBUILD_JASPER=ON,-DBUILD_JASPER=OFF,jasper" +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," inherit distutils-base pkgconfig cmake -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-03-05 10:24 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-03-04 8:20 [meta-oe][PATCH] opencv: Upgrade to 2.4.11 Mike Looijmans 2015-03-04 22:03 ` Martin Jansa 2015-03-05 7:33 ` Mike Looijmans 2015-03-05 8:21 ` Martin Jansa 2015-03-05 10:24 ` [meta-oe][PATCH v2] " Mike Looijmans
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.