imx-gpu-viv: Upgrade to 3.10.53-1.1.0 GA release

- Graphics recipe is renamed from gpu-viv-bin-mx6q to imx-gpu-viv
- Recipe version is changed to use Vivante version
- gpu-viv-g2d shares same package with imx-gpu-viv
- imx-gpu-viv includes separate sub packages for demos and tools
  to support flexible package additions
- Graphics package is reorganized to improve library layout
- New GPU tool apitrace is added - supported only for X11 backend

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

27 files changed, 100 insertions, 279 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 21e4738..2d07778 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -93,19 +93,20 @@ PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 
 # mx6 GPU libraries
-PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/egl_mx6 ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
 
 PREFERRED_PROVIDER_virtual/kernel_mx3 ?= "linux-fslc"
 
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/Vivante.icd b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/Vivante.icd
deleted file mode 100644
index 52c240c..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/Vivante.icd
+++ /dev/null
@@ -1 +0,0 @@
-libVivanteOpenCL.so
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/directfbrc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/directfbrc
deleted file mode 100644
index bae398c..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/directfbrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# directfbrc begin
-system=fbdev
-mode=1024x768           # display size (change to fit your needs)
-desktop-buffer-mode=frontonly           # if no double buffering in framebuffer driver
-depth=16
-pixelformat=RGB16
-#no-hardware            # disable hardware acceleration
-#no-software            # disable software fallbacks
-# directfbrc end
-
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
deleted file mode 100644
index a21922d..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.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
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
deleted file mode 100644
index 5921583..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.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: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
deleted file mode 100644
index f4610ea..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: gc_wayland_protocol
-Description: Vivante Wayland Protocol Extension Library
-Version: 0.1
-Cflags: -I${includedir}
-Libs: -L${libdir} -lgc_wayland_protocol
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
deleted file mode 100644
index 994b5d9..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv1_cm
-Description: Vivante OpenGL ES 1.1 CM library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL -lGAL_egl
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
deleted file mode 100644
index c59c079..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv1_cm
-Description: Vivante OpenGL ES 1.1 CM library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL -lGAL_egl
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
deleted file mode 100644
index 8c9fdd7..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv2
-Description: Vivante OpenGL ES 2.0 library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lGLESv2 -lEGL -lGAL -lGAL_egl
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
deleted file mode 100644
index 57ad807..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv2
-Description: Vivante OpenGL ES 2.0 library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
deleted file mode 100644
index 7c00def..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: vg
-Description: Vivante OpenVG 1.1 library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lOpenVG -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
deleted file mode 100644
index 94fb91e..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: vg
-Description: Vivante OpenVG 1.1 library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lOpenVG -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
deleted file mode 100644
index ba1b898..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: wayland-egl
-Description: Bind the driver EGL to the Wayland API
-Version: 1.0.0
-Libs: -L${libdir} -lEGL
-Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
deleted file mode 100644
index 3fdedd0..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Wayland Vivante Lib
-Description: Wayland server side library for Vivante's EGL driver
-Version: 0.1
-Cflags: -I${includedir}/wayland-viv
-Libs: -L${libdir} -lwayland-viv
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb
deleted file mode 100644
index 8e50934..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require gpu-viv-bin-mx6q.inc
-
-SRC_URI[md5sum] = "8aa5c16021ce38762e7e3c07a57146eb"
-SRC_URI[sha256sum] = "c132de60b28c73e8d6ea12219151ca9a0a0bb4f73d62ca1bdd0feac6db0d964e"
-
-PACKAGE_FP_TYPE = "hardfp"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb
deleted file mode 100644
index fed2f8e..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require gpu-viv-bin-mx6q.inc
-
-SRC_URI[md5sum] = "8e8719c2e135c2524817a62002eec0e1"
-SRC_URI[sha256sum] = "fd85593186f6b66a26e538edf6279034741a96d2f4ceb6108deb2fa5c35c962d"
-
-# FIXME skip the QA error for viv-samples
-INSANE_SKIP_${PN} += "rpaths"
-
-PACKAGE_FP_TYPE = "softfp"
diff --git a/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc b/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
deleted file mode 100644
index 09ad7c9..0000000
--- a/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-
-DESCRIPTION = "GPU Vivante G2D library and sample applications for imx6"
-SECTION = "libs"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://usr/include/g2d.h;endline=7;md5=53b61e015f8e1c386057c5ba8b081d53"
-
-PROVIDES += "virtual/libg2d"
-
-PACKAGES = "${PN} ${PN}-dev ${PN}-dbg"
-
-inherit fsl-eula-unpack
-
-PE = "1"
-
-# FIXME: Drop 'beta' suffix for GA release
-SRC_URI = "${FSL_MIRROR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}.bin;fsl-eula=true"
-S = "${WORKDIR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}"
-
-PACKAGES += "libg2d"
-
-# Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-
-    cp ${S}/usr/lib/*.so ${D}${libdir}
-    cp -Pr ${S}/usr/include/* ${D}${includedir}
-    cp -Pr ${S}/opt ${D}
-
-    find ${D}${libdir} -type f -exec chmod 644 {} \;
-    find ${D}${includedir} -type f -exec chmod 644 {} \;
-}
-
-# 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}"
-
-FILES_${PN} = "/opt"
-FILES_libg2d =  "${libdir}/libg2d-viv${SOLIBS} ${libdir}/libg2d${SOLIBS}"
-FILES_${PN}-dev = "${includedir}"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.31-1.1.0.bb b/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.31-1.1.0.bb
deleted file mode 100644
index 14e059a..0000000
--- a/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.31-1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-
-include gpu-viv-g2d.inc
-
-SRC_URI[md5sum] = "0e19e7ff3d8a98aa8fd58bd03a633723"
-SRC_URI[sha256sum] = "6957fb7ab86858c008c531fb620a30cf8d7f7734999a34852534920bc36a365a"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index df3af1b..020250e 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -1,17 +1,17 @@
-# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2015 Freescale Semiconductor
 # Copyright (C) 2012-2014 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "GPU driver and apps for imx6"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c4713c78d7f52bf2f92688a6f8f0cc93"
+LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;endline=11;md5=c4713c78d7f52bf2f92688a6f8f0cc93"
 
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
                              base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \
                                            '', d), d)}"
 
-PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg"
+PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d"
 PROVIDES_append_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
 PROVIDES_append_mx6dl  = " virtual/libgl virtual/libgles1 virtual/libgles2"
 PROVIDES_append_mx6sx  = " virtual/libgl virtual/libgles1 virtual/libgles2"
@@ -19,31 +19,17 @@ PROVIDES_append_mx6sx  = " virtual/libgl virtual/libgles1 virtual/libgles2"
 PE = "1"
 
 inherit fsl-eula-unpack
-# FIXME: Drop 'beta' suffix for GA release
-SRC_URI = "${FSL_MIRROR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}.bin;fsl-eula=true \
-           file://egl.pc \
-           file://egl_x11.pc \
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
            file://egl_linuxfb.pc \
            file://egl_directfb.pc \
            file://egl_wayland.pc \
-           file://glesv1_cm.pc \
-           file://glesv1_cm_x11.pc \
-           file://glesv2.pc \
-           file://glesv2_x11.pc \
-           file://vg.pc \
-           file://vg_x11.pc \
-           file://gc_wayland_protocol.pc \
-           file://wayland-egl.pc \
-           file://wayland-viv.pc \
-           file://directfbrc \
-           file://Vivante.icd \
           "
-S = "${WORKDIR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}"
-
 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 \
         libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
+        libgles3-mx6-dev \
         libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
         libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \
         libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \
@@ -57,6 +43,10 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
         libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-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-demos imx-gpu-viv-demos-dbg \
 "
 
 # Skip package if it does not match the machine float-point type in use
@@ -119,51 +109,58 @@ IS_MX6SL_mx6sl = "1"
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
+    install -d ${D}${bindir}
 
-    cp -P ${S}/usr/lib/*.so* ${D}${libdir}
-    cp -r ${S}/usr/include/* ${D}${includedir}
-    cp -r ${S}/opt ${D}
+    cp -P ${S}/gpu-core/usr/lib/*.so* ${D}${libdir}
+    cp  ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -r ${S}/gpu-core/usr/include/* ${D}${includedir}
+    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}/usr/lib/dri ${D}${libdir}
+        cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
+
         backend=x11
 
-        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
         mv ${D}${libdir}/libGAL_egl.dri.so ${D}${libdir}/libGAL_egl.so
         #FIXME: WL & X11 is not currently functional
         #if [ "${USE_WL}" = "yes" ]; then
-        #    install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
-        #    install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
-        #    install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
+        #    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
+        #    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
+        #    install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
         #fi
     elif [ "${USE_WL}" = "yes" ]; then
         backend=wl
 
         install -m 0644 ${WORKDIR}/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
-        install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
-        install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
-        install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.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
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
+        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
         mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so
     else
-        install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.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
 
         if [ "${USE_DFB}" = "yes" ]; then
             install -d ${D}/${sysconfdir}
-            install -m 644 ${WORKDIR}/directfbrc ${D}/${sysconfdir}/directfbrc
+            install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc
             install -m 0644 ${WORKDIR}/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc
 
-            cp -r ${S}/usr/lib/directfb-* ${D}${libdir}
+            cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir}
             backend=dfb
         else
             # Regular framebuffer
@@ -175,7 +172,7 @@ do_install () {
 
     # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
     install -d ${D}${sysconfdir}/OpenCL/vendors/
-    install -m 0644 ${WORKDIR}/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
+    install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
 
     # We'll only have one backend here so we rename it to generic name
     # and avoid rework in other packages, when possible
@@ -191,7 +188,7 @@ do_install () {
 
     # update libglesv2 as backend dependent
     rm -rf ${D}${libdir}/libGLESv2*
-    cp ${S}/usr/lib/libGLESv2-${backend}.so ${D}${libdir}/libGLESv2.so.2.0.0
+    cp ${S}/gpu-core/usr/lib/libGLESv2-${backend}.so ${D}${libdir}/libGLESv2.so.2.0.0
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
 
@@ -224,7 +221,7 @@ do_install () {
                \
                ${D}${libdir}/libGLES* \
                \
-               ${D}${libdir}/libOpenCL* \
+               ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \
                \
                ${D}${libdir}/libOpenVG.so ${D}${libdir}/libOpenVG.3d.so \
                \
@@ -240,11 +237,6 @@ do_install () {
     find ${D}${includedir} -type f -exec chmod 644 {} \;
 }
 
-FILES_${PN} += "/opt"
-FILES_${PN}-dev = "${includedir}"
-FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug"
-INSANE_SKIP_${PN} += "rpaths"
-
 FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
 FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
 FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
@@ -254,8 +246,6 @@ INSANE_SKIP_libegl-mx6 += "dev-so"
 FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
 FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
 FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
-# Includes GL headers from mesa
-RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev"
 
 FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
 FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
@@ -266,10 +256,13 @@ FILES_libvsc-mx6 = "${libdir}/libVSC${SOLIBS}"
 FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
 FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}"
 FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
+RDEPENDS_libgl-mx6 = "libglapi"
+# Includes GL headers from mesa
+RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev"
 
 # libEGL needs to open libGLESv1.so
 INSANE_SKIP_libgles-mx6 += "dev-so"
-FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS}"
+FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
 FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
 FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
 
@@ -280,6 +273,8 @@ FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${
 FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
 RDEPENDS_libgles2-mx6 = "libglslc-mx6"
 
+FILES_libgles3-mx6-dev = "${includedir}/GLES3"
+
 FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}"
 FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
 FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}"
@@ -297,7 +292,7 @@ FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${l
 FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
 
 FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
-FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
+FILES_libvdk-mx6-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}"
 FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
 
 FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
@@ -311,7 +306,7 @@ FILES_libvivante-dfb-mx6 = "${libdir}/directfb-*/gfxdrivers/libdirectfb_gal.so"
 
 INSANE_SKIP_libwayland-viv-mx6 += "dev-so"
 FILES_libwayland-viv-mx6 =  "${libdir}/libwayland-viv${REALSOLIBS}  ${libdir}/libwayland-viv${SOLIBS}"
-FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
+FILES_libwayland-viv-mx6-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
 FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}"
 
 INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so"
@@ -323,4 +318,19 @@ FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc"
 
 FILES_libvivante-dfb-mx6 += "${sysconfdir}/directfbrc"
 
+INSANE_SKIP_imx-gpu-viv-g2d += "dev-so"
+FILES_imx-gpu-viv-g2d = "${libdir}/libg2d* "
+FILES_imx-gpu-viv-g2d-dev = "${includedir}/g2d.h"
+FILES_imx-gpu-viv-g2d-dbg = "${libdir}/.debug/libg2d${SOLIBS}"
+
+FILES_imx-gpu-viv-tools = "${bindir}/gmem_info"
+FILES_imx-gpu-viv-tools-dbg = "${bindir}/gmem_info"
+
+FILES_imx-gpu-viv-tools-apitrace = "${bindir} ${libdir}"
+FILES_imx-gpu-viv-tools-apitrace-dbg = "${libdir}/*/*/.debug"
+
+FILES_imx-gpu-viv-demos = "/opt"
+FILES_imx-gpu-viv-demos-dbg = "/opt/viv_samples/*/*/.debug"
+INSANE_SKIP_imx-gpu-viv-demos += "rpaths"
+
 COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_directfb.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
