diff options
author | Jaewon Lee <jaewon.lee@xilinx.com> | 2020-03-09 11:17:56 -0700 |
---|---|---|
committer | Jaewon Lee <jaewon.lee@xilinx.com> | 2020-03-10 10:31:17 -0700 |
commit | f97031e9a69687dfb5d0d4c1ca2c27cad140aeb9 (patch) | |
tree | de86cddc5d09f60abec7a341ab88e11e3a81ba80 /meta-xilinx-bsp | |
parent | dad0d1c9baaaf8c2b7fc7c895dbe3a528fd99393 (diff) | |
download | meta-xilinx-f97031e9a69687dfb5d0d4c1ca2c27cad140aeb9.tar.gz |
Add older version of OpenCV 3.4.3
OpenCV 3.4.3 is not API compatible with OpenCV 4.1, so making the older
3.4.3 version available as needed.
This version comes from meta-openembedded commit:
7b9f86ca792852e69a921b284fffaa1f942df96d
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
10 files changed, 501 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb new file mode 100644 index 00000000..72a9c8b3 --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb | |||
@@ -0,0 +1,194 @@ | |||
1 | SUMMARY = "Opencv : The Open Computer Vision Library" | ||
2 | HOMEPAGE = "http://opencv.org/" | ||
3 | SECTION = "libs" | ||
4 | |||
5 | FILESEXTRAPATHS_prepend := "${THISDIR}/opencv_3.4.3:" | ||
6 | |||
7 | LICENSE = "BSD-3-Clause" | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=62d89c5dcb0583609ea919c56be0ee76" | ||
9 | |||
10 | ARM_INSTRUCTION_SET_armv4 = "arm" | ||
11 | ARM_INSTRUCTION_SET_armv5 = "arm" | ||
12 | |||
13 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" | ||
14 | |||
15 | SRCREV_opencv = "b38c50b3d0c31e82294315ec44b54b7ef559ef12" | ||
16 | SRCREV_contrib = "1f6d6f06266e1ef336437ae5404bee1c65d42cda" | ||
17 | SRCREV_ipp = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a" | ||
18 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | ||
19 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | ||
20 | SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" | ||
21 | SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" | ||
22 | |||
23 | def ipp_filename(d): | ||
24 | import re | ||
25 | arch = d.getVar('TARGET_ARCH', True) | ||
26 | if re.match("i.86$", arch): | ||
27 | return "ippicv_2017u3_lnx_ia32_general_20180518.tgz" | ||
28 | else: | ||
29 | return "ippicv_2017u3_lnx_intel64_general_20180518.tgz" | ||
30 | |||
31 | def ipp_md5sum(d): | ||
32 | import re | ||
33 | arch = d.getVar('TARGET_ARCH', True) | ||
34 | if re.match("i.86$", arch): | ||
35 | return "ea72de74dae3c604eb6348395366e78e" | ||
36 | else: | ||
37 | return "b7cc351267db2d34b9efa1cd22ff0572" | ||
38 | |||
39 | IPP_FILENAME = "${@ipp_filename(d)}" | ||
40 | IPP_MD5 = "${@ipp_md5sum(d)}" | ||
41 | |||
42 | SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" | ||
43 | SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ | ||
44 | git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ | ||
45 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180518;destsuffix=ipp;name=ipp \ | ||
46 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ | ||
47 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ | ||
48 | https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ | ||
49 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ | ||
50 | file://uselocalxfeatures.patch;patchdir=../contrib/ \ | ||
51 | file://0001-Add-missing-multi-line-separator.patch;patchdir=../contrib/ \ | ||
52 | file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ | ||
53 | file://0003-To-fix-errors-as-following.patch \ | ||
54 | file://fixpkgconfig.patch \ | ||
55 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ | ||
56 | file://0001-Dont-use-isystem.patch \ | ||
57 | file://0001-Check-for-clang-before-using-isystem.patch \ | ||
58 | " | ||
59 | PV = "3.4.3+git${SRCPV}" | ||
60 | |||
61 | S = "${WORKDIR}/git" | ||
62 | |||
63 | do_unpack_extra() { | ||
64 | mkdir -p ${S}/3rdparty/tinydnn/ | ||
65 | tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ | ||
66 | tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} | ||
67 | cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src | ||
68 | cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src | ||
69 | } | ||
70 | addtask unpack_extra after do_unpack before do_patch | ||
71 | |||
72 | EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ | ||
73 | -DWITH_1394=OFF \ | ||
74 | -DENABLE_PRECOMPILED_HEADERS=OFF \ | ||
75 | -DCMAKE_SKIP_RPATH=ON \ | ||
76 | -DOPENCV_ICV_HASH=${IPP_MD5} \ | ||
77 | -DIPPROOT=${WORKDIR}/ippicv_lnx \ | ||
78 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ | ||
79 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ | ||
80 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ | ||
81 | ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ | ||
82 | ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | ||
83 | " | ||
84 | EXTRA_OECMAKE_append_x86 = " -DX86=ON" | ||
85 | |||
86 | PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ | ||
87 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | ||
88 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" | ||
89 | |||
90 | PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," | ||
91 | PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," | ||
92 | PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," | ||
93 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," | ||
94 | PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," | ||
95 | PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," | ||
96 | PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," | ||
97 | PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," | ||
98 | PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," | ||
99 | PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," | ||
100 | PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," | ||
101 | PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," | ||
102 | PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," | ||
103 | PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," | ||
104 | PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," | ||
105 | PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," | ||
106 | PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," | ||
107 | PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," | ||
108 | PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," | ||
109 | PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," | ||
110 | PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," | ||
111 | PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," | ||
112 | PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," | ||
113 | |||
114 | inherit pkgconfig cmake | ||
115 | |||
116 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} | ||
117 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} | ||
118 | |||
119 | export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" | ||
120 | export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" | ||
121 | export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" | ||
122 | export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" | ||
123 | export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" | ||
124 | |||
125 | TARGET_CC_ARCH += "-I${S}/include " | ||
126 | |||
127 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ | ||
128 | ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ | ||
129 | ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ | ||
130 | ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ | ||
131 | ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ | ||
132 | ${PN}-apps" | ||
133 | |||
134 | python populate_packages_prepend () { | ||
135 | cv_libdir = d.expand('${libdir}') | ||
136 | do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) | ||
137 | do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | ||
138 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | ||
139 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) | ||
140 | |||
141 | pn = d.getVar('PN') | ||
142 | metapkg = pn + '-dev' | ||
143 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | ||
144 | blacklist = [ metapkg ] | ||
145 | metapkg_rdepends = [ ] | ||
146 | packages = d.getVar('PACKAGES').split() | ||
147 | for pkg in packages[1:]: | ||
148 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): | ||
149 | metapkg_rdepends.append(pkg) | ||
150 | d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) | ||
151 | |||
152 | metapkg = pn | ||
153 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | ||
154 | blacklist = [ metapkg, "libopencv-ts" ] | ||
155 | metapkg_rdepends = [ ] | ||
156 | for pkg in packages[1:]: | ||
157 | 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') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): | ||
158 | metapkg_rdepends.append(pkg) | ||
159 | d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) | ||
160 | } | ||
161 | |||
162 | PACKAGES_DYNAMIC += "^libopencv-.*" | ||
163 | |||
164 | FILES_${PN} = "" | ||
165 | FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" | ||
166 | FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake" | ||
167 | FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a" | ||
168 | FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" | ||
169 | FILES_${PN}-java = "${datadir}/OpenCV/java" | ||
170 | FILES_${PN}-samples = "${datadir}/OpenCV/samples/" | ||
171 | |||
172 | INSANE_SKIP_${PN}-java = "libdir" | ||
173 | INSANE_SKIP_${PN}-dbg = "libdir" | ||
174 | |||
175 | ALLOW_EMPTY_${PN} = "1" | ||
176 | |||
177 | SUMMARY_python-opencv = "Python bindings to opencv" | ||
178 | FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
179 | RDEPENDS_python-opencv = "python-core python-numpy" | ||
180 | |||
181 | SUMMARY_python3-opencv = "Python bindings to opencv" | ||
182 | FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
183 | RDEPENDS_python3-opencv = "python3-core python3-numpy" | ||
184 | |||
185 | do_install_append() { | ||
186 | cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ | ||
187 | sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h | ||
188 | |||
189 | # Move Python files into correct library folder (for multilib build) | ||
190 | if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then | ||
191 | mv ${D}/usr/lib/* ${D}/${libdir}/ | ||
192 | rm -rf ${D}/usr/lib | ||
193 | fi | ||
194 | } | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch new file mode 100644 index 00000000..5f909c1a --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 85b882b4ceb57fe6538f47af58d0a970923fde0e Mon Sep 17 00:00:00 2001 | ||
2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | ||
3 | Date: Thu, 31 Mar 2016 00:20:15 +0200 | ||
4 | Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp | ||
5 | |||
6 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | ||
7 | Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> | ||
8 | |||
9 | --- | ||
10 | 3rdparty/ippicv/ippicv.cmake | 15 +-------------- | ||
11 | 1 file changed, 1 insertion(+), 14 deletions(-) | ||
12 | |||
13 | diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake | ||
14 | index ae8748c..305abdb 100644 | ||
15 | --- a/3rdparty/ippicv/ippicv.cmake | ||
16 | +++ b/3rdparty/ippicv/ippicv.cmake | ||
17 | @@ -39,18 +39,5 @@ function(download_ippicv root_var) | ||
18 | endif() | ||
19 | |||
20 | set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") | ||
21 | - ocv_download(FILENAME ${OPENCV_ICV_NAME} | ||
22 | - HASH ${OPENCV_ICV_HASH} | ||
23 | - URL | ||
24 | - "${OPENCV_IPPICV_URL}" | ||
25 | - "$ENV{OPENCV_IPPICV_URL}" | ||
26 | - "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" | ||
27 | - DESTINATION_DIR "${THE_ROOT}" | ||
28 | - ID IPPICV | ||
29 | - STATUS res | ||
30 | - UNPACK RELATIVE_URL) | ||
31 | - | ||
32 | - if(res) | ||
33 | - set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) | ||
34 | - endif() | ||
35 | + set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) | ||
36 | endfunction() | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch new file mode 100644 index 00000000..aa196a5f --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Add-missing-multi-line-separator.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 60857229aab13ccc426572a43ab891409bb76ea4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 9 Sep 2018 22:52:55 -0700 | ||
4 | Subject: [PATCH] Add missing multi-line separator | ||
5 | |||
6 | Otherwise this fails to build ( found on mips ) | ||
7 | |||
8 | Fixes | ||
9 | contrib/modules/surface_matching/src/hash_murmur86.hpp:97:15: error: | ||
10 | expected constructor, destructor, or type conversion before '(' token | ||
11 | && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && | ||
12 | __GNUC_MINOR__>=3)) | ||
13 | ^ | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/1764] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | modules/surface_matching/src/hash_murmur86.hpp | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/modules/surface_matching/src/hash_murmur86.hpp b/modules/surface_matching/src/hash_murmur86.hpp | ||
22 | index 1edf6bf4..0477d37e 100644 | ||
23 | --- a/modules/surface_matching/src/hash_murmur86.hpp | ||
24 | +++ b/modules/surface_matching/src/hash_murmur86.hpp | ||
25 | @@ -93,7 +93,7 @@ void hashMurmurx86 ( const void * key, const int len, const uint seed, void * ou | ||
26 | /* Now find best way we can to READ_UINT32 */ | ||
27 | #ifndef WORDS_BIGENDIAN | ||
28 | # define READ_UINT32(ptr) (*((uint32_t*)(ptr))) | ||
29 | -#elif defined(WORDS_BIGENDIAN) | ||
30 | +#elif defined(WORDS_BIGENDIAN) \ | ||
31 | && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3)) | ||
32 | # define READ_UINT32(ptr) (__builtin_bswap32(*((uint32_t*)(ptr)))) | ||
33 | #endif | ||
34 | -- | ||
35 | 2.18.0 | ||
36 | |||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Check-for-clang-before-using-isystem.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Check-for-clang-before-using-isystem.patch new file mode 100644 index 00000000..fe784330 --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Check-for-clang-before-using-isystem.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From fa76d8646bb2b9b514728eeef41afed7c43a36f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 11 Sep 2018 18:18:33 -0700 | ||
4 | Subject: [PATCH] Check for clang before using -isystem | ||
5 | |||
6 | When cross compiling with clang, the internal C++ headers are not found | ||
7 | when adding sysroot to -isystem, that is redundant anyway because it | ||
8 | will look for headers insider --sysroot path with same quality as it | ||
9 | would do with -isystem otherwise | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/12504] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | cmake/OpenCVUtils.cmake | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake | ||
18 | index fae91c165f..60c20192dc 100644 | ||
19 | --- a/cmake/OpenCVUtils.cmake | ||
20 | +++ b/cmake/OpenCVUtils.cmake | ||
21 | @@ -259,7 +259,7 @@ function(ocv_include_directories) | ||
22 | ocv_is_opencv_directory(__is_opencv_dir "${dir}") | ||
23 | if(__is_opencv_dir) | ||
24 | list(APPEND __add_before "${dir}") | ||
25 | - elseif(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND | ||
26 | + elseif(((CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0") OR CV_CLANG) AND | ||
27 | dir MATCHES "/usr/include$") | ||
28 | # workaround for GCC 6.x bug | ||
29 | else() | ||
30 | -- | ||
31 | 2.18.0 | ||
32 | |||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Dont-use-isystem.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Dont-use-isystem.patch new file mode 100644 index 00000000..40d3f53e --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Dont-use-isystem.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 9659f5a1e75fc29c9879c301767bba72ecf9042a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 11 Sep 2018 00:21:18 -0700 | ||
4 | Subject: [PATCH] Dont use isystem | ||
5 | |||
6 | clang really does not like it | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | --- | ||
13 | cmake/OpenCVPCHSupport.cmake | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake | ||
17 | index 59bc826..055dfce 100644 | ||
18 | --- a/cmake/OpenCVPCHSupport.cmake | ||
19 | +++ b/cmake/OpenCVPCHSupport.cmake | ||
20 | @@ -18,6 +18,8 @@ IF(CV_GCC) | ||
21 | SET(PCHSupport_FOUND TRUE) | ||
22 | ENDIF() | ||
23 | |||
24 | + SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I") | ||
25 | + SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I") | ||
26 | SET(_PCH_include_prefix "-I") | ||
27 | SET(_PCH_isystem_prefix "-isystem") | ||
28 | SET(_PCH_define_prefix "-D") | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch new file mode 100644 index 00000000..f8ccd1d5 --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From fe27d0e2341683606704115949d16250e4cacbfa Mon Sep 17 00:00:00 2001 | ||
2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
3 | Date: Wed, 9 May 2018 13:33:59 -0700 | ||
4 | Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function | ||
5 | compile failure until next uprev | ||
6 | |||
7 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
8 | |||
9 | --- | ||
10 | modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ | ||
11 | 1 file changed, 8 insertions(+) | ||
12 | |||
13 | diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp | ||
14 | index 0d360ad..566df66 100644 | ||
15 | --- a/modules/videoio/src/cap_ffmpeg_impl.hpp | ||
16 | +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp | ||
17 | @@ -736,6 +736,14 @@ struct ImplMutex::Impl | ||
18 | |||
19 | #endif | ||
20 | |||
21 | +/* NOTE This is deprecated in ffmpeg and the code should be removed */ | ||
22 | +#ifndef AVFMT_RAWPICTURE | ||
23 | +#define AVFMT_RAWPICTURE 0x0020 | ||
24 | +#endif /* AVFMT_RAWPICTURE */ | ||
25 | +#ifndef CODEC_FLAG_GLOBAL_HEADER | ||
26 | +#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER | ||
27 | +#endif | ||
28 | + | ||
29 | void ImplMutex::init() | ||
30 | { | ||
31 | impl = new Impl(); | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0002-Make-opencv-ts-create-share-library-intead-of-static.patch new file mode 100644 index 00000000..46198fb7 --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0002-Make-opencv-ts-create-share-library-intead-of-static.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 46ffa1f8f443b71673774fcb864eb741bbc26200 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bian Naimeng <biannm@cn.fujitsu.com> | ||
3 | Date: Wed, 19 Apr 2017 03:11:37 +0900 | ||
4 | Subject: [PATCH] Make opencv-ts create share library intead of static. | ||
5 | |||
6 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
7 | |||
8 | --- | ||
9 | modules/ts/CMakeLists.txt | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt | ||
13 | index f95bed0..ee67858 100644 | ||
14 | --- a/modules/ts/CMakeLists.txt | ||
15 | +++ b/modules/ts/CMakeLists.txt | ||
16 | @@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) | ||
17 | ocv_module_disable(ts) | ||
18 | endif() | ||
19 | |||
20 | -set(OPENCV_MODULE_TYPE STATIC) | ||
21 | +#set(OPENCV_MODULE_TYPE STATIC) | ||
22 | set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) | ||
23 | |||
24 | if(WINRT) | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0003-To-fix-errors-as-following.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0003-To-fix-errors-as-following.patch new file mode 100644 index 00000000..336c2e08 --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/0003-To-fix-errors-as-following.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From 867caccc358266f7021f076fc8c8e41bf048782c Mon Sep 17 00:00:00 2001 | ||
2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | ||
3 | Date: Fri, 19 May 2017 04:27:50 +0900 | ||
4 | Subject: [PATCH] To fix errors as following: | ||
5 | |||
6 | "test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'" | ||
7 | "perf_abs.cpp:13: undefined reference to `cvtest::param_seed'" | ||
8 | "test_superres.cpp:270: undefined reference to `checkIppStatus()'" | ||
9 | |||
10 | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | ||
11 | |||
12 | Also add the visibility changes for certain OpenCL-related functions in | ||
13 | ts module. | ||
14 | |||
15 | Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> | ||
16 | |||
17 | --- | ||
18 | modules/ts/include/opencv2/ts.hpp | 4 ++-- | ||
19 | modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- | ||
20 | modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- | ||
21 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
22 | |||
23 | diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp | ||
24 | index b9d6b74..f1ee7ee 100644 | ||
25 | --- a/modules/ts/include/opencv2/ts.hpp | ||
26 | +++ b/modules/ts/include/opencv2/ts.hpp | ||
27 | @@ -622,7 +622,7 @@ protected: | ||
28 | } | ||
29 | }; | ||
30 | |||
31 | -extern uint64 param_seed; | ||
32 | +CV_EXPORTS extern uint64 param_seed; | ||
33 | |||
34 | struct DefaultRngAuto | ||
35 | { | ||
36 | @@ -685,7 +685,7 @@ private: | ||
37 | #endif | ||
38 | #endif | ||
39 | |||
40 | -void parseCustomOptions(int argc, char **argv); | ||
41 | +CV_EXPORTS void parseCustomOptions(int argc, char **argv); | ||
42 | |||
43 | #define CV_TEST_INIT0_NOOP (void)0 | ||
44 | |||
45 | diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp | ||
46 | index 11572e9..438112e 100644 | ||
47 | --- a/modules/ts/include/opencv2/ts/ocl_test.hpp | ||
48 | +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp | ||
49 | @@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) | ||
50 | return dst; | ||
51 | } | ||
52 | |||
53 | -extern int test_loop_times; | ||
54 | +CV_EXPORTS extern int test_loop_times; | ||
55 | |||
56 | #define MAX_VALUE 357 | ||
57 | |||
58 | diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp | ||
59 | index b5cea3e..e5b0b4b 100644 | ||
60 | --- a/modules/ts/include/opencv2/ts/ts_ext.hpp | ||
61 | +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp | ||
62 | @@ -9,7 +9,7 @@ | ||
63 | #define OPENCV_TS_EXT_HPP | ||
64 | |||
65 | namespace cvtest { | ||
66 | -void checkIppStatus(); | ||
67 | +CV_EXPORTS void checkIppStatus(); | ||
68 | extern bool skipUnstableTests; | ||
69 | extern bool runBigDataTests; | ||
70 | extern int testThreads; | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/fixpkgconfig.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/fixpkgconfig.patch new file mode 100644 index 00000000..df20aabc --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/fixpkgconfig.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Index: git/cmake/OpenCVGenPkgconfig.cmake | ||
2 | =================================================================== | ||
3 | --- git.orig/cmake/OpenCVGenPkgconfig.cmake | ||
4 | +++ git/cmake/OpenCVGenPkgconfig.cmake | ||
5 | @@ -31,7 +31,7 @@ macro(fix_prefix lst isown) | ||
6 | get_filename_component(libdir "${item}" PATH) | ||
7 | get_filename_component(_libname "${item}" NAME) | ||
8 | ocv_get_libname(libname "${_libname}") | ||
9 | - list(APPEND _lst "-L${libdir}" "-l${libname}") | ||
10 | + list(APPEND _lst "-l${libname}") | ||
11 | else() | ||
12 | list(APPEND _lst "-l${item}") | ||
13 | endif() | ||
14 | @@ -124,11 +124,14 @@ ocv_list_unique(_extra) | ||
15 | ocv_list_unique(_3rdparty) | ||
16 | |||
17 | set(OPENCV_PC_LIBS | ||
18 | - "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" | ||
19 | + "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" | ||
20 | "${_modules}" | ||
21 | ) | ||
22 | if(BUILD_SHARED_LIBS) | ||
23 | - set(OPENCV_PC_LIBS_PRIVATE "${_extra}") | ||
24 | + set(OPENCV_PC_LIBS_PRIVATE | ||
25 | + "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" | ||
26 | + "${_extra}" | ||
27 | + ) | ||
28 | else() | ||
29 | set(OPENCV_PC_LIBS_PRIVATE | ||
30 | "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" | ||
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/uselocalxfeatures.patch b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/uselocalxfeatures.patch new file mode 100644 index 00000000..2605562e --- /dev/null +++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3/uselocalxfeatures.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt | ||
2 | index e1755595..c7009c47 100644 | ||
3 | --- a/modules/xfeatures2d/CMakeLists.txt | ||
4 | +++ b/modules/xfeatures2d/CMakeLists.txt | ||
5 | @@ -5,10 +5,10 @@ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d openc | ||
6 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) | ||
7 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake) | ||
8 | set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d") | ||
9 | -download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) | ||
10 | -download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) | ||
11 | -if(NOT boost_status OR NOT vgg_status) | ||
12 | - ocv_module_disable(xfeatures2d) | ||
13 | -endif() | ||
14 | +#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) | ||
15 | +#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) | ||
16 | +#if(NOT boost_status OR NOT vgg_status) | ||
17 | +# ocv_module_disable(xfeatures2d) | ||
18 | +#endif() | ||
19 | |||
20 | ocv_module_include_directories("${DOWNLOAD_DIR}") | ||