4 files changed, 11 insertions, 19 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 956b6524..ee3ac71d 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -23,9 +23,6 @@ inherit fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 
-# FIXME: Drop for GA release
-S = "${WORKDIR}/${PN}-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-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 \
@@ -133,7 +130,6 @@ do_install () {
         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 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
@@ -153,7 +149,6 @@ do_install () {
         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 ${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
@@ -175,7 +170,6 @@ do_install () {
             cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
             backend=fb
         fi
-        mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so
     fi
 
     # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p6.3-hfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p6.3-hfp.bb
deleted file mode 100644
index 60ef9c5e..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p6.3-hfp.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013-2015 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-gpu-viv.inc
-
-SRC_URI = "${FSL_MIRROR}/${PN}-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}.bin;fsl-eula=true"
-
-SRC_URI[md5sum] = "ba6b5dfd10f8d0bf8533e8ba09a741b8"
-SRC_URI[sha256sum] = "2bf62e24ca677159534b503ce247c1a8a50198db9050de1f8fe44fde7a1c786d"
-
-PACKAGE_FP_TYPE = "hardfp"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p7.1-hfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p7.1-hfp.bb
new file mode 100644
index 00000000..22f097b3
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p7.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] = "b26211f322c325e76f912f432989f2ee"
+SRC_URI[sha256sum] = "e49ca1d31ca83bb50f6672325db37ae3754eb9073ad98a37790ab1209ea5cba8"
+
+PACKAGE_FP_TYPE = "hardfp"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p6.3-sfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p7.1-sfp.bb
index 00ac015e..610f7ce8 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p6.3-sfp.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p7.1-sfp.bb
@@ -3,8 +3,8 @@
 
 require imx-gpu-viv.inc
 
-SRC_URI[md5sum] = "b2155c395de054184211fb57ccdb1dfb"
-SRC_URI[sha256sum] = "9dad9944d7d3c4dd8cba52a829625c0546df0b15324e723c61e6f3ae97da9487"
+SRC_URI[md5sum] = "5dbe194e87e4092379b195e866cdb687"
+SRC_URI[sha256sum] = "43fea6ebbb1222e0f594fff3b48147f4bb6173b85f2caa9fa6bf04a1c85ee93a"
 
 # FIXME skip the QA error for viv-samples
 INSANE_SKIP_${PN} += "rpaths"