* Group GPU libs based on backend * Add GPU libs to packages depending on DISTRO_FEATURES * Remove common libs * Bump PR
Signed-off-by: Adrian Alonso <[email protected]> --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index 686f244..8b92600 100644 --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -7,7 +7,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb" PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6" -INC_PR = "r2" +INC_PR = "r3" inherit fsl-eula-unpack @@ -16,13 +16,18 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ file://gc_hal_eglplatform-remove-xlib-undefs.patch \ " -PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ - libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \ - libegl-x11-mx6 libegl-x11-mx6-dev libegl-x11-mx6-dbg \ - libegl-common-mx6 libegl-common-mx6-dev libegl-common-mx6-dbg \ - libgal-fb-mx6 libgal-fb-mx6-dev libgal-fb-mx6-dbg \ +GPU_XLIBS = "libegl-x11-mx6 libegl-x11-mx6-dev libegl-x11-mx6-dbg \ libgal-x11-mx6 libgal-x11-mx6-dev libgal-x11-mx6-dbg \ - libgal-common-mx6 libgal-common-mx6-dev libgal-common-mx6-dbg \ + libvivante-x11-mx6 libvivante-x11-mx6-dev libvivante-x11-mx6-dbg \ + libvivante-dri-mx6 libvivante-dri-mx6-dev libvivante-dri-mx6-dbg \ + " + +GPU_FBLIBS = "libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \ + libgal-fb-mx6 libgal-fb-mx6-dev libgal-fb-mx6-dbg \ + libvivante-fb-mx6 libvivante-fb-mx6-dev libvivante-fb-mx6-dbg \ +" + +PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ @@ -30,12 +35,11 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ - libvivante-x11-mx6 libvivante-x11-mx6-dev libvivante-x11-mx6-dbg \ - libvivante-fb-mx6 libvivante-fb-mx6-dev libvivante-fb-mx6-dbg \ - libvivante-dri-mx6 libvivante-dri-mx6-dev libvivante-dri-mx6-dbg \ - libvivante-common-mx6 libvivante-common-mx6-dev libvivante-common-mx6-dbg \ + ${@base_contains("DISTRO_FEATURES", "x11", "${GPU_XLIBS}", "${GPU_FBLIBS}", d)} \ " +INSTALL_XLIBS = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" + # Inhibit warnings about files being stripped. INHIBIT_PACKAGE_DEBUG_SPLIT = "1" @@ -57,11 +61,19 @@ do_install () { cp ${S}/usr/lib/*.so ${D}${libdir} cp -axr ${S}/usr/include/* ${D}${includedir} - cp -axr ${S}/opt ${D} + if [ "x${INSTALL_XLIBS}" == "xyes" ]; then # Move DRI library to proper path - mv ${D}${libdir}/vivante_dri.so ${D}${libdir}/dri + mv ${D}${libdir}/vivante_dri.so ${D}${libdir}/dri + rm ${D}${libdir}/libEGL.so \ + ${D}${libdir}/libGAL.so \ + ${D}${libdir}/libVIVANTE.so \ + ${D}${libdir}/*-fb.so + cp ${D}${libdir}/libGAL-x11.so ${D}${libdir}/libGAL.so + else + rm ${D}${libdir}/*-x11.so + fi find ${D}${libdir} -type f -exec chmod 644 {} \; find ${D}${includedir} -type f -exec chmod 644 {} \; @@ -78,10 +90,6 @@ FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}" FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}" -FILES_libegl-common-mx6 = "${libdir}/libEGL${SOLIBS}" -FILES_libegl-common-mx6-dev = "${includedir}/EGL ${libdir}/libEGL${SOLIBSDEV}" -FILES_libegl-common-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}" - FILES_libegl-fb-mx6 = "${libdir}/libEGL-fb${SOLIBS}" FILES_libegl-fb-mx6-dev = "${libdir}/libEGL-fb${SOLIBSDEV}" FILES_libegl-fb-mx6-dbg = "${libdir}/.debug/libEGL-fb${SOLIBS}" @@ -90,10 +98,6 @@ FILES_libegl-x11-mx6 = "${libdir}/libEGL-x11${SOLIBS}" FILES_libegl-x11-mx6-dev = "${libdir}/libEGL-x11${SOLIBSDEV}" FILES_libegl-x11-mx6-dbg = "${libdir}/.debug/libEGL-x11${SOLIBS}" -FILES_libgal-common-mx6 = "${libdir}/libGAL${SOLIBS}" -FILES_libgal-common-mx6-dev = "${includedir}/HAL ${libdir}/libGAL${SOLIBSDEV}" -FILES_libgal-common-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}" - FILES_libgal-fb-mx6 = "${libdir}/libGAL-fb${SOLIBS}" FILES_libgal-fb-mx6-dev = "${libdir}/libGAL-fb${SOLIBSDEV}" FILES_libgal-fb-mx6-dbg = "${libdir}/.debug/libGAL-fb${SOLIBS}" @@ -130,10 +134,6 @@ FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}" FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}" FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}" -FILES_libvivante-common-mx6 = "${libdir}/libVIVANTE${SOLIBS}" -FILES_libvivante-common-mx6-dev = "${includedir}/HAL ${libdir}/libVIVANTE${SOLIBSDEV}" -FILES_libvivante-common-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}" - FILES_libvivante-fb-mx6 = "${libdir}/libVIVANTE-fb${SOLIBS}" FILES_libvivante-fb-mx6-dev = "${libdir}/libVIVANTE-fb${SOLIBSDEV}" FILES_libvivante-fb-mx6-dbg = "${libdir}/.debug/libVIVANTE-fb${SOLIBS}" -- 1.8.1 _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
