Hi guys, will this patch be applied? OpenCV download URI is broken on Dylan otherwise.
-----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Krzysztof Sywula Sent: Monday, March 09, 2015 4:13 PM To: [email protected] Cc: [email protected] Subject: [oe] [meta-oe][dylan][PATCH] opencv: Update SRC_URI to use git From: Khem Raj <[email protected]> opencv now has moved to using git. Lets use the git version to fetch SRCs Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Martin Jansa <[email protected]> --- .../{opencv-samples_2.4.3.bb => opencv-samples_2.4.bb} | 12 +++++------- .../opencv/{opencv_2.4.3.bb => opencv_2.4.bb} | 10 ++++------ 2 files changed, 9 insertions(+), 13 deletions(-) rename meta-oe/recipes-support/opencv/{opencv-samples_2.4.3.bb => opencv-samples_2.4.bb} (82%) rename meta-oe/recipes-support/opencv/{opencv_2.4.3.bb => opencv_2.4.bb} (91%) 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 similarity index 82% rename from meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb rename to meta-oe/recipes-support/opencv/opencv-samples_2.4.bb index 50efd77..e00a5e6 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 similarity index 91% rename from meta-oe/recipes-support/opencv/opencv_2.4.3.bb rename to meta-oe/recipes-support/opencv/opencv_2.4.bb index 39b608a..3ca32f9 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 v4l-utils libav gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff 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}" -- 1.7.10.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
