Merge pull request #1169 from CrawX/3.14.28ga

alarm/{firmware-imx,imx-vpu,libfslvpuwrap} update to 3.14.28-ga release

alarm/firmware-imx/PKGBUILD

@@ -3,7 +3,7 @@
 
 buildarch=4
 pkgname=firmware-imx
-pkgver=3.10.17_1.0.0
+pkgver=3.14.28_1.0.0
 _pkgver=${pkgver/_/-}
 pkgrel=1
 pkgdesc="Freescale proprietary firmware for i.MX6 SoC"
@@ -11,21 +11,19 @@ url="https://community.freescale.com/docs/DOC-95560"
 arch=('armv7h')
 license=('proprietay')
 source=("http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/${pkgname}-${_pkgver}.bin")
-md5sums=('29a54f6e5bf889a00cd8ca85080af223')
+md5sums=('6e700f3d3a6482db08d5aabee7751630')
 
 prepare() {
   cd "${srcdir}"
-  #extract the firmware, its packed as a script
+  #extract the firmware
   sh ${pkgname}-${_pkgver}.bin --force --auto-accept
-  sed -n '/EOEULA/,/EOEULA/p' ${pkgname}-${_pkgver}.bin | grep -v EOEULA > LICENSE.$pkgname
 }
 
 package() {
   mkdir -p "${pkgdir}/usr/lib/firmware/vpu"
-  cp -rv "${srcdir}/${pkgname}-${_pkgver}/firmware/vpu/"* "${pkgdir}/usr/lib/firmware/vpu"
+  cp -r "${srcdir}/${pkgname}-${_pkgver}/firmware/vpu/"* "${pkgdir}/usr/lib/firmware/vpu"
 
-  mkdir -p "${pkgdir}/opt/fsl/licenses"
-  cp "${srcdir}/LICENSE.$pkgname" "$pkgdir/opt/fsl/licenses"
+  install -D -m0644 "${srcdir}/${pkgname}-${_pkgver}/COPYING" "$pkgdir/opt/fsl/licenses/LICENSE.${pkgname}"
   mkdir -p "${pkgdir}/etc/ld.so.conf.d"
   echo "/opt/fsl/lib" > "${pkgdir}/etc/ld.so.conf.d/$pkgname.conf"
 }

alarm/imx-vpu/PKGBUILD

@@ -3,24 +3,22 @@
 
 buildarch=4
 pkgname=imx-vpu
-pkgver=3.10.17_1.0.0
-_pkgver=${pkgver/_/-}
-pkgrel=2
+pkgver=3.14.28_1.0.0
+_pkgver=5.4.28
+pkgrel=1
 pkgdesc="Freescale proprietary extensions for i.MX6 SoC"
 url="https://community.freescale.com/docs/DOC-95560"
 arch=('armv7h')
 license=('proprietary')
 source=("http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/${pkgname}-${_pkgver}.bin" '99-mxc-vpu.rules')
-md5sums=('71ea1b803864101ebf88a1bab45514d2'
+md5sums=('774455b57aaa12bae2e2cecf39b63ac4'
           'b749d82b96a323d8f914c63c65de9f92')
 
 
 prepare() {
   cd "${srcdir}"
-  #chmod for execution, library is packed as binary to accept EULA
-#  chmod +x ${pkgname}-${_pkgver}.bin
+  #extract the sources
   sh ${pkgname}-${_pkgver}.bin --force --auto-accept
-  sed -n '/EOEULA/,/EOEULA/p' ${pkgname}-${_pkgver}.bin | grep -v EOEULA > LICENSE.$pkgname
 }
 
 build() {
@@ -41,6 +39,7 @@ package() {
   mkdir -p "${pkgdir}/etc/ld.so.conf.d"
   echo "/opt/fsl/lib" > "${pkgdir}/etc/ld.so.conf.d/$pkgname.conf"
 
+  install -D -m0644 "${srcdir}/${pkgname}-${_pkgver}/COPYING" "$pkgdir/opt/fsl/licenses/LICENSE.${pkgname}"
   install -D -m0644 "${srcdir}/99-mxc-vpu.rules" "${pkgdir}/usr/lib/udev/rules.d/99-mxc-vpu.rules"
 }
 

alarm/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch

@@ -1,41 +0,0 @@
-From 7ca66c10c05168c7d342df7c7a70d4a1ae0629f7 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <eric.nelson@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@boundarydevices.com>
-Signed-off-by: Eric Nelson <eric.nelson@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
-

alarm/libfslvpuwrap/PKGBUILD

@@ -3,27 +3,21 @@
 
 buildarch=4
 pkgname=libfslvpuwrap
-pkgver=3.10.17_1.0.0
-_pkgver=1.0.46
-pkgrel=3
+pkgver=3.14.28_1.0.0
+_pkgver=1.0.58
+pkgrel=1
 pkgdesc="Wrapper library for the freescale proprietary VPU extensions"
 url="https://community.freescale.com/docs/DOC-95560"
 arch=('armv7h')
 license=('proprietary')
 depends=("imx-vpu=$pkgver")
-source=("http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/${pkgname}-${_pkgver}.bin"
-	'0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch')
-md5sums=('1f50110cb6de8ebf767fb9c5f8baf20d'
-         '478d6d6bb5043cdcdced42fcd9fec48d')
+source=("http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/${pkgname}-${_pkgver}.bin")
+md5sums=('bf4960ab18e6bb59e98aae797b80cd7f')
 
 prepare() {
   cd "${srcdir}"
-  #library is packed as binary, accept EULA
+  #extract the sources
   sh ${pkgname}-${_pkgver}.bin --force --auto-accept
-  sed -n '/EOEULA/,/EOEULA/p' ${pkgname}-${_pkgver}.bin | grep -v EOEULA > LICENSE.$pkgname
-
-  cd "${pkgname}-${_pkgver}"
-  patch -Np1 < ../0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
 }
 
 build() {
@@ -38,8 +32,8 @@ build() {
 package() {
   cd "${pkgname}-${_pkgver}"
   make DESTDIR=${pkgdir} install
-  mkdir -p "${pkgdir}/opt/fsl/licenses"
-  cp "${srcdir}/LICENSE.$pkgname" "$pkgdir/opt/fsl/licenses"
+
+  install -D -m0644 "${srcdir}/${pkgname}-${_pkgver}/COPYING" "$pkgdir/opt/fsl/licenses/LICENSE.${pkgname}"
   mkdir -p "${pkgdir}/etc/ld.so.conf.d"
   echo "/opt/fsl/lib" > "${pkgdir}/etc/ld.so.conf.d/$pkgname.conf"
 }