imx-lib: fix packaging of libraries

The package was mistakenly removing the links of libraries making
runtime applications to fail to run. The patch that caused it has been
removed and package files adjusted.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Adrian Alonso <aalonso00@gmail.com>

3 files changed, 5 insertions, 153 deletions

diff --git a/recipes-multimedia/fsl-mm-core/imx-lib.inc b/recipes-multimedia/fsl-mm-core/imx-lib.inc
index 52e25d0..554df15 100644
--- a/recipes-multimedia/fsl-mm-core/imx-lib.inc
+++ b/recipes-multimedia/fsl-mm-core/imx-lib.inc
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1"
 SECTION = "multimedia"
 DEPENDS = "virtual/kernel"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
 
@@ -27,7 +27,7 @@ do_install () {
     oe_runmake DEST_DIR="${D}" install
 }
 
-FILES_${PN} += "${libdir}/*.so"
+FILES_${PN} += "${libdir}/*${SOLIBS}"
 FILES_${PN}-dbg += "${libdir}/.debug"
-FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a"
+FILES_${PN}-dev += "${libdir}/*${SOLIBSDEV}"
 
diff --git a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch b/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
deleted file mode 100644
index dc58504..0000000
--- a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-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/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
index 843c1a7..95cc021 100644
--- a/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
+++ b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
@@ -1,11 +1,10 @@
 include imx-lib.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 COMPATIBLE_MACHINE = "(mx5)"
 
-SRC_URI += " file://imx-lib-remove-shared-libs-symlinks.patch \
-             file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
+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"
 SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"