From: Adrian Alonso <aalonso00@gmail.com>
Date: Tue, 8 Nov 2011 02:41:44 +0000 (-0600)
Subject: imx-lib: update to release version 11.09.01
X-Git-Tag: 2.1~1966
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b4cf53b51fb446e0415ee9b367b85f8a3472ac12;p=meta-freescale.git

imx-lib: update to release version 11.09.01

* Update to release version 11.09.01
* Distribute imx-lib source code as part of metadata
* Remove libraries shared link creation, prevent QA
  test failure.

Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
---

diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz
new file mode 100644
index 00000000..1d222767
Binary files /dev/null and b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz differ
diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
new file mode 100644
index 00000000..dc585049
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
@@ -0,0 +1,147 @@
+From 91732b83137039597b1cd0d747626d70e59d252d Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso@freescale.com>
+Date: Tue, 1 Nov 2011 14:57:32 -0600
+Subject: [PATCH] imx-lib: remove shared libs symlinks
+
+* Remove shared libs symlinks creation
+
+Signed-off-by: Adrian Alonso <aalonso@freescale.com>
+---
+ ipu/Makefile         |    5 +----
+ pxp/Makefile         |    5 +----
+ rng/Makefile         |    5 +----
+ sahara2/Makefile     |    5 +----
+ screenlayer/Makefile |    5 +----
+ sim/Makefile         |    5 +----
+ vpu/Makefile         |    5 +----
+ 7 files changed, 7 insertions(+), 28 deletions(-)
+
+diff --git a/ipu/Makefile b/ipu/Makefile
+index 97241e3..654f650 100644
+--- a/ipu/Makefile
++++ b/ipu/Makefile
+@@ -27,12 +27,9 @@ all install:
+ 	@echo "Not support platform, will not complile"
+ endif
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
++$(LIBNAME).so: $(OBJS)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ %.o: %.c
+ ifeq "$(PLATFORM)" ""
+ 	$(error "Unspecified PLATFORM variable")
+diff --git a/pxp/Makefile b/pxp/Makefile
+index c2bb59d..70bb508 100644
+--- a/pxp/Makefile
++++ b/pxp/Makefile
+@@ -27,12 +27,9 @@ endif
+ %.o: %.c
+ 	$(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
++$(LIBNAME).so: $(OBJ)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ $(LIBNAME).a: $(OBJ)
+ 	$(AR) -rc $@  $^
+ 
+diff --git a/rng/Makefile b/rng/Makefile
+index 4b1dd5c..b5dd2e1 100644
+--- a/rng/Makefile
++++ b/rng/Makefile
+@@ -30,12 +30,9 @@ install_headers:
+ $(LIBNAME).a: $(OBJS)
+ 	$(AR) $@ $^
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
++$(LIBNAME).so: $(OBJS)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ .PHONY: clean
+ clean:
+ 	@rm -f *.o $(LIBNAME).*
+diff --git a/sahara2/Makefile b/sahara2/Makefile
+index 106d932..dd9550e 100644
+--- a/sahara2/Makefile
++++ b/sahara2/Makefile
+@@ -49,12 +49,9 @@ endif
+ $(LIBNAME).a: $(OBJS)
+ 	$(AR) $@ $^
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
++$(LIBNAME).so: $(OBJS)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ .PHONY: clean
+ clean:
+ 	@rm -f $(OBJS) $(LIBNAME).*
+diff --git a/screenlayer/Makefile b/screenlayer/Makefile
+index a90d4d5..a4f36ae 100644
+--- a/screenlayer/Makefile
++++ b/screenlayer/Makefile
+@@ -23,12 +23,9 @@ all install:
+ 	@echo "Not support platform, will not complile"
+ endif
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
++$(LIBNAME).so: $(OBJS)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ %.o: %.c
+ 	$(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@
+ 
+diff --git a/sim/Makefile b/sim/Makefile
+index 7685e32..5e31e6a 100644
+--- a/sim/Makefile
++++ b/sim/Makefile
+@@ -20,12 +20,9 @@ install:
+ 	@mkdir -p $(DEST_DIR)/usr/include
+ 	cp iso7816-3.h $(DEST_DIR)/usr/include
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
++$(LIBNAME).so: $(OBJS)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ %.o: %.c
+ 	$(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
+ 
+diff --git a/vpu/Makefile b/vpu/Makefile
+index ab6ccf1..8f3ce8e 100644
+--- a/vpu/Makefile
++++ b/vpu/Makefile
+@@ -35,12 +35,9 @@ endif
+ %.o: %.c
+ 	$(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
+ 
+-$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
++$(LIBNAME).so: $(OBJ)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
+ 
+-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
+-	ln -s $< $@
+-
+ $(LIBNAME).a: $(OBJ)
+ 	$(AR) -rc $@  $^
+ 
+-- 
+1.7.5.4
+
diff --git a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
similarity index 69%
rename from meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb
rename to meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
index cb14753f..4512c152 100644
--- a/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb
+++ b/meta-fsl-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
@@ -5,13 +5,14 @@ DESCRIPTION = "Platform specific libraries for imx platform"
 LICENSE = "LGPL"
 SECTION = "multimedia"
 DEPENDS = "virtual/kernel"
-PR = "r3"
+PR = "r0"
 
 LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
 
-SRC_URI = "http://auslxsc01.mtwk.freescale.net/ppp/${PN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "67e1be286abbee3529fc55cdf2b4cd51"
-SRC_URI[sha256sum] = "063e722e8abc6f2e90afde1338f213b92bc1187a7a741ec04df22851cc952e29"
+SRC_URI = "file://${PN}-${PV}.tar.gz \
+           file://imx-lib-remove-shared-libs-symlinks.patch"
+SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
+SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"
 
 # override parallel make flags
 PARALLEL_MAKE="-j 1"
@@ -28,5 +29,5 @@ do_install () {
 }
 
 FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dbg  += "${libdir}/.debug"
-FILES_${PN}-devstatic  += "${libdir}/*.la ${libdir}/*.a"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a"