From 59d36c9832702989bfcca8a5af29fb2dff01efcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 11:01:05 -0700 Subject: layer: Convert to new override syntax Signed-off-by: Khem Raj --- recipes-support/opencv/opencv_4.5.2.imx.bb | 82 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'recipes-support') diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb index a86fd3ecb..b7f1c1174 100644 --- a/recipes-support/opencv/opencv_4.5.2.imx.bb +++ b/recipes-support/opencv/opencv_4.5.2.imx.bb @@ -11,8 +11,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" @@ -59,7 +59,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-Make-ts-module-external.patch \ file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ " -SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" +SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" S = "${WORKDIR}/git" @@ -106,7 +106,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@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)} \ " -EXTRA_OECMAKE_append_x86 = " -DX86=ON" +EXTRA_OECMAKE:append:x86 = " -DX86=ON" PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ @@ -158,7 +158,7 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', ' ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ ${PN}-apps" -python populate_packages_prepend () { +python populate_packages:prepend () { cv_libdir = d.expand('${libdir}') do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') @@ -167,58 +167,58 @@ python populate_packages_prepend () { pn = d.getVar('PN') metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('RRECOMMENDS:' + metapkg, ' '.join(metapkg_rdepends)) metapkg = pn - d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") blacklist = [ metapkg, "libopencv-ts" ] metapkg_rdepends = [ ] for pkg in packages[1:]: 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'): metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) } PACKAGES_DYNAMIC += "^libopencv-.*" -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" -FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/opencv4/samples/" +FILES:${PN} = "" +FILES:${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES:${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES:${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES:${PN}-java = "${datadir}/OpenCV/java" +FILES:${PN}-samples = "${datadir}/opencv4/samples/" -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" +INSANE_SKIP:${PN}-java = "libdir" +INSANE_SKIP:${PN}-dbg = "libdir" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" +SUMMARY:python-opencv = "Python bindings to opencv" +FILES:python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python-opencv = "python-core python-numpy" -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" +SUMMARY:python3-opencv = "Python bindings to opencv" +FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-opencv = "python3-core python3-numpy" -RDEPENDS_${PN}-apps = "bash" +RDEPENDS:${PN}-apps = "bash" -do_compile_prepend() { +do_compile:prepend() { # remove the build host info to improve reproducibility if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc fi } -do_install_append() { +do_install:append() { # Move Python files into correct library folder (for multilib build) if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then mv ${D}/usr/lib/* ${D}/${libdir}/ @@ -245,16 +245,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998" OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https" SRCBRANCH = "4.5.2_imx" -SRC_URI_remove = "git://github.com/opencv/opencv.git;name=opencv" +SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv" SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv" # Add opencv_extra -SRCREV_extra = "855c4528402e563283f86f28c6393f57eb5dcf62" +SRCREV:extra = "855c4528402e563283f86f28c6393f57eb5dcf62" SRC_URI += " \ git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra \ file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ " -SRCREV_FORMAT_append = "_extra" +SRCREV_FORMAT:append = "_extra" # Add tiny-dnn SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" @@ -264,25 +264,25 @@ SRC_URI += " \ file://OpenCV_DNN_examples.patch \ " -PACKAGECONFIG_remove = "eigen" -PACKAGECONFIG_append_mx8 = " dnn text" +PACKAGECONFIG:remove = "eigen" +PACKAGECONFIG:append:mx8 = " dnn text" PACKAGECONFIG_OPENCL = "" -PACKAGECONFIG_OPENCL_mx8 = "opencl" -PACKAGECONFIG_OPENCL_mx8dxl = "" -PACKAGECONFIG_OPENCL_mx8mm = "" -PACKAGECONFIG_OPENCL_mx8mnlite = "" -PACKAGECONFIG_append = " ${PACKAGECONFIG_OPENCL}" +PACKAGECONFIG_OPENCL:mx8 = "opencl" +PACKAGECONFIG_OPENCL:mx8dxl = "" +PACKAGECONFIG_OPENCL:mx8mm = "" +PACKAGECONFIG_OPENCL:mx8mnlite = "" +PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native," PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF," -do_unpack_extra_append() { +do_unpack_extra:append() { mkdir -p ${S}/3rdparty/tinydnn/ tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ } -do_install_append() { +do_install:append() { ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 install -d ${D}${datadir}/OpenCV/samples/data cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data @@ -293,7 +293,7 @@ do_install_append() { fi } -FILES_${PN}-samples += "${datadir}/OpenCV/samples" +FILES:${PN}-samples += "${datadir}/OpenCV/samples" COMPATIBLE_MACHINE = "(mx8)" -- cgit v1.2.3-54-g00ecf