[meta-freescale] [meta-fsl-demos][PATCH V2 2/2] fsl-gpu-sdk: Upgrade to 2.2.1 version

[Neena Busireddy]

This version is released with 3.14.52-1.1.0_ga release

- Supports: OpenGL ES2, OpenGL ES3, OpenVG and experimental G2D support
- Do not install VPU packages on processors with no VPU(i.MX6SX)

Signed-off-by: Neena Busireddy <neenareddy.busireddy at nxp.com>
---
 ...001-update-gstreamer1.0-include-directory.patch | 22 ++++++++++++++++++++++
 .../{fsl-gpu-sdk_2.1.bb => fsl-gpu-sdk_2.2.1.bb}   | 21 +++++++++++++++------
 2 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk/0001-update-gstreamer1.0-include-directory.patch
 rename recipes-graphics/fsl-gpu-sdk/{fsl-gpu-sdk_2.1.bb => fsl-gpu-sdk_2.2.1.bb} (66%)

diff --git a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk/0001-update-gstreamer1.0-include-directory.patch b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk/0001-update-gstreamer1.0-include-directory.patch
new file mode 100644
index 0000000..d5edaa6
--- /dev/null
+++ b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk/0001-update-gstreamer1.0-include-directory.patch
@@ -0,0 +1,22 @@
+diff -ruN a/DemoApps/GLES2/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto b/DemoApps/GLES2/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto
+--- a/DemoApps/GLES2/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto	2015-10-24 02:49:55.000000000 +0800
++++ b/DemoApps/GLES2/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto	2015-11-09 13:26:27.369099790 +0800
+@@ -31,6 +31,7 @@
+   $(FSL_GRAPHICS_SDK)/DemoFramework/FslGraphicsGLES2/include \
+   $(PKG_CONFIG_SYSROOT_DIR)/usr/include/glib-2.0 \
+   $(PKG_CONFIG_SYSROOT_DIR)/usr/include/gstreamer-1.0 \
++  $(PKG_CONFIG_SYSROOT_DIR)/usr/lib/gstreamer-1.0/include \
+   $(PKG_CONFIG_SYSROOT_DIR)/usr/lib/glib-2.0/include
+
+ CPP_DEFINE_FLAG_NAMES=\
+diff -ruN a/DemoApps/GLES3/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto b/DemoApps/GLES3/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto
+--- a/DemoApps/GLES3/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto	2015-10-24 02:49:55.000000000 +0800
++++ b/DemoApps/GLES3/DirectMultiSamplingVideoYUV/GNUmakefile_Yocto	2015-11-09 13:26:27.393099789 +0800
+@@ -31,6 +31,7 @@
+   $(FSL_GRAPHICS_SDK)/DemoFramework/FslGraphicsGLES3/include \
+   $(PKG_CONFIG_SYSROOT_DIR)/usr/include/glib-2.0 \
+   $(PKG_CONFIG_SYSROOT_DIR)/usr/include/gstreamer-1.0 \
++  $(PKG_CONFIG_SYSROOT_DIR)/usr/lib/gstreamer-1.0/include \
+   $(PKG_CONFIG_SYSROOT_DIR)/usr/lib/glib-2.0/include
+
+ CPP_DEFINE_FLAG_NAMES=\
diff --git a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.2.1.bb
similarity index 66%
rename from recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb
rename to recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.2.1.bb
index 01d2103..459ad34 100644
--- a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb
+++ b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.2.1.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Freescale GPU SDK Samples"
 DESCRIPTION = "Set of sample applications for Freescale GPU"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=01ba08a2b77c3a0a9d0ab5d4d83fed64"
-DEPENDS = "${X11_DEPENDS} ${WL_DEPENDS}"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9"
+DEPENDS = "${X11_DEPENDS} ${WL_DEPENDS} devil gstreamer1.0 gstreamer1.0-plugins-base"
 DEPENDS_append_mx6q = " virtual/libgles2"
 DEPENDS_append_mx6dl = " virtual/libgles2"
 DEPENDS_append_mx6sx = " virtual/libgles2"
@@ -17,13 +17,18 @@ RPROVIDES_${PN} = "vivante-gpu-sdk"
 RREPLACES_${PN} = "vivante-gpu-sdk"
 RCONFLICTS_${PN} = "vivante-gpu-sdk"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+           file://0001-update-gstreamer1.0-include-directory.patch"
 
-SRC_URI[md5sum] = "8f656b8a3a7b7390f434ec1cebf66334"
-SRC_URI[sha256sum] = "eccfd6f412c256e92e61d811cbe607e77bdfd13e268f4840b819e32dcd92921e"
+SRC_URI[md5sum] = "92575bc028cea9ac7a3c2a05f7848926"
+SRC_URI[sha256sum] = "c57103cbfaf74abec795130c7ea6ce9801f8cfd5c08832498d0a1ec21f178ebc"
 
 BACKEND = "${@base_contains('DISTRO_FEATURES', 'x11', 'X11', \
                     base_contains('DISTRO_FEATURES', 'wayland', 'Wayland', 'FB', d), d)}"
+
+HAS_VPU = "1"
+HAS_VPU_mx6sx = "0"
+
 do_compile () {
     export FSL_GRAPHICS_SDK=${S}
     export FSL_PLATFORM_NAME=Yocto
@@ -37,12 +42,16 @@ do_install () {
     install -d "${D}/opt/${PN}"
     ./build.sh -f  GNUmakefile_Yocto EGLBackend=${BACKEND} install 
     cp -r bin/* "${D}/opt/${PN}"
+    if [ "${HAS_VPU}" = "0" ]; then
+        rm -rf ${D}/opt/${PN}/GLES2/DirectMultiSamplingVideoYUV
+        rm -rf ${D}/opt/${PN}/GLES3/DirectMultiSamplingVideoYUV
+    fi
     rm -rf ${D}/opt/${PN}/GLES2/S05_PrecompiledShader
     rm -rf ${D}/opt/${PN}/GLES3/S05_PrecompiledShader
 }
 
 FILES_${PN} += "/opt/${PN}"
 FILES_${PN}-dbg += "/opt/${PN}/*/*/.debug /usr/src/debug"
-INSANE_SKIP_${PN} += "rpaths"
+INSANE_SKIP_${PN} += "already-stripped rpaths"
 
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.9.1