From d8556d67b8005276c8f0a56b944710768d2be86e Mon Sep 17 00:00:00 2001
From: Daiane Angolini <daiane.angolini@freescale.com>
Date: Thu, 16 May 2013 12:25:24 -0300
Subject: [PATCH] imx-lib: Update to version 3.0.35-4.0.0

Add new version compatible with MX6 SOC FAMILY
Remove old version for MX6 (1.1.0)
The license was changed in new vesion, so new package
is .bin file (instead of .tar.gz file).

The SRC_URI for old/new version is different, so it was
removed from .inc file and place in each version file.

Change-Id: Idd6cacf4f713b01558b002d934541e9760fe53ca
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---
 meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib.inc  |  4 ++--
 .../recipes-multimedia/imx-lib/imx-lib_1.1.0.bb      | 10 ----------
 .../recipes-multimedia/imx-lib/imx-lib_11.09.01.bb   |  2 ++
 .../imx-lib/imx-lib_3.0.35-4.0.0.bb                  | 12 ++++++++++++
 4 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_1.1.0.bb
 create mode 100644 meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb

diff --git a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib.inc b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib.inc
index 7847bbee..24477ce8 100644
--- a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib.inc
+++ b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib.inc
@@ -5,11 +5,11 @@ LICENSE = "LGPLv2.1"
 SECTION = "multimedia"
 DEPENDS = "virtual/kernel"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
 
-SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
+inherit fsl-eula-unpack
 
 PLATFORM_mx6 = "IMX6Q"
 PLATFORM_mx5 = "IMX51"
diff --git a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_1.1.0.bb b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_1.1.0.bb
deleted file mode 100644
index c0d10a33..00000000
--- a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_1.1.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-include imx-lib.inc
-
-PR = "${INC_PR}.0"
-PE = "1"
-
-SRC_URI[md5sum] = "d7867f6f5ff36f8e6c659da058334e73"
-SRC_URI[sha256sum] = "2c584c78a0cf77ca3b5cdf926b008968dbc2243f59c113ed323599c72f3de12c"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb
index b08c5603..0ed53884 100644
--- a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb
+++ b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bb
@@ -2,6 +2,8 @@ include imx-lib.inc
 
 PR = "${INC_PR}.2"
 
+SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
+
 SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
              file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch"
 SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
diff --git a/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb
new file mode 100644
index 00000000..5420cd68
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/imx-lib/imx-lib_3.0.35-4.0.0.bb
@@ -0,0 +1,12 @@
+include imx-lib.inc
+
+PR = "${INC_PR}.0"
+PE = "1"
+
+SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "f0f9b0a7a7d558edfe624190a8860122"
+SRC_URI[sha256sum] = "90caafc7a8898fc3126779eacec14fac2453afdaa45ddc7063ccd059dede97ce"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6)"
-- 
2.40.1