Return-Path: Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by mail.openembedded.org (Postfix) with ESMTP id 666E271E4B for ; Tue, 13 Dec 2016 21:04:15 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id y21so4873285lfa.0 for ; Tue, 13 Dec 2016 13:04:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vrIWAyymDRinpy+AtMhYPHU5qx910z6pkp8RnAqNNTU=; b=FekxGdvxbAj0KwdOR6vSrN7L661lCeLUpnre51MXjjWyjvTfYY6GTgEecHvUhCjrl+ RnH26ZdARSsQQUiRLEfXSol8NJqQvs6BTj7qJnrqiidk/yU0AB0lVrTYvTbpMAn37XgC ZUMVdLII1nax8X0IXgirTiUAIrOWeRq09zL413JQmMvbTjM5c+DIvIPK5p6YSxurzkkp KpqvXp2oQtQHJxOFKwY95vdBg8VhlADIfT1ECqFE34ctAvpuhGWiv3H3dAJVCdKfx1jH M7hrXIqf789GTmB3yOYXsaGbGdkFxEl3YtOftsGqxDwMZpvAPFt7g+v9TlFKKLXcg7Hh 0ekg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vrIWAyymDRinpy+AtMhYPHU5qx910z6pkp8RnAqNNTU=; b=jmxTW8t3Ap78xnuJVM7XbQjBOQj7iDdgBWaROhSTjP37N3s7wmRMD+RlUgmbsWi2Xa wkoglk3jp5iLs5fyrCiVY8auYHaJWPWZzqg5cF8IPqxIVmiAhOVXMJUUTb8pVo5X2m9X cLO1bYl2J4OIcJ48YIn7mdHOjHaHc6BJMuF1x9ivFkQSE9gyAV7VsqpRtQoztpw63+Zv WgS2MI031cV8WpNJVt9LgEXaUggD7AREFz141S2EOrgYDOVoylJd7+VyPMXigjkK6MNP X12dFhag6KUDxXu2XOmBGXp6t2pkAygXOoQ4HLYbT9vObd6xWlTLVrIFzTjKuT/EdZer qBRA== X-Gm-Message-State: AKaTC02xLSW3eH6lB1e5Xc2WKvL1QIdpdDc29tXKVN1fvHAD0q12NePdu5WadNv2cIqt8w== X-Received: by 10.46.72.17 with SMTP id v17mr37675507lja.5.1481663055999; Tue, 13 Dec 2016 13:04:15 -0800 (PST) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id 26sm6678921lji.37.2016.12.13.13.04.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2016 13:04:14 -0800 (PST) From: Ricardo Ribalda Delgado To: openembedded-devel@lists.openembedded.org, Martin.Jansa@gmail.com, ross.burton@intel.com Date: Tue, 13 Dec 2016 22:04:01 +0100 Message-Id: <20161213210404.6940-5-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161213210404.6940-1-ricardo.ribalda@gmail.com> References: <20161213210404.6940-1-ricardo.ribalda@gmail.com> Subject: [meta-oe][PATCH 5/8] opencv: Add support for python3 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 21:04:15 -0000 New PACKAGECONFIG options: python2 and python3. Python3 selectec by default, because it is almost 2017 ;). Signed-off-by: Ricardo Ribalda Delgado --- meta-oe/recipes-support/opencv/opencv_3.1.bb | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 6e877f17749f..5a334fdd16d6 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" +DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" @@ -33,8 +33,7 @@ do_unpack_extra() { } addtask unpack_extra after do_unpack before do_patch -EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ - -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DWITH_1394=OFF \ -DCMAKE_SKIP_RPATH=ON \ -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \ @@ -47,10 +46,12 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI " EXTRA_OECMAKE_append_x86 = " -DX86=ON" -PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ +PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" +PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," @@ -70,10 +71,13 @@ PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," -inherit distutils-base pkgconfig cmake +inherit pkgconfig cmake + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/python" +export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" @@ -82,7 +86,9 @@ TARGET_CC_ARCH += "-I${S}/include " PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java-dbg ${PN}-java', '', d)} \ - ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" + ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \ + ${PN}-samples-dbg ${PN}-samples ${PN}-apps" python populate_packages_prepend () { cv_libdir = d.expand('${libdir}') @@ -134,6 +140,10 @@ SUMMARY_python-opencv = "Python bindings to opencv" FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python-opencv = "python-core python-numpy" +SUMMARY_python3-opencv = "Python bindings to opencv" +FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-opencv = "python3-core python3-numpy" + do_install_append() { cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h -- 2.10.2