imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release

Remove pc files now they are part of imx-gpu-viv package
Fix api trace installation

Change-Id: I95b35b73a249b3e80b7437f3d516e19bc3e1242c
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

6 files changed, 21 insertions, 61 deletions

diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 5cd00face..ea19292d8 100644
--- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -5,7 +5,7 @@
 DESCRIPTION = "GPU driver and apps for imx6"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;endline=11;md5=c4713c78d7f52bf2f92688a6f8f0cc93"
+LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;md5=12c028cbbbedb4b8770267131500592c"
 
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
                              base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \
@@ -20,11 +20,8 @@ PE = "1"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
-           file://egl_linuxfb.pc \
-           file://egl_directfb.pc \
-           file://egl_wayland.pc \
-          "
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
 PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
         libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
         libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
@@ -44,8 +41,8 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
         libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \
         libwayland-egl-mx6-dev \
         imx-gpu-viv-g2d imx-gpu-viv-g2d-dev imx-gpu-viv-g2d-dbg \
-        imx-gpu-viv-tools imx-gpu-viv-tools-dbg\
-        imx-gpu-viv-tools-apitrace imx-gpu-viv-tools-apitrace-dbg\
+        imx-gpu-viv-tools imx-gpu-viv-tools-dbg \
+        imx-gpu-viv-tools-apitrace imx-gpu-viv-tools-apitrace-dbg \
         imx-gpu-viv-demos imx-gpu-viv-demos-dbg \
 "
 
@@ -117,14 +114,14 @@ do_install () {
     cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
     cp -r ${S}/gpu-demos/opt ${D}
     cp -axr ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir}
-    cp -axr ${S}/apitrace/usr/lib/* ${D}${libdir}
-    cp -axr ${S}/apitrace/usr/bin/* ${D}${bindir}
 
     install -d ${D}${libdir}/pkgconfig
 
     # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
     if [ "${USE_X11}" = "yes" ]; then
         cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
+        cp -axr ${S}/apitrace/x11/usr/lib/* ${D}${libdir}
+        cp -axr ${S}/apitrace/x11/usr/bin/* ${D}${bindir}
 
         backend=x11
 
@@ -140,9 +137,12 @@ do_install () {
         #    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
         #fi
     elif [ "${USE_WL}" = "yes" ]; then
+        cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
+        cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
+
         backend=wl
 
-        install -m 0644 ${WORKDIR}/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
@@ -158,13 +158,17 @@ do_install () {
         if [ "${USE_DFB}" = "yes" ]; then
             install -d ${D}/${sysconfdir}
             install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc
-            install -m 0644 ${WORKDIR}/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc
+            install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc
 
             cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir}
+            cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
+            cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
             backend=dfb
         else
             # Regular framebuffer
-            install -m 0644 ${WORKDIR}/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
+            install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
+            cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
+            cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
             backend=fb
         fi
         mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so
@@ -202,12 +206,6 @@ do_install () {
         rm ${D}${libdir}/libGL.*
     fi
 
-    # skip packaging X11 specific tools if no X11 support is requested
-    if [ "${USE_X11}" = "no" ]; then
-        rm ${D}${bindir}/glretrace
-        rm ${D}${bindir}/eglretrace
-    fi
-
     # skip packaging wayland libraries if no support is requested
     if [ "${USE_WL}" = "no" ]; then
         rm ${D}${libdir}/libgc_wayland_protocol.*
diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
deleted file mode 100644
index ff99007b0..000000000
--- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX -DEGL_API_DFB
diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
deleted file mode 100644
index 8c2c8c653..000000000
--- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX -DEGL_API_FB
-
diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
deleted file mode 100644
index 25bbea856..000000000
--- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM
-
diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb
index c85e4150e..7499e3547 100644
--- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb
+++ b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb
@@ -3,7 +3,7 @@
 
 require imx-gpu-viv.inc
 
-SRC_URI[md5sum] = "dd2093e6ec951fe843a2944af307d721"
-SRC_URI[sha256sum] = "6c436ea127bc1423fbe092ee5eaa3a8513647dfe2aff79f446fa8d6b4d00bcac"
+SRC_URI[md5sum] = "5aa3dfe5b9362f9ee53615e0a56f9009"
+SRC_URI[sha256sum] = "92654c185835e139cc9485806ad184fdac21f4d640ec9d0e493669235d21de9b"
 
 PACKAGE_FP_TYPE = "hardfp"
diff --git a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb
index 5f78d64d1..7a7804848 100644
--- a/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb
+++ b/meta-fsl-arm/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb
@@ -3,8 +3,8 @@
 
 require imx-gpu-viv.inc
 
-SRC_URI[md5sum] = "386b66e25abfb962f8eaf54fa85e7c18"
-SRC_URI[sha256sum] = "08349e3e6f23287f03e3a896c16938acc9cff44a1f6d624b23f7d348e09ab1ac"
+SRC_URI[md5sum] = "201398ab011b8765755fafb898efa77d"
+SRC_URI[sha256sum] = "8eef5414ec9121b38e2e44b3b64705b11f6f5d4503b90c05c31e3990c6ca3999"
 
 # FIXME skip the QA error for viv-samples
 INSANE_SKIP_${PN} += "rpaths"