diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2023-05-15 14:37:11 -0700 |
---|---|---|
committer | Tom Hochstein <tom.hochstein@nxp.com> | 2023-05-17 05:42:39 -0700 |
commit | 6e41d851e71505183ff021b07c317e5290571916 (patch) | |
tree | 3f931a9e2e747ecb7f498bf4057a4ddd9f2f66d2 | |
parent | 20c1612e983ae07a274a1deb36d347a98976ccf5 (diff) | |
download | meta-freescale-6e41d851e71505183ff021b07c317e5290571916.tar.gz |
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 <tom.hochstein@nxp.com>
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 5 |
1 files 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 =+ " \ | |||
106 | PACKAGES_GBM = "" | 106 | PACKAGES_GBM = "" |
107 | PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" | 107 | PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev" |
108 | 108 | ||
109 | PACKAGES_OPENCL = "libopencl-imx libopencl-imx-dev libclc-imx libclc-imx-dev" | 109 | PACKAGES_OPENCL = "libclc-imx libclc-imx-dev libopencl-imx libopencl-imx-dev" |
110 | PACKAGES_OPENCL:mx7-nxp-bsp = "" | 110 | PACKAGES_OPENCL:mx7-nxp-bsp = "" |
111 | PACKAGES_OPENCL:mx8mm-nxp-bsp = "" | 111 | PACKAGES_OPENCL:mx8mm-nxp-bsp = "" |
112 | 112 | ||
@@ -326,7 +326,6 @@ do_install:append:libc-musl() { | |||
326 | ALLOW_EMPTY:${PN} = "1" | 326 | ALLOW_EMPTY:${PN} = "1" |
327 | 327 | ||
328 | FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" | 328 | FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" |
329 | FILES:libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" | ||
330 | 329 | ||
331 | # libEGL.so is used by some demo apps from Freescale | 330 | # libEGL.so is used by some demo apps from Freescale |
332 | INSANE_SKIP:libegl-imx += "dev-so" | 331 | INSANE_SKIP:libegl-imx += "dev-so" |
@@ -389,7 +388,7 @@ FILES:libgles3-imx-dev = "${includedir}/GLES3" | |||
389 | RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev" | 388 | RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev" |
390 | 389 | ||
391 | FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" | 390 | FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" |
392 | FILES:libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" | 391 | FILES:libglslc-imx-dev = "${libdir}/libGLSLC${SOLIBSDEV}" |
393 | 392 | ||
394 | FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ | 393 | FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ |
395 | ${libdir}/libVivanteOpenCL${SOLIBS} \ | 394 | ${libdir}/libVivanteOpenCL${SOLIBS} \ |