On Thu, Mar 31, 2016 at 01:26:31PM +0200, Ricardo Ribalda Delgado wrote: > We should not rely on cmake downloading ipp at configure time. > > Signed-off-by: Ricardo Ribalda Delgado <[email protected]> > --- > ...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 > > diff --git > a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch > > b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch > new file mode 100644 > index 000000000000..d568018b8d91 > --- /dev/null > +++ > b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch > @@ -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 > + > diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb > b/meta-oe/recipes-support/opencv/opencv_3.1.bb > index de6d8d9fe345..84a592799c0a 100644 > --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb > +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb > @@ -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? > 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)} \ > -- > 2.8.0.rc3 > -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
