* [meta-oe][PATCH v2 2/8] opencv: Metapkg should not rdepend on -staticdev
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 3/8] opencv: Add missing depends Ricardo Ribalda Delgado
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
Otherwise the running dependencies will grow considerably.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index fa2fdb6e6c31..cf41d894cf7f 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -104,7 +104,7 @@ python populate_packages_prepend () {
blacklist = [ metapkg ]
metapkg_rdepends = [ ]
for pkg in packages[1:]:
- if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale'):
+ if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'):
metapkg_rdepends.append(pkg)
d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
--
2.10.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-oe][PATCH v2 3/8] opencv: Add missing depends
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 2/8] opencv: Metapkg should not rdepend on -staticdev Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
2016-12-22 16:50 ` Martin Jansa
2016-12-13 23:46 ` [meta-oe][PATCH v2 4/8] opencv: Add support for OpenJDK Ricardo Ribalda Delgado
` (4 subsequent siblings)
6 siblings, 1 reply; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
contrib/modules/sfm depends on glog, gflags and libeigen. The CmakeList
does not seem to provide a way to disable/enable its build.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index cf41d894cf7f..a5d681e79ca2 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -53,7 +53,7 @@ PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2
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,"
+PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
--
2.10.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [meta-oe][PATCH v2 3/8] opencv: Add missing depends
2016-12-13 23:46 ` [meta-oe][PATCH v2 3/8] opencv: Add missing depends Ricardo Ribalda Delgado
@ 2016-12-22 16:50 ` Martin Jansa
2016-12-22 17:17 ` Khem Raj
0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2016-12-22 16:50 UTC (permalink / raw)
To: Ricardo Ribalda Delgado; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1715 bytes --]
On Wed, Dec 14, 2016 at 12:46:13AM +0100, Ricardo Ribalda Delgado wrote:
> contrib/modules/sfm depends on glog, gflags and libeigen. The CmakeList
> does not seem to provide a way to disable/enable its build.
There is also floating dependency on tesseract as shown in last test
dependencies build:
opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-text rdepends on tesseract,
but it isn't a build dependency, missing tesseract in DEPENDS or
PACKAGECONFIG? [build-deps]
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
> meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> index cf41d894cf7f..a5d681e79ca2 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> @@ -53,7 +53,7 @@ PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2
>
> 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,"
> +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
> PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
> PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
> PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
> --
> 2.10.2
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH v2 3/8] opencv: Add missing depends
2016-12-22 16:50 ` Martin Jansa
@ 2016-12-22 17:17 ` Khem Raj
2016-12-22 17:36 ` Ricardo Ribalda Delgado
0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2016-12-22 17:17 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
> On Dec 22, 2016, at 8:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Wed, Dec 14, 2016 at 12:46:13AM +0100, Ricardo Ribalda Delgado wrote:
>> contrib/modules/sfm depends on glog, gflags and libeigen. The CmakeList
>> does not seem to provide a way to disable/enable its build.
>
> There is also floating dependency on tesseract as shown in last test
> dependencies build:
>
> opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-text rdepends on tesseract,
> but it isn't a build dependency, missing tesseract in DEPENDS or
> PACKAGECONFIG? [build-deps]
There seems to be no knob for tesseract in openCVs build system. but extensions modules needs it may be
adding a knob for OPENCV_FIND_TESSERACT will solve it. I also notices that SRC_URI should be changed as well
git://github.com/Itseez/ <git://github.com/Itseez/> has moved to git://github.com/opencv <git://github.com/opencv>
>
>>
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> ---
>> meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
>> index cf41d894cf7f..a5d681e79ca2 100644
>> --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
>> +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
>> @@ -53,7 +53,7 @@ PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2
>>
>> 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,"
>> +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
>> PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
>> PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
>> PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
>> --
>> 2.10.2
>>
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com <mailto:Martin.Jansa@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH v2 3/8] opencv: Add missing depends
2016-12-22 17:17 ` Khem Raj
@ 2016-12-22 17:36 ` Ricardo Ribalda Delgado
0 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-22 17:36 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
Hi Khem
On Thu, Dec 22, 2016 at 6:17 PM, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Dec 22, 2016, at 8:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Wed, Dec 14, 2016 at 12:46:13AM +0100, Ricardo Ribalda Delgado wrote:
>
> contrib/modules/sfm depends on glog, gflags and libeigen. The CmakeList
> does not seem to provide a way to disable/enable its build.
>
>
> There is also floating dependency on tesseract as shown in last test
> dependencies build:
>
> opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-text rdepends on tesseract,
> but it isn't a build dependency, missing tesseract in DEPENDS or
> PACKAGECONFIG? [build-deps]
>
>
> There seems to be no knob for tesseract in openCVs build system. but
> extensions modules needs it may be
> adding a knob for OPENCV_FIND_TESSERACT will solve it. I also notices that
What about doing somthing simlar to:
http://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=b9946087985e011a71a63cdf47d5496c3c5e2a9c
but with the modules that uses tesseact.?
I can take a look to it tomorrow morning.
> SRC_URI should be changed as well
> git://github.com/Itseez/ has moved to git://github.com/opencv
I have already send a patch for that:
http://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=a1f5340a025c2e75330ef3b9940bb8aced39fa00
Regards!!!
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCH v2 4/8] opencv: Add support for OpenJDK
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 2/8] opencv: Metapkg should not rdepend on -staticdev Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 3/8] opencv: Add missing depends Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 5/8] opencv: Add support for python3 Ricardo Ribalda Delgado
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
Add support for OpenJDK8 and Oracle-java
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index a5d681e79ca2..5cce2c9eaa16 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -58,11 +58,12 @@ PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
+PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native,"
PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,"
-PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
+PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
@@ -73,12 +74,14 @@ inherit distutils-base pkgconfig cmake
export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
export PYTHON="${STAGING_BINDIR_NATIVE}/python"
-export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java"
+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/"
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"
python populate_packages_prepend () {
--
2.10.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-oe][PATCH v2 5/8] opencv: Add support for python3
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
` (2 preceding siblings ...)
2016-12-13 23:46 ` [meta-oe][PATCH v2 4/8] opencv: Add support for OpenJDK Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 6/8] opencv: Add missing DEPEND for opencl PKGCFG Ricardo Ribalda Delgado
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
New PACKAGECONFIG options: python2 and python3. Python3 selectec by
default, because it is almost 2017 ;).
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
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 5cce2c9eaa16..674604018098 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,7 +46,7 @@ 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)}"
@@ -65,15 +64,20 @@ PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,"
PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
+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[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-oe][PATCH v2 6/8] opencv: Add missing DEPEND for opencl PKGCFG
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
` (3 preceding siblings ...)
2016-12-13 23:46 ` [meta-oe][PATCH v2 5/8] opencv: Add support for python3 Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 7/8] opencv: Add new PACKAGECONFIG dnn Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 8/8] opencv: Merge dbg packages and Fix QA Issues Ricardo Ribalda Delgado
6 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
OpenCL headers are not enough, we also require a valid icd (.so)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 674604018098..df75e63f2748 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -61,7 +61,7 @@ PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_P
PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
-PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,"
+PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd,"
PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy,"
--
2.10.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-oe][PATCH v2 7/8] opencv: Add new PACKAGECONFIG dnn
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
` (4 preceding siblings ...)
2016-12-13 23:46 ` [meta-oe][PATCH v2 6/8] opencv: Add missing DEPEND for opencl PKGCFG Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
2016-12-13 23:46 ` [meta-oe][PATCH v2 8/8] opencv: Merge dbg packages and Fix QA Issues Ricardo Ribalda Delgado
6 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
The dnn module depends on a linear algebra libray such as lapack.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index df75e63f2748..26749ee3a143 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -52,6 +52,7 @@ PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb
PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
+PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON,-DBUILD_opencv_dnn=OFF,lapack,"
PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
--
2.10.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-oe][PATCH v2 8/8] opencv: Merge dbg packages and Fix QA Issues
2016-12-13 23:46 [meta-oe][PATCH v2 1/8] opencv: Update repository location Ricardo Ribalda Delgado
` (5 preceding siblings ...)
2016-12-13 23:46 ` [meta-oe][PATCH v2 7/8] opencv: Add new PACKAGECONFIG dnn Ricardo Ribalda Delgado
@ 2016-12-13 23:46 ` Ricardo Ribalda Delgado
6 siblings, 0 replies; 11+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-13 23:46 UTC (permalink / raw)
To: openembedded-devel, Martin.Jansa, ross.burton, raj.khem
The presence of more than on -dbg file made completely unusable the
rest, and there is no big win by having more than one.
Also this qa issue is fixed:
QA Issue: opencv-samples-dbg: found library in wrong location:
/usr/share/OpenCV/java/.debug/libopencv_java310.so [libdir]
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 26749ee3a143..2851233c01de 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -85,15 +85,15 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
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)} \
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \
- ${PN}-samples-dbg ${PN}-samples ${PN}-apps"
+ ${PN}-apps"
python populate_packages_prepend () {
cv_libdir = d.expand('${libdir}')
- cv_libdir_dbg = d.expand('${libdir}/.debug')
do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
@@ -111,6 +111,7 @@ python populate_packages_prepend () {
d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends))
metapkg = pn
+ d.setVar('ALLOW_EMPTY_' + metapkg, "1")
blacklist = [ metapkg ]
metapkg_rdepends = [ ]
for pkg in packages[1:]:
@@ -123,17 +124,15 @@ python populate_packages_prepend () {
PACKAGES_DYNAMIC += "^libopencv-.*"
FILES_${PN} = ""
+FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake"
+FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a"
FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV"
-FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake ${datadir}/OpenCV/3rdparty/${baselib}/*.a"
-FILES_${PN}-doc = "${datadir}/OpenCV/doc"
FILES_${PN}-java = "${datadir}/OpenCV/java"
-FILES_${PN}-java-dbg = "${datadir}/OpenCV/java/.debug/"
FILES_${PN}-samples = "${datadir}/OpenCV/samples/"
-FILES_${PN}-samples-dbg = "${datadir}/OpenCV/samples/bin/.debug"
-INSANE_SKIP_${PN}-dev = "staticdev"
INSANE_SKIP_${PN}-java = "libdir"
-INSANE_SKIP_${PN}-java-dbg = "libdir"
+INSANE_SKIP_${PN}-dbg = "libdir"
ALLOW_EMPTY_${PN} = "1"
--
2.10.2
^ permalink raw reply related [flat|nested] 11+ messages in thread