diff options
| -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 50efd77bf0..e00a5e664f 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 | ||
| 8 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ | 8 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ |
| 9 | " | 9 | " |
| 10 | SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e" | ||
| 11 | SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ | ||
| 12 | " | ||
| 13 | PV = "2.4.3+git${SRCPV}" | ||
| 10 | 14 | ||
| 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ | 15 | S = "${WORKDIR}/git" |
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" | ||
| 15 | SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" | ||
| 16 | |||
| 17 | S = "${WORKDIR}/OpenCV-${PV}" | ||
| 18 | 16 | ||
| 19 | do_install() { | 17 | do_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 a0adc32129..94af823872 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 | ||
| 10 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" | 10 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" |
| 11 | 11 | ||
| 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ | 12 | SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e" |
| 13 | SRC_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 | ||
| 16 | SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" | 17 | PV = "2.4.3+git${SRCPV}" |
| 17 | SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" | ||
| 18 | 18 | ||
| 19 | PR = "r2" | 19 | S = "${WORKDIR}/git" |
| 20 | |||
| 21 | S = "${WORKDIR}/OpenCV-${PV}" | ||
| 22 | 20 | ||
| 23 | # Do an out-of-tree build | 21 | # Do an out-of-tree build |
| 24 | OECMAKE_SOURCEPATH = "${S}" | 22 | OECMAKE_SOURCEPATH = "${S}" |
