[meta-freescale] [meta-fsl-arm][PATCH 4/5] libfslvpuwrap: Upgrade from version 1.0.46 to 1.0.54

[Zidan Wang]

From: Wang Zidan <b50113 at freescale.com>

- Remove the IOVirtmem patch as it is part of the 3.10.31 release.
- Include some bug fix.
- Add support for mx6s.

Signed-off-by: Wang Zidan <b50113 at freescale.com>
---
 ...-fix-tests-of-return-value-from-IOGetVirt.patch |   41 --------------------
 ...slvpuwrap_1.0.46.bb => libfslvpuwrap_1.0.54.bb} |    8 ++--
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
 rename recipes-multimedia/libfslvpuwrap/{libfslvpuwrap_1.0.46.bb => libfslvpuwrap_1.0.54.bb} (66%)

diff --git a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
deleted file mode 100644
index ccd2d9e..0000000
--- a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7ca66c10c05168c7d342df7c7a70d4a1ae0629f7 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <eric.nelson at boundarydevices.com>
-Date: Sat, 28 Jun 2014 09:45:09 -0700
-Subject: [PATCH] vpu_wrapper: fix tests of return value from IOGetVirtMem
-
-IOGetVirtMem() returns a pointer or specifically -1 (MAP_FAILED)
-in the case of failure.
-
-Upstream-Status: Pending
-
-Signed-off-by: Laci Tele <laci at boundarydevices.com>
-Signed-off-by: Eric Nelson <eric.nelson at boundarydevices.com>
----
- vpu_wrapper.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vpu_wrapper.c b/vpu_wrapper.c
-index 9249174..148c5df 100755
---- a/vpu_wrapper.c
-+++ b/vpu_wrapper.c
-@@ -6653,7 +6653,7 @@ VpuDecRetCode VPU_DecGetMem(VpuMemDesc* pInOutMem)
- 		return VPU_DEC_RET_FAILURE;
- 	}
- 	ret=IOGetVirtMem(&buff);
--	if(ret==0) //if(ret!=RETCODE_SUCCESS)
-+	if(ret == -1) //if(ret==MAP_FAILED)
- 	{
- 		VPU_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,ret);
- 		return VPU_DEC_RET_FAILURE;
-@@ -8277,7 +8277,7 @@ VpuEncRetCode VPU_EncGetMem(VpuMemDesc* pInOutMem)
- 		return VPU_ENC_RET_FAILURE;
- 	}
- 	ret=IOGetVirtMem(&buff);
--	if(ret==0) //if(ret!=RETCODE_SUCCESS)
-+	if(ret == -1) //if(ret==MAP_FAILED)
- 	{
- 		VPU_ENC_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,(UINT32)ret);
- 		return VPU_ENC_RET_FAILURE;
--- 
-1.9.1
-
diff --git a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.54.bb
similarity index 66%
rename from recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb
rename to recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.54.bb
index 8cc1523..63350e6 100644
--- a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb
+++ b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.54.bb
@@ -7,10 +7,10 @@ SECTION = "multimedia"
 LIC_FILES_CHKSUM = "file://EULA.txt;md5=93b784b1c11b3fffb1638498a8dde3f6"
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "1f50110cb6de8ebf767fb9c5f8baf20d"
-SRC_URI[sha256sum] = "7fc1258de338339d19a1a35167393fdc4d773682dfd9b951b197403a075f85fd"
+S = "${WORKDIR}/${PN}-${PV}"
 
-SRC_URI_append = " file://0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch"
+SRC_URI[md5sum] = "b07a2d4e7bf44225353106ed209f6dac"
+SRC_URI[sha256sum] = "eef2cc0c65d96d3a0f75d7134eef8ef0099ece2502d093fc13739edcb343e1dd"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
@@ -20,4 +20,4 @@ do_install_append() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6q|mx6dl)"
+COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6s)"
-- 
1.7.9.5