From 1d14e213afbeaad42c8c5bb7c3a73e74d5a4c403 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 22 Jan 2013 09:17:57 -0200 Subject: gpu-viv-bin-mx6q: Upgrade to 1.1.0 This drops the DirectFB files while we do not have support for it and ensure all packages need to choose the proper backend to link to as we remove the generic link pointing to a default backend. Change-Id: I57b79675ba9e8158d5c79c3455227dac164adc35 Signed-off-by: Otavio Salvador --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 31 +++++++++++----------- .../0001-change-header-path-to-HAL.patch | 19 ++++++------- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb | 10 +++++++ .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb | 9 ------- 4 files changed, 34 insertions(+), 35 deletions(-) create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb 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 c7e3eab..8239697 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 @@ -4,7 +4,7 @@ DESCRIPTION = "GPU driver and apps for imx6" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb" +LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c831981a5cbb2673318b77fb2f07014c" PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6" INC_PR = "r2" @@ -40,6 +40,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # FIXME: The provided binary doesn't provide soname. If in future BSP # release the libraries are fixed, we can drop this hack. +REALSOLIBS := "${SOLIBS}" SOLIBS = "${SOLIBSDEV}" # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have @@ -54,16 +55,22 @@ do_install () { install -d ${D}${libdir}/dri install -d ${D}${includedir} - cp ${S}/usr/lib/*.so ${D}${libdir} - cp -axr ${S}/usr/include/* ${D}${includedir} - - cp -axr ${S}/opt ${D} - - # Move DRI library to proper path - mv ${D}${libdir}/vivante_dri.so ${D}${libdir}/dri + cp -rP ${S}/usr/lib/* ${D}${libdir} + cp -rP ${S}/usr/include/* ${D}${includedir} + cp -rP ${S}/opt ${D} find ${D}${libdir} -type f -exec chmod 644 {} \; find ${D}${includedir} -type f -exec chmod 644 {} \; + + # FIXME: Drop default library as we need to explicit link to one + # of supported backends + rm ${D}${libdir}/libEGL.so \ + ${D}${libdir}/libGAL.so \ + ${D}${libdir}/libVIVANTE.so + + # FIXME: Drop directfb backport as 1.4 version is not supported in Yocto + rm -r ${D}${libdir}/directfb-1.4-0 \ + ${D}${libdir}/*-dfb.so } S = "${WORKDIR}/${PN}-${PV}" @@ -77,9 +84,7 @@ 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}" @@ -89,9 +94,7 @@ 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}" @@ -109,7 +112,7 @@ FILES_libgles2-mx6 = "${libdir}/libGLESv2${SOLIBS}" FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" -FILES_libgl-mx6 = "${libdir}/libGL${SOLIBS}" +FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}" FILES_libgl-mx6-dev = "${includedir}/GL ${libdir}/libGL${SOLIBSDEV}" FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL${SOLIBS}" @@ -129,9 +132,7 @@ 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}" diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch index 31fad1e..dc91d7c 100644 --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch @@ -15,19 +15,16 @@ Signed-off-by: Jeremy Stashluk usr/include/gc_vdk_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/usr/include/gc_vdk_types.h b/usr/include/gc_vdk_types.h -index 11514f9..8e3dfe4 100644 ---- a/usr/include/gc_vdk_types.h -+++ b/usr/include/gc_vdk_types.h -@@ -26,7 +26,7 @@ extern "C" { +Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +=================================================================== +--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +@@ -39,7 +39,7 @@ extern "C" { #endif #include --#include "gc_hal_eglplatform.h" -+#include +-#include "gc_hal_eglplatform_type.h" ++#include + /******************************************************************************* - ** vdkPrivate. ***************************************************************** --- -1.7.9.5 - diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb new file mode 100644 index 0000000..3de9555 --- /dev/null +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2012 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +PR = "${INC_PR}.0" +PE = "1" + +include gpu-viv-bin-mx6q.inc + +SRC_URI[md5sum] = "60f4ba65f557fc63fde6dacfeef205a8" +SRC_URI[sha256sum] = "4238b72a6dad2d075d159bb1e86fb68bbed7c27894ce82c546a8e7c58ae5d683" diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb deleted file mode 100644 index c54ad19..0000000 --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2012 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) - -PR = "${INC_PR}.0" - -include gpu-viv-bin-mx6q.inc - -SRC_URI[md5sum] = "9f2c43b6eae468df6cc6fd75efd00bc5" -SRC_URI[sha256sum] = "2cec10c1d69bce75a7c2a4482eb3ed29b171578c3b01c5b4ef2cc868ca327330" -- cgit v1.2.3-54-g00ecf