From 6e41d851e71505183ff021b07c317e5290571916 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 15 May 2023 14:37:11 -0700 Subject: imx-gpu-viv: Fix OpenCL packaging All of the OpenCL headers belong in libopencl-imx-dev except for one, cl_viv_vx_ext.h, which belongs in libclc-imx. Drop ${includedir}/CL from libclc-imx-dev. Also drop it from libglslc-imx-dev, which appears to have been a copy-paste error. The library libCLC.so is unversioned. It is currently included in both libclc-imx and libclc-imx-dev. Drop it from the latter. In order to place cl_viv_vx_ext.h in libclc-imx, it must have its package listed before libopencl-imx, so fix the order of PACKAGES_OPENCL. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 3f94c38c..fe326e9d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -106,7 +106,7 @@ PACKAGES =+ " \ PACKAGES_GBM = "" PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" -PACKAGES_OPENCL = "libopencl-imx libopencl-imx-dev libclc-imx libclc-imx-dev" +PACKAGES_OPENCL = "libclc-imx libclc-imx-dev libopencl-imx libopencl-imx-dev" PACKAGES_OPENCL:mx7-nxp-bsp = "" PACKAGES_OPENCL:mx8mm-nxp-bsp = "" @@ -326,7 +326,6 @@ do_install:append:libc-musl() { ALLOW_EMPTY:${PN} = "1" FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" -FILES:libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" # libEGL.so is used by some demo apps from Freescale INSANE_SKIP:libegl-imx += "dev-so" @@ -389,7 +388,7 @@ FILES:libgles3-imx-dev = "${includedir}/GLES3" RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev" FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" -FILES:libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" +FILES:libglslc-imx-dev = "${libdir}/libGLSLC${SOLIBSDEV}" FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ ${libdir}/libVivanteOpenCL${SOLIBS} \ -- cgit v1.2.3-54-g00ecf