From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 1 Nov 2021 13:20:02 +0000 (+0100)
Subject: isp-imx: provide an libtinyxml2 8.0.0 recipe
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4cf4294ae9878af5afef7cfab7033401cc297cdc;p=meta-freescale.git

isp-imx: provide an libtinyxml2 8.0.0 recipe

isp-imx has precompiled binaries linked against that libtinyxml2 version.
Remove files which are also provided by the 'current' recipe version
of libtinyxml so that they don't clash during image/SDK creation.

Since the isp-imx does do a link step against libtinyxml2 create the
the unversioned symlink libtinyxml2.so in do_compile.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 454602452d7a3fe8b25bfccc038c32dd22380406)
---

diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
index 89b0abd2..379536fd 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
@@ -3,7 +3,7 @@
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
-DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2"
+DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8"
 
 SRC_URI = " \
     ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
@@ -47,6 +47,10 @@ 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}
diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb
new file mode 100644
index 00000000..363f7305
--- /dev/null
+++ b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb
@@ -0,0 +1,22 @@
+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"
+
+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
+}