Return-Path: Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by mail.openembedded.org (Postfix) with ESMTP id DC71E6C8E0 for ; Wed, 18 Sep 2013 03:37:05 +0000 (UTC) Received: by mail-pd0-f182.google.com with SMTP id r10so6464197pdi.41 for ; Tue, 17 Sep 2013 20:37:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=kBa2dFuyTbnTYBikYC3/kQq2jmsZdScFokqtb0o7+Ok=; b=rZ6olHkXaC3zuOr4CopzkuvmtlpJAvduC0Daorete4q9m3pJ0dM9MM/7VKB0MOFDE3 m/n3CwCpAYctbyH9ooXicE5Y7tXjizTW0gzH4IwTeYVNUlg0tSTwoBAtU8bOgZjCt3Xx Wpm1aLSZGOawuMjfaakoFSTeI+JmxiphflE9r32VUP2KDuoHkt6eZJSlLbEtKBf7rYcK inAIK47rbUXEepO5W5+BYYCd+JQE3ayw6tXF//8nGcRN2tR5II2UBby8HbTkK/7c+bdQ gm8Rm0qgJQGkrbv+dSTm9C3rSuXdvlqgSJ9BVks8FEiruZupZtUwUoW+p5aBFa6qLpA/ SYkw== X-Received: by 10.66.171.77 with SMTP id as13mr6982636pac.170.1379475427920; Tue, 17 Sep 2013 20:37:07 -0700 (PDT) Received: from haswell.gateway.2wire.net (99-57-140-209.lightspeed.sntcca.sbcglobal.net. [99.57.140.209]) by mx.google.com with ESMTPSA id qa9sm1304095pbc.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Sep 2013 20:37:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 17 Sep 2013 20:36:58 -0700 Message-Id: <1379475418-24630-1-git-send-email-raj.khem@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [meta-oe][PATCH] opencv: Update SRC_URI to use git X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Sep 2013 03:37:06 -0000 opencv now has moved to using git. Lets use the git version to fetch SRCs Signed-off-by: Khem Raj --- .../{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.8.3.2