* liboil: update from 0.3.12 to 0.3.13

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7787 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 114 insertions, 4 deletions

diff --git a/patches/liboil-0.3.12/generic/liboil-0.3.12-ltmain_sh.diff b/patches/liboil-0.3.13/generic/liboil-0.3.12-ltmain_sh.diff
index a5fa29159..82790e0df 100644
--- a/patches/liboil-0.3.12/generic/liboil-0.3.12-ltmain_sh.diff
+++ b/patches/liboil-0.3.13/generic/liboil-0.3.12-ltmain_sh.diff
@@ -11,10 +11,15 @@
 # not submitted to upstream
 #
 
-diff --unified --recursive liboil-0.3.12/ltmain.sh liboil-0.3.12-nx1/ltmain.sh
---- liboil-0.3.12/ltmain.sh	2006-06-19 20:36:49.000000000 +0200
-+++ liboil-0.3.12-nx1/ltmain.sh	2007-07-26 16:45:07.000000000 +0200
-@@ -2545,7 +2545,7 @@
+---
+ ltmain.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: liboil-0.3.13/ltmain.sh
+===================================================================
+--- liboil-0.3.13.orig/ltmain.sh	2007-08-14 19:43:36.000000000 +0200
++++ liboil-0.3.13/ltmain.sh	2008-02-23 01:01:02.000000000 +0100
+@@ -2587,7 +2587,7 @@
  	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
  	  if test "$installed" = no; then
  	    notinst_deplibs="$notinst_deplibs $lib"
diff --git a/patches/liboil-0.3.13/generic/liboil-0.3.13-autoreconf.diff.bz2 b/patches/liboil-0.3.13/generic/liboil-0.3.13-autoreconf.diff.bz2
new file mode 100644
index 000000000..43afa7d74
--- /dev/null
+++ b/patches/liboil-0.3.13/generic/liboil-0.3.13-autoreconf.diff.bz2
diff --git a/patches/liboil-0.3.13/generic/liboil-0.3.13-jit-glib.diff b/patches/liboil-0.3.13/generic/liboil-0.3.13-jit-glib.diff
new file mode 100644
index 000000000..23b382c28
--- /dev/null
+++ b/patches/liboil-0.3.13/generic/liboil-0.3.13-jit-glib.diff
@@ -0,0 +1,28 @@
+Subject: liboil: jit example does only work when glib is active
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+The makefile tries to build the jit example unconditionally, which fails
+if we don't find glib:
+
+jit.c:4:18: error: glib.h: No such file or directoryojprogram.c:4:18:
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ examples/Makefile.am |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: liboil-0.3.13/examples/Makefile.am
+===================================================================
+--- liboil-0.3.13.orig/examples/Makefile.am	2008-02-22 20:59:17.000000000 +0100
++++ liboil-0.3.13/examples/Makefile.am	2008-02-23 01:01:02.000000000 +0100
+@@ -1,5 +1,8 @@
++if HAVE_GLIB
++SUBDIRS_GLIB = jit
++endif
+ 
+-SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample jit
++SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample $(SUBDIRS_GLIB)
+ 
+ bin_PROGRAMS = oil-bugreport
+ 
diff --git a/patches/liboil-0.3.13/generic/liboil-0.3.13-static-oil_cpu_flags.diff b/patches/liboil-0.3.13/generic/liboil-0.3.13-static-oil_cpu_flags.diff
new file mode 100644
index 000000000..cc220534e
--- /dev/null
+++ b/patches/liboil-0.3.13/generic/liboil-0.3.13-static-oil_cpu_flags.diff
@@ -0,0 +1,72 @@
+Subject: liboil: make oil_cpu_detect_arch() un-static
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+Looks like ARM was forgotten while converting oil_cpu_detect_arch().
+Additionally, arm still needs get_rpoc_cpuinfo().
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ liboil/liboilcpu-arm.c |   35 ++++++++++++++++++++++++++++++-----
+ 1 file changed, 30 insertions(+), 5 deletions(-)
+
+Index: liboil-0.3.13/liboil/liboilcpu-arm.c
+===================================================================
+--- liboil-0.3.13.orig/liboil/liboilcpu-arm.c	2008-02-22 20:59:17.000000000 +0100
++++ liboil-0.3.13/liboil/liboilcpu-arm.c	2008-02-23 01:01:48.000000000 +0100
+@@ -60,10 +60,6 @@
+  *
+  */
+ 
+-static void oil_cpu_detect_arch(void);
+-
+-static unsigned long oil_cpu_flags;
+-
+ extern unsigned long (*_oil_profile_stamp)(void);
+ 
+ #if defined(__arm__)
+@@ -126,6 +122,35 @@
+   free (cpuinfo_flags);
+ }
+ 
++static char *
++get_proc_cpuinfo (void)
++{
++  char *cpuinfo;
++  int fd;
++  int n;
++
++  cpuinfo = malloc(4096);
++  if (cpuinfo == NULL) return NULL;
++
++  fd = open("/proc/cpuinfo", O_RDONLY);
++  if (fd < 0) {
++    free (cpuinfo);
++    return NULL;
++  }
++
++  n = read(fd, cpuinfo, 4095);
++  if (n < 0) {
++    free (cpuinfo);
++    close (fd);
++    return NULL;
++  }
++  cpuinfo[n] = 0;
++
++  close (fd);
++
++  return cpuinfo;
++}
++
+ static void
+ oil_cpu_detect_arm(void)
+ {
+@@ -249,7 +274,7 @@
+ }
+ #endif
+ 
+-static void
++void
+ oil_cpu_detect_arch(void)
+ {
+ #if defined(__i386__) || defined(__amd64__)
diff --git a/patches/liboil-0.3.13/generic/series b/patches/liboil-0.3.13/generic/series
new file mode 100644
index 000000000..7de0cdd44
--- /dev/null
+++ b/patches/liboil-0.3.13/generic/series
@@ -0,0 +1,5 @@
+liboil-0.3.12-ltmain_sh.diff
+liboil-0.3.13-jit-glib.diff
+liboil-0.3.13-static-oil_cpu_flags.diff
+liboil-0.3.13-autoreconf.diff.bz2
+