* [meta-oe][PATCH v3 1/4] opencv: Fix use before set error on meta package
@ 2016-03-18 11:20 Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 2/4] opencv: Update to version 3.1 Ricardo Ribalda Delgado
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-03-18 11:20 UTC (permalink / raw)
To: Martin Jansa, Andre McCurdy, Lukas Bulwahn, openembedded-devel
This bug was introducing a loop dependency of opencv->opencv that was
confusing dpkg.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index 99ca8b35727d..f6c4ca8fac16 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -86,8 +86,8 @@ python populate_packages_prepend () {
metapkg_rdepends.append(pkg)
d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends))
- blacklist = [ metapkg ]
metapkg = pn
+ 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') :
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH v3 2/4] opencv: Update to version 3.1
2016-03-18 11:20 [meta-oe][PATCH v3 1/4] opencv: Fix use before set error on meta package Ricardo Ribalda Delgado
@ 2016-03-18 11:20 ` Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 3/4] opencv: Fix pkg-config file Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 4/4] opencv: Remove blacklist Ricardo Ribalda Delgado
2 siblings, 0 replies; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-03-18 11:20 UTC (permalink / raw)
To: Martin Jansa, Andre McCurdy, Lukas Bulwahn, openembedded-devel
The first major update in 3.0 release series
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} (97%)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
similarity index 97%
rename from meta-oe/recipes-support/opencv/opencv_3.0.bb
rename to meta-oe/recipes-support/opencv/opencv_3.1.bb
index f6c4ca8fac16..b8fb6a51376f 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -10,15 +10,15 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
DEFAULT_PREFERENCE = "-1"
-DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
+DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp"
-SRCREV_opencv = "424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69"
-SRCREV_contrib = "844c30e8b2f2f4b34b96a169fafe9beea3c45e87"
+SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
+SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
SRCREV_FORMAT = "opencv"
SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib"
-PV = "3.0+git${SRCPV}"
+PV = "3.1+git${SRCPV}"
S = "${WORKDIR}/git"
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH v3 3/4] opencv: Fix pkg-config file.
2016-03-18 11:20 [meta-oe][PATCH v3 1/4] opencv: Fix use before set error on meta package Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 2/4] opencv: Update to version 3.1 Ricardo Ribalda Delgado
@ 2016-03-18 11:20 ` Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 4/4] opencv: Remove blacklist Ricardo Ribalda Delgado
2 siblings, 0 replies; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-03-18 11:20 UTC (permalink / raw)
To: Martin Jansa, Andre McCurdy, Lukas Bulwahn, openembedded-devel
Libdir was pointing to the wrong location
also fix for QA Issue: opencv.pc failed sanity test (tmpdir) in path
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
.../opencv/opencv/fixpkgconfig.patch | 29 ++++++++++++++++++++++
meta-oe/recipes-support/opencv/opencv_3.1.bb | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
new file mode 100644
index 000000000000..3aeda7d4439d
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
@@ -0,0 +1,29 @@
+diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
+index b8cb8777c06b..75281ee964fd 100644
+--- a/cmake/OpenCVGenPkgconfig.cmake
++++ b/cmake/OpenCVGenPkgconfig.cmake
+@@ -27,7 +27,7 @@ macro(fix_prefix lst isown)
+ get_filename_component(libdir "${item}" PATH)
+ get_filename_component(libname "${item}" NAME_WE)
+ string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}")
+- list(APPEND _lst "-L${libdir}" "-l${libname}")
++ list(APPEND _lst "-l${libname}")
+ else()
+ list(APPEND _lst "-l${item}")
+ endif()
+@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty)
+
+ set(OPENCV_PC_LIBS
+ "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
++ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
+ "${_modules}"
+ )
+ if (BUILD_SHARED_LIBS)
+- set(OPENCV_PC_LIBS_PRIVATE "${_extra}")
++ set(OPENCV_PC_LIBS_PRIVATE
++ "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
++ "${_extra}"
++ )
+ else()
+ set(OPENCV_PC_LIBS_PRIVATE
+ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index b8fb6a51376f..6f0c83829809 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -16,7 +16,8 @@ SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
SRCREV_FORMAT = "opencv"
SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
- git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib"
+ git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
+ file://fixpkgconfig.patch"
PV = "3.1+git${SRCPV}"
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH v3 4/4] opencv: Remove blacklist
2016-03-18 11:20 [meta-oe][PATCH v3 1/4] opencv: Fix use before set error on meta package Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 2/4] opencv: Update to version 3.1 Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 3/4] opencv: Fix pkg-config file Ricardo Ribalda Delgado
@ 2016-03-18 11:20 ` Ricardo Ribalda Delgado
2016-03-19 21:38 ` Martin Jansa
2 siblings, 1 reply; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-03-18 11:20 UTC (permalink / raw)
To: Martin Jansa, Andre McCurdy, Lukas Bulwahn, openembedded-devel
Opencv 3.1 builds fine with ffmpeg.
ricardo@neopili:~/curro/qt5022/oe/openembedded-core/build$ bitbake
opencv
Loading cache: 100%
|############################################################################|
ETA: 00:00:00
Loaded 2018 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "1.29.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "Debian-testing"
TARGET_SYS = "i586-oe-linux"
MACHINE = "qemux86"
DISTRO = "nodistro"
DISTRO_VERSION = "nodistro.0"
TUNE_FEATURES = "m32 i586"
TARGET_FPU = ""
meta = "master:300f858ba07c938427ccd05a3d7220027a03d461"
meta-oe = "master:29462f7161b346dbc2ea00830da869a0a1c35fb9"
NOTE: Preparing RunQueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
NOTE: Tasks Summary: Attempted 1242 tasks of which 1228 didn't need to
be rerun and all succeeded.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 --
1 file changed, 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 6f0c83829809..87338cad4a4b 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -133,5 +133,3 @@ do_install_append() {
cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/
}
-# http://errors.yoctoproject.org/Errors/Details/40660/
-PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH v3 4/4] opencv: Remove blacklist
2016-03-18 11:20 ` [meta-oe][PATCH v3 4/4] opencv: Remove blacklist Ricardo Ribalda Delgado
@ 2016-03-19 21:38 ` Martin Jansa
0 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2016-03-19 21:38 UTC (permalink / raw)
To: Ricardo Ribalda Delgado; +Cc: openembedded-devel
OK, it build now, but please add one more patch to fix autodetected
dependencies:
opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-videoio rdepends on
libgphotoport, but it isn't a build dependency, missing libgphoto2 in
DEPENDS or PACKAGECONFIG? [build-deps]
opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-videoio rdepends on
libgphoto2, but it isn't a build dependency, missing libgphoto2 in
DEPENDS or PACKAGECONFIG? [build-deps]
opencv-3.1+gitAUTOINC+92387b1ef8: libopencv-dnn rdepends on protobuf,
but it isn't a build dependency, missing protobuf in DEPENDS or
PACKAGECONFIG? [build-deps]
On Fri, Mar 18, 2016 at 12:20 PM, Ricardo Ribalda Delgado <
ricardo.ribalda@gmail.com> wrote:
> Opencv 3.1 builds fine with ffmpeg.
>
> ricardo@neopili:~/curro/qt5022/oe/openembedded-core/build$ bitbake
> opencv
> Loading cache: 100%
>
> |############################################################################|
> ETA: 00:00:00
> Loaded 2018 entries from dependency cache.
> NOTE: Resolving any missing task queue dependencies
>
> Build Configuration:
> BB_VERSION = "1.29.0"
> BUILD_SYS = "x86_64-linux"
> NATIVELSBSTRING = "Debian-testing"
> TARGET_SYS = "i586-oe-linux"
> MACHINE = "qemux86"
> DISTRO = "nodistro"
> DISTRO_VERSION = "nodistro.0"
> TUNE_FEATURES = "m32 i586"
> TARGET_FPU = ""
> meta = "master:300f858ba07c938427ccd05a3d7220027a03d461"
> meta-oe = "master:29462f7161b346dbc2ea00830da869a0a1c35fb9"
>
> NOTE: Preparing RunQueue
> NOTE: Executing SetScene Tasks
> NOTE: Executing RunQueue Tasks
> NOTE: Tasks Summary: Attempted 1242 tasks of which 1228 didn't need to
> be rerun and all succeeded.
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
> meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 --
> 1 file changed, 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 6f0c83829809..87338cad4a4b 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> @@ -133,5 +133,3 @@ do_install_append() {
> cp -f bin/*-tutorial-* bin/*-example-*
> ${D}${datadir}/OpenCV/samples/bin/
> }
>
> -# http://errors.yoctoproject.org/Errors/Details/40660/
> -PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"
> --
> 2.7.0
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-19 21:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-18 11:20 [meta-oe][PATCH v3 1/4] opencv: Fix use before set error on meta package Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 2/4] opencv: Update to version 3.1 Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 3/4] opencv: Fix pkg-config file Ricardo Ribalda Delgado
2016-03-18 11:20 ` [meta-oe][PATCH v3 4/4] opencv: Remove blacklist Ricardo Ribalda Delgado
2016-03-19 21:38 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.