isp-imx: Upgrade 4.2.2.16.0 -> 4.2.2.18.0

- Drop the dependency on Python
- Incorporate the patch 0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch (ca1cc9966)
- Update to libtinyxml2 9

Fixes:
ca1cc9966 LF-6283: Fix isp startup is incorrect for third-party boards
f20917e56 LF-6262-2: Delete nodes in os08a20 4k xml files that lead android crash
44e4e5486 LF-6262-1: Fix the os08a20 4k work abnormally
dfa4b6671 LF-5970: Add the support for sensor os08a20 in the i.mx865
b92bd279e LF-6200: isp: remove isp-imx includes 4 GPL files
5501b5a2e remove the mode 4 for basler camera
b07f11f7c M865SW-978: media-server stop need sync
3fb6a58ff New partial build partial_release_20220408_4.2.2_p18
197077ee7 Update Release P18 from Verisilicon
e116968e3 update the build script to include OS08A20 things
ea5f3e9a3 update calibration XML file for OS08A20
0f8e04791 remove drm_test and isp_tpg_test from the isp build
a7740c028 update the xml file name as basler updates

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 76b1f6d21c4e7593ce848641a37d179d5f3d6979)

3 files changed, 16 insertions, 72 deletions

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.18.0.bb
index 2d99496e..177caa14 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb
@@ -1,17 +1,13 @@
-# Copyright 2020-2021 NXP
+# Copyright 2020-2022 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=d3c315c6eaa43e07d8c130dc3a04a011"
+DEPENDS = "libdrm virtual/libg2d libtinyxml2"
 
-SRC_URI = " \
-    ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
-    file://0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch \
-"
-
-SRC_URI[md5sum] = "f490153dbec234a04416ad41834806b2"
-SRC_URI[sha256sum] = "83b24b9d1f7a40a506a45a1c5c2ef2ca2313fe9b23fde591e3b7dce77ea359ca"
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "a20171db4bf2be423a587f3b610f0a69"
+SRC_URI[sha256sum] = "468ae51223d1873a1a756a1e64a53c0c61ebd640b3810f3a9e912b6a0de6c3c8"
 
 inherit fsl-eula-unpack cmake systemd use-imx-headers
 
@@ -45,14 +41,6 @@ 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_install() {
     install -d ${D}/${libdir}
     install -d ${D}/${includedir}
@@ -60,6 +48,8 @@ do_install() {
 
     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/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}
@@ -78,17 +68,21 @@ 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_SOLIBS_VERSIONED = " \
+    ${libdir}/libar1335.so \
     ${libdir}/libjsoncpp.so \
     ${libdir}/libos08a20.so \
     ${libdir}/libov2775.so \
 "
+FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
+FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
 
 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
-}