From 8f283332901650c780c97d3f5ed6ca0321a135e1 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 6 Feb 2024 15:50:04 -0600 Subject: imx-gpu-viv: Normalize packaging There are no behavioral changes here, just a cleanup to make packaging lines consistent. Note that SOLIBS and SOLIBSDEV are set the same as ".so", but the former is used for main packages and the latter for -dev packages. Also, drop ${libdir}/libGLESv1*${SOLIBS} from FILES:libgles1-imx-dev. The rule has no effect since it is also included, correctly, in the main package FILES:libgles1-imx. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 52802e29d..534c147a2 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -335,10 +335,10 @@ ALLOW_EMPTY:${PN} = "1" FILES:libclc-imx = "${libdir}/libCLC${SOLIBS}" +FILES:libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBS} " +FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" # libEGL.so is used by some demo apps from Freescale INSANE_SKIP:libegl-imx += "dev-so" -FILES:libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " -FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" FILES:libgal-imx-dev = "${includedir}/HAL" @@ -349,7 +349,7 @@ INSANE_SKIP:libgal-imx += "build-deps" FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}" -FILES:libgbm-imx = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" +FILES:libgbm-imx = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}" FILES:libgbm-imx-dev = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" RDEPENDS:libgbm-imx:append = " libdrm" INSANE_SKIP:libgbm-imx += "dev-so" @@ -377,25 +377,25 @@ OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev" INSANE_SKIP:libopenvx-imx += "dev-deps" +FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS}" +FILES:libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL ${libdir}/pkgconfig/gl.pc" # libGL is only targeting X11 backend, and in case if Wayland-only is used - # package QA complains on missing RDEPENDS, which are only available for X11. # Skip "file-rdeps" QA for this package. -FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS}" -FILES:libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL ${libdir}/pkgconfig/gl.pc" INSANE_SKIP:libgl-imx += "file-rdeps" -# libEGL needs to open libGLESv1.so -INSANE_SKIP:libgles1-imx += "dev-so" FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" -FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/pkgconfig/glesv1_cm.pc" +FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc" RPROVIDES:libgles1-imx = "libgles-imx" RPROVIDES:libgles1-imx-dev = "libgles-imx-dev" +# libEGL does dlopen of libGLESv1.so +INSANE_SKIP:libgles1-imx += "dev-so" -# libEGL needs to open libGLESv2.so -INSANE_SKIP:libgles2-imx += "dev-so" FILES:libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" FILES:libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" RDEPENDS:libgles2-imx = "libglslc-imx" +# libEGL does dlopen of libGLESv2.so +INSANE_SKIP:libgles2-imx += "dev-so" FILES:libgles3-imx-dev = "${includedir}/GLES3" # as long as there is no libgles3: ship libgles3-dev along with -- cgit v1.2.3-54-g00ecf