11 Commits

Author SHA1 Message Date
Martin Jansa
99aa19ff53 recipes: use oe.utils.conditional instead of deprecated base_conditional
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-02-01 13:48:27 +00:00
Ricardo Ribalda Delgado
4a9ba44b11 opencv: Fix error when dynamic link
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>
2017-11-30 09:13:32 -08:00
Ricardo Ribalda Delgado
2bbef0ce64 opencv: Fix java wrapper generation
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>
2017-11-19 13:41:58 -08:00
Ricardo Ribalda Delgado
f888426e90 opencv: Download tinydnn manually
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>
2017-11-19 13:41:58 -08:00
Ricardo Ribalda Delgado
f4da4b7ceb opencv: Use OE built Protobuf
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>
2017-11-19 13:41:58 -08:00
Ricardo Ribalda Delgado
f27c6ce6b9 opencv: Update ICV variable names
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>
2017-11-19 13:41:58 -08:00
Kai Kang
6aa6ba3702 opencv: fix CVE-2017-14136
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>
2017-09-22 22:50:47 +00:00
Khem Raj
98f96aa15e opencv: Fix build on aarch64
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>
2017-09-22 22:50:47 +00:00
Khem Raj
4a45235796 opencv: Fix build with clang
-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>
2017-09-13 11:13:25 +02:00
Kai Kang
860f01d1bd opencv: fix CVEs
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>
2017-08-31 10:18:33 +02:00
Ismo Puustinen
31fceb560c opencv: update to version 3.3.
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>
2017-08-13 13:21:02 +02:00