From: Victor Martinez <pitillo@ono.com>
Date: Mon, 10 Jun 2013 10:22:39 +0000 (+0200)
Subject: imx-lib: fixed optimizations and libs version
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=1c32740f64e92f50775949696d8896f53203b1fb;p=ports%2Fefikamx-arm.git

imx-lib: fixed optimizations and libs version
---

diff --git a/imx-lib/.footprint b/imx-lib/.footprint
index 93e511b..f572304 100644
--- a/imx-lib/.footprint
+++ b/imx-lib/.footprint
@@ -6,16 +6,16 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/vpu_lib.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libIpuScreenLayer.so
--rwxr-xr-x	root/root	usr/lib/libIpuScreenLayer.so.
--rwxr-xr-x	root/root	usr/lib/libIpuScreenLayer.so..
+-rwxr-xr-x	root/root	usr/lib/libIpuScreenLayer.so.2
+-rwxr-xr-x	root/root	usr/lib/libIpuScreenLayer.so.2.0
 -rwxr-xr-x	root/root	usr/lib/libipu.so
--rwxr-xr-x	root/root	usr/lib/libipu.so.
--rwxr-xr-x	root/root	usr/lib/libipu.so..
+-rwxr-xr-x	root/root	usr/lib/libipu.so.2
+-rwxr-xr-x	root/root	usr/lib/libipu.so.2.0
 -rw-r--r--	root/root	usr/lib/libsahara.a
 -rwxr-xr-x	root/root	usr/lib/libsahara.so
--rwxr-xr-x	root/root	usr/lib/libsahara.so.
--rwxr-xr-x	root/root	usr/lib/libsahara.so..
+-rwxr-xr-x	root/root	usr/lib/libsahara.so.2
+-rwxr-xr-x	root/root	usr/lib/libsahara.so.2.0
 -rw-r--r--	root/root	usr/lib/libvpu.a
 -rwxr-xr-x	root/root	usr/lib/libvpu.so
--rwxr-xr-x	root/root	usr/lib/libvpu.so.
--rwxr-xr-x	root/root	usr/lib/libvpu.so..
+-rwxr-xr-x	root/root	usr/lib/libvpu.so.2
+-rwxr-xr-x	root/root	usr/lib/libvpu.so.2.0
diff --git a/imx-lib/.md5sum b/imx-lib/.md5sum
index dcf4f24..9a79c0b 100644
--- a/imx-lib/.md5sum
+++ b/imx-lib/.md5sum
@@ -1 +1,2 @@
-772bc987ee04defc7edd7f11bd04cfdf  imx-lib-20130214.tar.xz
+0a70b2149478aec6e615d386c888d2dc  imx-lib-20111109.tar.bz2
+27b772e9b95f3ed06388ae22752da3c5  imx-lib-flags.patch
diff --git a/imx-lib/Pkgfile b/imx-lib/Pkgfile
index 1da6dbe..0421590 100644
--- a/imx-lib/Pkgfile
+++ b/imx-lib/Pkgfile
@@ -6,12 +6,14 @@
 # Depends on: 
 
 name=imx-lib
-version=20130214
+version=20111109
 release=1
-source=(http://crux-arm.nu/files/distfiles/efikamx/$name-$version.tar.xz)
+source=(http://crux-arm.nu/files/distfiles/efikamx/$name-$version.tar.bz2
+        $name-flags.patch)
 
 build() {
   cd $name
-  make -j1 PLATFORM=IMX51 INCLUDE="-I/usr/src/linux-`uname -r`/include"
+  patch -p1 -i $SRC/$name-flags.patch
+  make -j1 PLATFORM=IMX51 INCLUDE="-I/usr/src/linux-`uname -r`/include" LIB_VERSION_MAJOR="2" LIB_VERSION_MINOR="0"
   make DESTDIR=$PKG PLATFORM=IMX51 install
 }
diff --git a/imx-lib/imx-lib-flags.patch b/imx-lib/imx-lib-flags.patch
new file mode 100644
index 0000000..7d0e2f5
--- /dev/null
+++ b/imx-lib/imx-lib-flags.patch
@@ -0,0 +1,48 @@
+diff -pruN imx-lib.orig/ipu/Makefile imx-lib/ipu/Makefile
+--- imx-lib.orig/ipu/Makefile	2013-02-12 14:38:42.058281374 +0100
++++ imx-lib/ipu/Makefile	2013-02-12 15:12:08.418266876 +0100
+@@ -32,7 +32,7 @@ $(LIB_SONAME_FULL): $(OBJS)
+ ifeq "$(PLATFORM)" ""
+ 	$(error "Unspecified PLATFORM variable")
+ endif
+-	$(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
++	$(CC) -D$(PLATFORM) $(INCLUDE) -Wall $(CFLAGS) -fPIC -c $^ -o $@
+ 
+ .PHONY: clean
+ clean:
+diff -pruN imx-lib.orig/sahara2/Makefile imx-lib/sahara2/Makefile
+--- imx-lib.orig/sahara2/Makefile	2013-02-12 14:38:42.068285374 +0100
++++ imx-lib/sahara2/Makefile	2013-02-12 14:40:51.308266628 +0100
+@@ -53,7 +53,7 @@ $(LIBNAME).a: $(OBJS)
+ 	$(AR) -rc $@ $^
+ 
+ $(LIB_SONAME_FULL): $(OBJS)
+-	$(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
++	$(CC) $(CFLAGS) $(INC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
+ 	ln -s $(LIB_SONAME_FULL) $(LIB_SONAME).$(LIB_VERSION_MAJOR)
+ 	ln -s $(LIB_SONAME_FULL) $(LIB_SONAME)
+ 
+diff -pruN imx-lib.orig/screenlayer/Makefile imx-lib/screenlayer/Makefile
+--- imx-lib.orig/screenlayer/Makefile	2013-02-12 14:38:42.078285500 +0100
++++ imx-lib/screenlayer/Makefile	2013-02-12 15:14:17.628266623 +0100
+@@ -33,7 +33,7 @@ $(LIB_SONAME_FULL): $(OBJS)
+ ifeq "$(PLATFORM)" ""
+         $(error "Unspecified PLATFORM variable")
+ endif
+-	$(CC) -D$(PLATFORM) $(INC) -Wall -O2 -fPIC -c $^ -o $@
++	$(CC) -D$(PLATFORM) $(INC) -Wall $(CFLAGS) -O2 -fPIC -c $^ -o $@
+ 
+ .PHONY: clean
+ clean:
+diff -pruN imx-lib.orig/vpu/Makefile imx-lib/vpu/Makefile
+--- imx-lib.orig/vpu/Makefile	2013-02-12 14:38:42.058281374 +0100
++++ imx-lib/vpu/Makefile	2013-02-12 15:11:42.348266502 +0100
+@@ -43,7 +43,7 @@ all install :
+ endif
+ 
+ %.o: %.c
+-	$(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
++	$(CC) -D$(PLATFORM) -Wall $(CFLAGS) -fPIC -c $^ -o $@
+ 
+ $(LIB_SONAME_FULL): $(OBJ)
+ 	$(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@