index ff99007..ff99007 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_directfb.pc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_linuxfb.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
index 8c2c8c6..8c2c8c6 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_linuxfb.pc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_wayland.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
index 25bbea8..25bbea8 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_wayland.pc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb
new file mode 100644
index 0000000..c85e415
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb
@@ -0,0 +1,9 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-gpu-viv.inc
+
+SRC_URI[md5sum] = "dd2093e6ec951fe843a2944af307d721"
+SRC_URI[sha256sum] = "6c436ea127bc1423fbe092ee5eaa3a8513647dfe2aff79f446fa8d6b4d00bcac"
+
+PACKAGE_FP_TYPE = "hardfp"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb
new file mode 100644
index 0000000..5f78d64
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb
@@ -0,0 +1,12 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-gpu-viv.inc
+
+SRC_URI[md5sum] = "386b66e25abfb962f8eaf54fa85e7c18"
+SRC_URI[sha256sum] = "08349e3e6f23287f03e3a896c16938acc9cff44a1f6d624b23f7d348e09ab1ac"
+
+# FIXME skip the QA error for viv-samples
+INSANE_SKIP_${PN} += "rpaths"
+
+PACKAGE_FP_TYPE = "softfp"
diff --git a/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend b/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend
index 44a4b92..ab89cc8 100644
--- a/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend
+++ b/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend
@@ -2,7 +2,7 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q"
+DEPENDS_append_mx6 = " gst-fsl-plugin imx-gpu-viv"
 
 SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch"
 
diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.2.bb b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.2.bb
index 9ca8f4f..0fb6698 100644
--- a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.2.bb
+++ b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.2.bb
@@ -22,7 +22,7 @@ PACKAGECONFIG[aacp] += ",,libfslaacpcodec,libfslaacpcodec"
 MSDEPENDS = "libfslmsparser libfslmscodec"
 PACKAGECONFIG[wma10dec] += ",,${MSDEPENDS},${MSDEPENDS}"
 PACKAGECONFIG[wma8enc] += "--enable-wma8enc,--disable-wma8enc,${MSDEPENDS},${MSDEPENDS}"
-PACKAGECONFIG[overlaysink] += "--enable-overlaysink,--disable-overlaysink,gpu-viv-g2d"
+PACKAGECONFIG[overlaysink] += "--enable-overlaysink,--disable-overlaysink,imx-gpu-viv"
 
 FILES_${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}"
 FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.10.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.10.0.bb
index 26d2eee..c171474 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.10.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.10.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GStreamer 1.0 plugins for i.MX platforms"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
 SECTION = "multimedia"
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gpu-viv-g2d libfslcodec libfslvpuwrap virtual/kernel virtual/egl \
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base imx-gpu-viv libfslcodec libfslvpuwrap virtual/kernel virtual/egl \
            virtual/libgles2 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
 
 SRCBRANCH ?= "master"