Download and unpack contrib modules and other repositories in S instead
of WORKDIR so they don't escape file-prefix-map substitutions.
Fixes a number of reproducibility problems because of OpenCV check
macros that were embedding path to files in contrib/.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
0001-use-GNUInstallDirs-for-detecting-install-paths.patch
removed since it's included in 0.1.2
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Disable sse4.1 and sse4.2 on x86 to fix the below build failure [1].
| ./opencv-4.5.5/git/modules/gapi/src/backends/fluid/gfluidcore_simd_sse41.hpp:387:47: error: '_mm_insert_epi64' was not declared in this scope; did you mean '_mm_insert_epi8'?
387 | val_0 = _mm_unpacklo_epi8(_mm_insert_epi64(val_0, reinterpret_cast<const int64_t>(&tmp[4 * (chanNum * mapsx[x + 1] + 1)]), 0), zero);
| ^~~~~~~~~~~~~~~~
| _mm_insert_epi8
[1] https://github.com/opencv/opencv/issues/21597
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Patch [1] was dropped but contrib repo was not updated leading into the
glog link issues for the sfm module. Update opencv_contrib 4.5.2 ->
4.5.5.
Error:
/var/lib/yocto/builds/build_honister/tmp/work/bobcat-poky-linux/
qtec-screwcounter-camera/1.0+gitAUTOINC+7f76d8d874-r0/
recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/
x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/ld:
/var/lib/yocto/builds/build_honister/tmp/work/bobcat-poky-linux/
qtec-screwcounter-camera/1.0+gitAUTOINC+7f76d8d874-r0/recipe-sysroot/
usr/lib/../lib/libopencv_sfm.so:
undefined reference to `google::LogMessageFatal::LogMessageFatal(char
const*, int)'
[1]:
meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Drop backports.
Disable ffmpeg, as opencv is not yet compatible with ffmpeg 5.0.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This patch updates SRC_URIs using git to include branch=master if no branch is set
and also to use protocol=https for github urls as generated by the conversion script
in OE-Core.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Currently opencv ships with setup_vars_opencv4.sh, but there comes below
error:
# /usr/bin/setup_vars_opencv4.sh
Setting vars for OpenCV 4.5.2
Append PYTHONPATH: /usr/bin/../lib/python3.9/site-packages
# ls /usr/bin/../lib/python3.9/site-packages
ls: cannot access '/usr/bin/../lib/python3.9/site-packages': No such file or directory
Considering the file is useless and also removed in other distribution [1],
so remove the file to avoid confusing.
[1] https://src.fedoraproject.org/rpms/opencv/blob/rawhide/f/opencv.spec#_424
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
getcontext|setcontext functionality is provided via libucontext for musl
but this library is not yet ported to RISCV
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Since tbb does not build for powerpc remove it from the enabled list
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* fixes build issue when dnn PACKAGECONFIG is enabled and ld-is-gold in DISTRO_FEATURES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Remove the build host info to improve reproducibility, otherwise there
comes below detailed build host info when run below command on target.
# python3 /usr/share/opencv4/samples/python/opencv_version.py --build
[snip]
Extra modules:
Location (extra): /buildarea1/master-wr/build/User/customized_next/build/tmp/work/corei7-64-wrs-linux/opencv/4.3.0-r0/contrib/modules
[snip]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* Remove the patch which used to create ts module as shared library
as the logic is covered in the new added patch which makes ts module
external
* Add a patch to make ts module external to fix the below broken link:
# ls -l /usr/lib64/libopencv_ts.so
lrwxrwxrwx 1 root root 19 Jun 14 19:13 /usr/lib64/libopencv_ts.so -> libopencv_ts.so.4.3
# rpm -qf /usr/lib64/libopencv_ts.so
libopencv-ts-dev-4.3.0-r0.corei7_64
# readlink -e /usr/lib64/libopencv_ts.so
# echo $?
1
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The Graph API is enabled by default, and if ADE isn't present it will
download a copy of the source during do_configure.
Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we
package.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
OpenCV downloads data files during the CMake configure phase, which
is bad because fetching should only happen in do_fetch (and if proxies
are needed, won't be set in do_configure).
The recipe attempts to solve this already by having the repositories in
SRC_URI and moving the files to the correct place before do_configure().
However they are written to ${B} which is then wiped in do_configure so
they're not used.
The OpenCV download logic has a download cache with specially formatted
filenames, so take the downloaded files and populate the cache.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Fixes
ERROR: ade-0.1.1f-r0 do_package: QA Issue: ade: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libade.a
Signed-off-by: Khem Raj <raj.khem@gmail.com>
In OpenCV 4, .pc file generation is disabled by default. Yet, other
software such as GStreamer and FFmpeg rely on the .pc files during build
time configuration. Explicitely enable .pc file generation to make sure
pkg-config can be used for getting information about OpenCV.
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
ADE Framework is a graph construction, manipulation, and processing
framework. ADE Framework is suitable for organizing data flow
processing and execution.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Update both opencv and opencv_contrib to 4.1.0 and refresh all patches.
Remove tiny-dnn from SRC_URI as it is not picked up by opencv cmake
build system. This also fixes a QA warning about using unstable github
archive.
Also update FILES_* to capture new paths which uses new directory name
"opencv4" instead of "OpenCV".
Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
While baselib = 'lib64', there is a installed-vs-shipped QA WARNING
...
WARNING: QA Issue: opencv: Files/directories were installed but not shipped in any package:
/usr/lib64/site-packages/cv2/load_config_py2.py
/usr/lib64/site-packages/cv2/config.py
...
Drop unnecessary LIB_SUFFIX setting to fix the issue.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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>
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>
