summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/opencv
Commit message (Collapse)AuthorAgeFilesLines
* opencv: Work around deprecated ffmpeg functionsJason Wessel2018-05-262-0/+34
| | | | | | | | | | | The ffmpeg no longer makes use of the AVFMT_RAWPICTURE format, but opencv still has code in it for dealing with this type of exported format. For now it is easier to work around it and allow the code to compile and it will just not get used. A future version of OpenCV will remove the AVFMT_RAWPICTURE handler. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* recipes: use oe.utils.conditional instead of deprecated base_conditionalMartin Jansa2018-02-011-2/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Fix error when dynamic linkRicardo Ribalda Delgado2017-11-302-0/+395
| | | | | | | | | | | | | | | | | 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>
* opencv: Fix java wrapper generationRicardo Ribalda Delgado2017-11-192-0/+17
| | | | | | | | | | | | | 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: Download tinydnn manuallyRicardo Ribalda Delgado2017-11-192-0/+40
| | | | | | | | 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>
* opencv: Use OE built ProtobufRicardo Ribalda Delgado2017-11-192-0/+58
| | | | | | | | | | 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>
* opencv: Update ICV variable namesRicardo Ribalda Delgado2017-11-191-2/+2
| | | | | | | | 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>
* opencv: fix CVE-2017-14136Kai Kang2017-09-222-0/+289
| | | | | | | Backport patch to fix CVE-2017-14136 for opencv. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Fix build on aarch64Khem Raj2017-09-223-0/+2245
| | | | | | | Enable intrinsics on arm/neon with clang while here Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Fix build with clangKhem Raj2017-09-132-1/+27
| | | | | | | -isystem is not needed even with clang Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: remove blacklisted recipesMartin Jansa2017-08-313-196/+0
| | | | | | | | * 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>
* opencv: fix CVEsKai Kang2017-08-314-0/+972
| | | | | | | | | | | | | | | | | | | | | | | | | Fix CVEs for opencv 3.3: * CVE-2017-12597 * CVE-2017-12598 * CVE-2017-12599 * CVE-2017-12600 * CVE-2017-12601 * CVE-2017-12602 * CVE-2017-12603 * CVE-2017-12604 * CVE-2017-12605 * CVE-2017-12606 * CVE-2017-12862 * CVE-2017-12863 * CVE-2017-12864 Refs: 1 https://github.com/opencv/opencv/pull/9376 2 https://security-tracker.debian.org/tracker/CVE-2017-12601 Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: update to version 3.3.Ismo Puustinen2017-08-139-590/+93
| | | | | | | | | | | 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>
* opencv: fix runtime dependencies.Ismo Puustinen2017-06-121-1/+1
| | | | | | | | | 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>
* opencv: fix compilation error when OpenCL is enabled.Ismo Puustinen2017-06-121-7/+34
| | | | | | | | 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>
* opencv: fix building with PACKAGECONFIG "dnn" enabled.Ismo Puustinen2017-06-052-1/+245
| | | | | | | | | 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>
* opencv: Make opencv-ts create share library intead of staticHuang Qiyu2017-06-053-0/+81
| | | | | | | Refer to other distro,make opencv-ts create share library intead of static. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: disable broken Intel FP16 detectionRandy MacLeod2017-05-093-0/+274
| | | | | | | | | | | | | | | | | | | | 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>
* Revert "opencv: disable broken Intel FP16 detection"Randy MacLeod2017-05-093-274/+0
| | | | | | | | | This reverts commit 51fbd3cf7db14399bc1c69c4a5fd63f157fd209d. The long log was truncated due to a formatting error. Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: disable broken Intel FP16 detectionRandy MacLeod2017-04-283-0/+274
| | | | | | | | | | | | | 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>
* opencv: correct subpackage name for multilibKai Kang2017-04-181-2/+2
| | | | | | | | | | 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>
* opencv: do not depend on swig.Ismo Puustinen2017-04-061-1/+1
| | | | | | | Since swig is a code generator, just depend on swig-native. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: add removal date to PNBLACKLIST messagesMartin Jansa2017-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* opencv: remove redundant build dependency on python2Dmitry Rozhkov2017-04-051-1/+1
| | | | | | | | | | | | | | | 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>
* opencv: Configure freetype via PACKAGECONFIGRicardo Ribalda Delgado2017-02-131-0/+1
| | | | | | | | | | | Since: http://errors.yoctoproject.org/Errors/Details/117456/ opencv freetype module fails to build. This patch disables that module by default via PACKAGECONFIG until we find out a better way to do it. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Remove extra spaceRicardo Ribalda Delgado2017-01-101-1/+1
| | | | | | | No functional change, it just looked ugly. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Update to version 3.2Ricardo Ribalda Delgado2017-01-105-41/+43
| | | | | | | | | -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>
* opencv: Add new PACKAGECONFIG textRicardo Ribalda Delgado2017-01-101-0/+1
| | | | | | | | | | | 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>
* opencv: Merge dbg packages and Fix QA IssuesRicardo Ribalda Delgado2016-12-261-10/+9
| | | | | | | | | | | | | 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>
* opencv: Add new PACKAGECONFIG dnnRicardo Ribalda Delgado2016-12-261-0/+1
| | | | | | | The dnn module depends on a linear algebra libray such as lapack. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Add missing DEPEND for opencl PKGCFGRicardo Ribalda Delgado2016-12-261-1/+1
| | | | | | | OpenCL headers are not enough, we also require a valid icd (.so) Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Add support for python3Ricardo Ribalda Delgado2016-12-261-7/+17
| | | | | | | | 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>
* opencv: Add support for OpenJDKRicardo Ribalda Delgado2016-12-261-2/+5
| | | | | | | Add support for OpenJDK8 and Oracle-java Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Add missing dependsRicardo Ribalda Delgado2016-12-261-1/+1
| | | | | | | | 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>
* opencv: Metapkg should not rdepend on -staticdevRicardo Ribalda Delgado2016-12-261-1/+1
| | | | | | | Otherwise the running dependencies will grow considerably. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Update repository locationRicardo Ribalda Delgado2016-12-261-3/+3
| | | | | | | All opencv repos are now on github.com/opencv Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* remove True option to getVar callsJoshua Lock2016-12-022-4/+4
| | | | | | | | | 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>
* nis, opencv: Update getVar/setVar syntaxRichard Purdie2016-11-261-1/+1
| | | | | | | | 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>
* opencv: remove DEFAULT_PREFERENCE = "-1" for 3.1Wenzong Fan2016-11-231-2/+0
| | | | | | | | 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>
* opencv: checking existence of /usr/libWenzong Fan2016-11-231-1/+1
| | | | | | | | | | 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>
* opencv: fix QA issueWenzong Fan2016-11-231-1/+1
| | | | | | | | | | | | Replace '/lib' with '${baselib}' to fix QA issue: ERROR: do_package_qa: QA Issue: non -staticdev package contains \ static .a library: opencv-apps path \ '.../opencv-apps/usr/share/OpenCV/3rdparty/lib64/libippicv.a' \ [staticdev] Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: fix packaging and installRoss Burton2016-10-211-5/+6
| | | | | | | | | | | | | | 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>
* meta-oe: remove trailing spacesMartin Jansa2016-08-222-2/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-oe: fix indentationMartin Jansa2016-08-221-18/+19
| | | | | | | | * remove tabs which sneaked in since last cleanup * meta-oe layers are using consistent indentation with 4 spaces, see http://www.openembedded.org/wiki/Styleguide Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Fix build with gcc 6.0Ricardo Ribalda Delgado2016-08-152-3/+31
| | | | | | | | 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>
* abiword, fbreader, tvheadend, glmark2, libqmi, modemmanager, thrift, wvdial, ↵Martin Jansa2016-06-131-0/+2
| | | | | | wvstreams, dt, collectd, gtkmathview, tcsh, glcompbench, geos, libspatialite, geis, grail, opencv, openwbem, fwts: blacklist, fails to build with gcc-6 or glibc-2.24 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Reorder PACKAGES variableRicardo Ribalda Delgado2016-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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: 3132af1d1d15 ("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>
* opencv: Make gphoto2 dep optional via PACKAGECONFIGRicardo Ribalda Delgado2016-06-081-2/+3
| | | | | | | | Opencv can be built without support for gphoto2 if needed. 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>
* Remove unnecessary exports of HOST_SYS and BUILD_SYS in python-based recipesAlexander Kanavin2016-06-082-4/+0
| | | | | | | They are no longer required to build python software. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* opencv: Fix metapkg dependencies for opencv-java and opencv-localesOtavio Salvador2016-05-061-2/+3
| | | | | | | | | 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>