summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-03-09 16:12:41 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2015-03-30 00:36:21 +0200
commit4e3362f9c2b5540231011930b91d2cf56e487ff7 (patch)
tree52d7c37e0d5bcd8246d7540a92f758c2f384a659
parent237daf836a700d55c95c095a90d249d1fa37b389 (diff)
downloadmeta-openembedded-dylan.tar.gz
opencv: Update SRC_URI to use gitdylan
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 50efd77bf..e00a5e664 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"
7 7
8LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ 8LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \
9" 9"
10SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e"
11SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
12 "
13PV = "2.4.3+git${SRCPV}"
10 14
11SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ 15S = "${WORKDIR}/git"
12"
13
14SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe"
15SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b"
16
17S = "${WORKDIR}/OpenCV-${PV}"
18 16
19do_install() { 17do_install() {
20 cd samples/c 18 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 39b608a33..3ca32f9d6 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"
9 9
10DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0" 10DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ 12SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e"
13SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
13 file://opencv-fix-pkgconfig-generation.patch \ 14 file://opencv-fix-pkgconfig-generation.patch \
14" 15"
15 16
16SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" 17PV = "2.4.3+git${SRCPV}"
17SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b"
18 18
19PR = "r2" 19S = "${WORKDIR}/git"
20
21S = "${WORKDIR}/OpenCV-${PV}"
22 20
23# Do an out-of-tree build 21# Do an out-of-tree build
24OECMAKE_SOURCEPATH = "${S}" 22OECMAKE_SOURCEPATH = "${S}"