diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-09-28 10:26:31 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-05 12:40:35 +0200 |
commit | fe81c0e5af2df3890f2ab0f267562fdce5b5b166 (patch) | |
tree | 75c5cc8c9c2fabe210bc8e33b4a83c9c20f42d65 | |
parent | cb4f8706e8be3f32ca406bee97b2c34fc0deb8ca (diff) | |
download | meta-openembedded-contrib-fe81c0e5af2df3890f2ab0f267562fdce5b5b166.tar.gz |
opencv: Update SRC_URI to use git
opencv now has moved to using git. Lets use the git
version to fetch SRCs
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv-samples_2.4.bb (renamed from meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb) | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb (renamed from meta-oe/recipes-support/opencv/opencv_2.4.3.bb) | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb index 50efd77bf07..e00a5e664ff 100644 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb @@ -7,14 +7,12 @@ DEPENDS = "opencv" LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ " +SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e" +SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ + " +PV = "2.4.3+git${SRCPV}" -SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ -" - -SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" -SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" - -S = "${WORKDIR}/OpenCV-${PV}" +S = "${WORKDIR}/git" do_install() { cd samples/c diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index a0adc321294..94af8238727 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -9,16 +9,14 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" -SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ +SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e" +SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ file://opencv-fix-pkgconfig-generation.patch \ " -SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" -SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" +PV = "2.4.3+git${SRCPV}" -PR = "r2" - -S = "${WORKDIR}/OpenCV-${PV}" +S = "${WORKDIR}/git" # Do an out-of-tree build OECMAKE_SOURCEPATH = "${S}" |