Revert "liboil: update to latest liboil, needed for latest schroedinger"

This reverts commit f25144e99b769aac83bcde613edf684441bbef27.

8 files changed, 68 insertions, 7 deletions

diff --git a/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch b/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch
new file mode 100644
index 0000000000..49485e3648
--- /dev/null
+++ b/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch
@@ -0,0 +1,11 @@
+--- /m4/orig-as-gcc-inline-assembly.m4	2007-03-17 04:03:30.000000000 +0200
++++ /m4/as-gcc-inline-assembly.m4	2007-11-20 12:20:24.000000000 +0200
+@@ -38,7 +38,7 @@
+ [
+   AC_MSG_CHECKING([if compiler supports FPU instructions on PowerPC])
+ 
+-  AC_TRY_COMPILE([], [__asm__ ("fadd 0,0,0"::) ], [flag_ok=yes], [flag_ok=no])
++  AC_TRY_COMPILE([], [double x = 0; __asm__ ("fadd 0,0,0"::"f" (x):"32") ], [flag_ok=yes], [flag_ok=no])
+ 
+   if test "X$flag_ok" = Xyes ; then
+     $1
diff --git a/recipes/liboil/files/autotools.patch b/recipes/liboil/liboil-0.3.15/autotools.patch
index 53501e3991..53501e3991 100644
--- a/recipes/liboil/files/autotools.patch
+++ b/recipes/liboil/liboil-0.3.15/autotools.patch
diff --git a/recipes/liboil/liboil_0.3.10.bb b/recipes/liboil/liboil_0.3.10.bb
new file mode 100644
index 0000000000..94471a26fc
--- /dev/null
+++ b/recipes/liboil/liboil_0.3.10.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/recipes/liboil/liboil.inc b/recipes/liboil/liboil_0.3.11.bb
index 728941f2e7..44b4b5e088 100644
--- a/recipes/liboil/liboil.inc
+++ b/recipes/liboil/liboil_0.3.11.bb
@@ -1,14 +1,15 @@
 DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
 HOMEPAGE = "http://liboil.freedesktop.org/"
 LICENSE = "various"
+PR ="r2"
 
 DEPENDS = "glib-2.0"
 
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
-          "
+           file://ppc-detect-fpu.patch;patch=1"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+	autotools_stage_all
 }
diff --git a/recipes/liboil/liboil_0.3.14.bb b/recipes/liboil/liboil_0.3.14.bb
new file mode 100644
index 0000000000..ebbe6cfb97
--- /dev/null
+++ b/recipes/liboil/liboil_0.3.14.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+
+# The configure script seems to have bogus checks, so let's not make it the default
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "glib-2.0"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+          "
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/recipes/liboil/liboil_0.3.15.bb b/recipes/liboil/liboil_0.3.15.bb
index dfc66fe890..338121ac66 100644
--- a/recipes/liboil/liboil_0.3.15.bb
+++ b/recipes/liboil/liboil_0.3.15.bb
@@ -1,3 +1,16 @@
-require liboil.inc
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+PR = "r2"
 
-SRC_URI =+ "file://autotools.patch;patch=1"
+DEPENDS = "glib-2.0"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+	   file://autotools.patch;patch=1 \
+          "
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/recipes/liboil/liboil_0.3.16.bb b/recipes/liboil/liboil_0.3.16.bb
deleted file mode 100644
index dfc66fe890..0000000000
--- a/recipes/liboil/liboil_0.3.16.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require liboil.inc
-
-SRC_URI =+ "file://autotools.patch;patch=1"
diff --git a/recipes/liboil/liboil_0.3.9.bb b/recipes/liboil/liboil_0.3.9.bb
new file mode 100644
index 0000000000..94471a26fc
--- /dev/null
+++ b/recipes/liboil/liboil_0.3.9.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}