diff options
Diffstat (limited to 'recipes-bsp/isp-imx')
| -rw-r--r-- | recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb) | 11 | ||||
| -rw-r--r-- | recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch | 44 | ||||
| -rw-r--r-- | recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch | 28 | ||||
| -rw-r--r-- | recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb) | 49 | ||||
| -rw-r--r-- | recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb | 22 |
5 files changed, 80 insertions, 74 deletions
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb index 5b53068c..0ab44074 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb @@ -1,15 +1,15 @@ -# Copyright 2020-2021 NXP +# Copyright 2020-2023 NXP DESCRIPTION = "Basler camera binary drivers" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" +LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" inherit fsl-eula-unpack SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "489763169857773bade28611e649172e" -SRC_URI[sha256sum] = "3d4ae594659a697eef7479ca2480cc53f1d460f22bcc1c58104cff63bc6705fe" +SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71" +SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf" do_install() { dest_dir=${D}/opt/imx8-isp/bin @@ -22,6 +22,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "enable" FILES:${PN} = "${libdir} /opt" -INSANE_SKIP:${PN} = "file-rdeps already-stripped" +INSANE_SKIP:${PN} = "already-stripped" +RDEPENDS:${PN} += "isp-imx" COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch b/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch new file mode 100644 index 00000000..3f04000c --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch @@ -0,0 +1,44 @@ +From 15aae364fb52df30e4a49e73e2048fdc633e6868 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Sun, 8 Oct 2023 09:15:54 -0300 +Subject: [PATCH] cpp-netlib: parsers.ipp: add missing include + +With the update to boost from 1.82.0 -> 1.83.0 we now get compiler errors: + +| .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:58:3: error: 'u8_to_u32_iterator' was not declared in this scope + +Add the missing explicit include. Before the file was indirectly included from qi.hpp: + +| In file included from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/regex/pending/unicode_iterator.hpp:27, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/utf8.hpp:15, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/info.hpp:17, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/domain.hpp:16, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/meta_compiler.hpp:15, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action/action.hpp:14, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action.hpp:14, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi.hpp:14, +| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/include/qi.hpp:16, +| from .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:5, + +Upstream-Status: Pending + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + .../boost/network/protocol/http/server/impl/parsers.ipp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp +index c31e60e..2b83fbe 100755 +--- a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include <tuple> + #include <boost/fusion/include/std_tuple.hpp> + #include <boost/network/protocol/http/message/header.hpp> ++#include <boost/regex/pending/unicode_iterator.hpp> + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +-- +2.35.3 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch deleted file mode 100644 index bfea33a7..00000000 --- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a48c605b9f3860ee7abaca1a37add444a1b4001a Mon Sep 17 00:00:00 2001 -From: Chris Dimich <chris.dimich@boundarydevices.com> -Date: Tue, 8 Mar 2022 14:45:28 -0800 -Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable - -The NR_DEVICE_TREE_BASLER variable has the wrong path. - -Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com> ---- - imx/start_isp.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/imx/start_isp.sh b/imx/start_isp.sh -index 6daabc59c..8a07acfed 100755 ---- a/imx/start_isp.sh -+++ b/imx/start_isp.sh -@@ -7,7 +7,7 @@ - # - - RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" --NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) -+NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam `find /sys/firmware/devicetree/base/soc@0/ -name compatible | grep i2c` -l | wc -l 2> /dev/null) - NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) - - # check if the basler device has been enabled in the device tree --- -2.31.1 - diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb index 2d99496e..9e0f0265 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb @@ -1,17 +1,16 @@ -# Copyright 2020-2021 NXP +# Copyright 2020-2023 NXP DESCRIPTION = "i.MX Verisilicon Software ISP" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" -DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8" +LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" +DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 patchelf-native" SRC_URI = " \ ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ - file://0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch \ + file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \ " -SRC_URI[md5sum] = "f490153dbec234a04416ad41834806b2" -SRC_URI[sha256sum] = "83b24b9d1f7a40a506a45a1c5c2ef2ca2313fe9b23fde591e3b7dce77ea359ca" +SRC_URI[sha256sum] = "34b23f5b9f0856a8f5722e339a7ad4ccf4d99614788598306ff8b20093c1e846" inherit fsl-eula-unpack cmake systemd use-imx-headers @@ -29,9 +28,12 @@ SYSTEMD_SERVICE:${PN} = "imx8-isp.service" EXTRA_OECMAKE += " \ -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + -DCMAKE_INSTALL_LIBDIR=${libdir} \ -DISP_VERSION=ISP8000NANO_V1802 \ -DPLATFORM=ARM64 \ -DAPPMODE=V4L2 \ + -DTUNINGEXT=1 \ -DQTLESS=1 \ -DFULL_SRC_COMPILE=1 \ -DWITH_DRM=1 \ @@ -45,26 +47,32 @@ EXTRA_OECMAKE += " \ -Wno-dev \ " -do_configure:prepend() { - export SDKTARGETSYSROOT=${STAGING_DIR_HOST} -} - -do_compile:prepend() { - ln -sf ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so.?.?.? ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so +do_configure:prepend () { + # FIXME: Should be rebuild. + patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/units/cam_device/proprietories/lib/libcam_device.so + patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/mediacontrol/lib/arm-64/fpga/libcam_device.so } do_install() { + # FIXME: provided by the basler-camera package, do not install them here additionally + rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json + install -d ${D}/${libdir} install -d ${D}/${includedir} install -d ${D}/opt/imx8-isp/bin + install -d ${D}/opt/imx8-isp/bin/dewarp_config cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin - cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/tuningext ${D}/opt/imx8-isp/bin cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} cp -r ${B}/generated/release/include/* ${D}/${includedir} + cp -r ${S}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin @@ -78,17 +86,20 @@ do_install() { } # The build contains a mix of versioned and unversioned libraries, so -# the default packaging configuration needs some modifications +# the default packaging configuration needs some modification so that +# unversioned .so libraries go to the main package and versioned .so +# symlinks go to -dev. FILES_SOLIBSDEV = "" FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += " \ +FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" +FILES_SOLIBS_VERSIONED = " \ + ${libdir}/libcppnetlib-client-connections.so \ + ${libdir}/libcppnetlib-server-parsers.so \ + ${libdir}/libcppnetlib-uri.so \ ${libdir}/libjsoncpp.so \ ${libdir}/libos08a20.so \ - ${libdir}/libov2775.so \ " -INSANE_SKIP:${PN} = "rpaths" - -RDEPENDS:${PN} = "libdrm libpython3" +RDEPENDS:${PN} = "libdrm" COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb deleted file mode 100644 index 07d52355..00000000 --- a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" - -SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" - -S = "${WORKDIR}/git" - -inherit cmake - -# make sure we don't provide files which are also present in the -# current libtinyxml2 version's -dev package. -do_install:append() { - rm -rf ${D}/${includedir} - rm -rf ${D}/${libdir}/cmake - rm -rf ${D}/${libdir}/libtinyxml2.so - rm -rf ${D}/${libdir}/pkgconfig -} |