MIRRORS/meta-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/meta-imx.git synced 2025-12-18 00:17:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

mali-imx: Consolidate GLES dev packages [LF-11870]

Browse Source 
There's no need to break the GLES dev support into multiple packages.
There is also a precedent for one dev package:
https://packages.debian.org/bookworm/arm64/libgles-dev/filelist

Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com>
This commit is contained in:
Tom Hochstein 2024-04-09 10:03:01 -05:00
parent e74acf9a83
commit 0a3aeaefe6
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-imx-bsp/recipes-graphics/mali/mali-imx.inc
View File

@ -21,10 +21,10 @@ INHIBIT_SYSROOT_STRIP = "1"
PACKAGES =+ " \ PACKAGES =+ " \
${PN}-libegl ${PN}-libegl-dev \ ${PN}-libegl ${PN}-libegl-dev \
${PN}-libgbm ${PN}-libgbm-dev \ ${PN}-libgbm ${PN}-libgbm-dev \
${PN}-libgles1 ${PN}-libgles1-dev \ ${PN}-libgles1 \
${PN}-libgles2 ${PN}-libgles2-dev \ ${PN}-libgles2 \
${PN}-libgles3 ${PN}-libgles3-dev \ ${PN}-libgles3 ${PN}-libgles-dev \
${PN}-libvulkan \ ${PN}-libvulkan \
${PN}-opencl-icd ${PN}-opencl-icd-dev" ${PN}-opencl-icd ${PN}-opencl-icd-dev"
# Since libmali.so is loaded by dlopen, include it in the main package # Since libmali.so is loaded by dlopen, include it in the main package
@ -57,19 +57,14 @@ FILES:${PN}-libgbm-dev = " \
${includedir}/gbm.h \ ${includedir}/gbm.h \
${libdir}/libgbm${SOLIBSDEV} \ ${libdir}/libgbm${SOLIBSDEV} \
${libdir}/pkgconfig/gbm.pc" ${libdir}/pkgconfig/gbm.pc"
FILES:${PN}-libgles1-dev = " \ FILES:${PN}-libgles-dev = " \
${includedir}/GLES \ ${includedir}/GLES* \
${libdir}/libGLESv1_CM${SOLIBSDEV} \ ${libdir}/libGLES*${SOLIBSDEV} \
${libdir}/pkgconfig/glesv1_cm.pc" ${libdir}/pkgconfig/gles*.pc"
FILES:${PN}-libgles2-dev = " \ RPROVIDES:${PN}-libgles-dev = " \
${includedir}/GLES2 \ ${PN}-libgles1-dev \
${libdir}/libGLESv2${SOLIBSDEV} \ ${PN}-libgles2-dev \
${libdir}/pkgconfig/glesv2.pc" ${PN}-libgles3-dev"
FILES:${PN}-libgles3-dev = " \
${includedir}/GLES3"
# Note: libGLESv2.so contains both GLES 2 and 3 implementations, so pull in
# GLES 3 headers manually
RDEPENDS:${PN}-libgles2-dev = "${PN}-libgles3-dev"
FILES:${PN}-opencl-icd-dev = " \ FILES:${PN}-opencl-icd-dev = " \
${bindir}/mali_clcc" ${bindir}/mali_clcc"

6
meta-imx-sdk/recipes-fsl/packagegroup/packagegroup-fsl-tools-gpu.bb
View File

@ -15,8 +15,10 @@ RDEPENDS:${PN} = " \
" "
RDEPENDS:${PN}:append:imxgpu = " ${GLES1_PACKAGE}" RDEPENDS:${PN}:append:imxgpu = " ${GLES1_PACKAGE}"
GLES1_PACKAGE = "libgles1-imx" GLES1_PACKAGE = ""
GLES1_PACKAGE:mx95-nxp-bsp = "mali-imx-libgles1 mali-imx-libgles1-dev" GLES1_PACKAGE:mx6-nxp-bsp = "libgles1-imx"
GLES1_PACKAGE:mx7-nxp-bsp = "libgles1-imx"
GLES1_PACKAGE:mx8-nxp-bsp = "libgles1-imx"
SOC_TOOLS_DRM ??= "" SOC_TOOLS_DRM ??= ""
SOC_TOOLS_DRM:imxdrm ??= " \ SOC_TOOLS_DRM:imxdrm ??= " \