gpu-viv-bin-mx6q: Update to 3.0.35-4.0.0 BSP release

This includes a new libgl-mx6 package, besides the 3.0.35-4.0.0
release includes the GL library (without the headers) so we needed to
avoid the headers removal done before. The Wayland backend needs to be
removed as it will be supported in another GPU package so we added an
explicit FIXME note to keep it recorded.

Change-Id: I07f926b94f7dd31ce51dc03f676adc6d2a080b88
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 24 insertions, 16 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 97cebfd..cc82b45 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
@@ -5,7 +5,7 @@
 DESCRIPTION = "GPU driver and apps for imx6"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c831981a5cbb2673318b77fb2f07014c"
+LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
 PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2"
 
 INC_PR = "r5"
@@ -19,6 +19,7 @@ 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 \
         libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
         libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
@@ -56,9 +57,13 @@ do_install () {
 
     cp ${S}/usr/lib/*.so ${D}${libdir}
     cp -axr ${S}/usr/include/* ${D}${includedir}
-    rm -r ${D}${includedir}/GL
     cp -axr ${S}/opt ${D}
 
+    # FIXME: Remove Wayland contents
+    rm -r ${D}${includedir}/wayland-viv
+    find ${D}${libdir} -name '*-wl.so' -exec rm '{}' ';'
+    rm ${D}${libdir}/*wayland*.so
+
     if [ "${USE_X11}" = "yes" ]; then
         cp -r ${S}/usr/lib/dri ${D}${libdir}
         find ${D}${libdir} -name '*-dfb.so' -exec rm '{}' ';'
@@ -114,6 +119,9 @@ FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
 FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}"
 FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
 
+FILES_libgl-mx6 = "${libdir}/libGL${SOLIBS}"
+FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
+
 FILES_libgles-mx6 = "${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
 FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV}"
 FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
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
deleted file mode 100644
index 994c11c..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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"
-
-# FIXME: 1.1.0 BSP release uses DirectFB 1.4 and Yocto has 1.6 so
-# disable it for now
-USE_DFB = "no"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb
new file mode 100644
index 0000000..47390cf
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2012-2013 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] = "2bb7d2f4bdff79ae99ce0c9fc2540701"
+SRC_URI[sha256sum] = "48d04d11c6fec11411bcd97c47199caea517ebcd86db6c70f1964b3358a68924"
+
+# FIXME: 3.0.35-4.0.0 BSP release uses DirectFB 1.4 and Yocto has 1.6 so
+# disable it for now
+USE_DFB = "no"