From 4bc9568b9d265d301c350f372d8d594ea42b59d3 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 15 Jan 2024 11:25:16 +0100 Subject: isp-imx: fix build against updated tinyxml2 Latest master meta-oe updated tinyxml2 to version 10.0.0. isp-imx packages a prebuilt library dynamically linked against tinyxml2.so.9 which is no longer provided, thus: | ERROR: isp-imx-4.2.2.22.0-r0 do_package_qa: QA Issue: /usr/lib/libcam_device.so contained in package isp-imx requires libtinyxml2.so.9()(64bit), but no providers found in RDEPENDS:isp-imx? [file-rdeps] Fix the build by updating the dynamic section to require tinyxml2.so.10. Note that I don't have a system to runtime test if that still works. The tinyxml API doesn't look like it changed from 9 to 10. Signed-off-by: Max Krummenacher --- recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb index 39d7d7706..7d0406fd0 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "i.MX Verisilicon Software ISP" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" -DEPENDS = "boost libdrm virtual/libg2d libtinyxml2" +DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 patchelf-native" SRC_URI = " \ ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ @@ -47,6 +47,12 @@ EXTRA_OECMAKE += " \ -Wno-dev \ " +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() { install -d ${D}/${libdir} install -d ${D}/${includedir} -- cgit v1.2.3-54-g00ecf