If opencv was imported in python or dynamic linked in gstreamer it was
producing this output and dying:
[libprotobuf ERROR google/protobuf/descriptor_database.cc:58] File already
exists in database: caffe.proto
[libprotobuf FATAL google/protobuf/descriptor.cc:1315] CHECK failed:
generated_database_->Add(encoded_file_descriptor, size):
terminate called after throwing an instance of
'google::protobuf::FatalException'
This patch backports a patch that fixes this issue.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
During configuration the java wrappers are generated (if java
is enabled via PACKAGECOFIG).
Unfortunately, the script that generates the .java files do not handle
properly paths with special symbols, such as +.
This is just a workaround for that.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
OpenCV was downloading tinydnn during configuration via a script. This
patch downloads and unpacks tinydnn manually.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
When dnn is enabled via PACKAGECONFIG it requires protobuf and
protobuf-native.
This patch modifies cmake files to detect properly protobuf.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Since 3.3 ICV variables have been renamed. Without this patch OpenCV
configure cannot find ICV/IPP binaries.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
* as PNBLACKLIST message says, these recipes are blacklisted for long
time and nobody showed any interest to fix them
* remove all unused .patch and .inc files as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Update OpenCV recipe from version 3.2 to 3.3. Rebase patches and drop
those which are no longer relevant or already contained in upstream
OpenCV. Fix changed build options, such as UPDATE_PROTO_FILES to
PROTOBUF_UPDATE_FILES. Update also subcomponents (opencv-contrib and
opencv-3rdparty) to match with 3.3.
Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The newly split "libopencv-ts" package is empty (and thus not created),
because all ts files are installed in the development package. So, do
not add a runtime dependency to libopencv-ts.
Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The patch which changes test module function visilibility was missing
some OpenCL symbols. Export also those.
Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Dependency "lapack" isn't available in meta-openembedded and it doesn't
cause a build error, so drop it. Fix buidling dnn module by backporting
a patch from opencv-contrib.
Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
With opencv-3.2, the configuration detects if the target supports
half-precision floating-point format. This fails to compile for some
Intel targets such as skylake with an error such as:
error: '_mm_cvtph_ps' was not declared in this scope
The configuration used to work in opencv-3.1 so revert two commits to
drop the FP16 detection even though it may make opencv slower.
The only change in the configure log is:
- FP16: Compiler support is available
+ FP16: Compiler support is not available
The patch should be dropped when a newer version of opencv that includes commit:
https://github.com/opencv/opencv/commit/e5d9b608c47d54e43496041595025fa282fa9de5
is available. Backporting that fix was complicated.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
With opencv-3.2, the configuration detects if the target supports
half-precision floating-point format. This fails to compile for some
Intel targets such as skylake with an error such as:
error: '_mm_cvtph_ps' was not declared in this scope
The configuration worked in opencv-3.1 so revert two commits to
drop the FP16 detection even though it may make opencv slower.
The only change in the configure log is:
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Subpackage python3-${PN} is not right for multilib and it will be
extended to such as lib32-python3-lib32-opencv.
Replace PN with BPN to fix it.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* based on discussion in pndeprecated thread:
https://patchwork.openembedded.org/patch/137573/
update the messages to warn possible users that the
recipe will be removed before the end of the next development
cycle (before Yocto 2.4 is released).
* updated with:
sed -i 's/^\(PNBLACKLIST.*".*\)"/\1 - the recipe will be removed on 2017-09-01 unless the issue is fixed"/g' `git grep PNBLACKLIST | sed 's/:.*//g' | sort -u | xargs`
* then noticed couple recipes being blacklisted only based on
DISTRO_FEATURES, so removed those:
meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
meta-oe/recipes-navigation/gypsy/gypsy.inc
meta-oe/recipes-navigation/navit/navit.inc
meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb
* if it isn't fixed by this date, it's fair game to be removed
whenever someone gets around to i
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The recipe opencv_3.2.bb inherits to either distutils-base or
distutils3-base classes or both which do add appropriate
build dependency on python or python3 respectively.
There's no need to have python in DEPENDS explicitly.
It can even make things needlessly complicated in case a user
wants to build python3-only images.
The redundant build dependency on python is removed from DEPENDS.
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Only enable protobuf as dependency if dnn module is enabled
-Download manually xfeatures from 3rd party repo
-Remove uneeded fixgcc60patch
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fixes dangling dependency on text contrib module
WARNING: opencv-3.1+gitAUTOINC+92387b1ef8-r0 do_package_qa: QA Issue:
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
The deprecated APIs are removed from bitbake, update two old style references
in meta-oe/meta-networking.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The opencv 2.4 has been blacklisted, 3.1 should be the default choice
for both opencv and lib32-opencv.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Remove install errors:
mv: cannot stat '.../tmp/work/mips64-wrs-linux/opencv/3.1+gitAUTOINC
+92387b1ef8-r0/image/usr/lib/*': No such file or directory
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The OpenCV*.cmake files and the static library should be in the opencv-dev
package, not opencv-apps.
There is no need to specify files for PN-dbg as they're automatically found, so
remove the FILES_PN-dbg assignment.
Conditionalise the installation of the example and tutorial binaries so it
doesn't abort if samples are disabled.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
It seems like gcc 6.0 does not have the same behaviour as previous 5.x
with regards isystem flag.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
PACKAGES content order is important, because it determines the
destination of the files, when the folders overlaps.
Without this patch:
NOTE: Executing RunQueue Tasks
ERROR: QA Issue: non debug package contains .debug directory:
opencv-apps path
packages-split/opencv-apps/usr/share/OpenCV/java/.debug/libopencv_java310.so
[debug-files]
WARNING: QA Issue: opencv-apps: found library in wrong location:
/usr/share/OpenCV/java/libopencv_java310.so
opencv-apps: found library in wrong location:
/usr/share/OpenCV/java/.debug/libopencv_java310.so [libdir]
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
Fixes: 3132af1d1d ("opencv: Fix metapkg dependencies for opencv-java ... ")
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The opencv-java is not always generated so we ought to include it,
only if it is available. The opencv-locales is not available and ought
to be skipped.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Martin Jansa
Ricardo Ribalda Delgado
Kai Kang
Khem Raj
Ismo Puustinen
Huang Qiyu
Randy MacLeod
Dmitry Rozhkov
Joshua Lock
Richard Purdie
Wenzong Fan
Ross Burton
Alexander Kanavin
Otavio Salvador