liboil: update to latest liboil, needed for latest schroedinger

* remove older version and introduce an inc-file
* keep 0.3.15 because om relays on it

8 files changed, 7 insertions, 68 deletions

diff --git a/recipes/liboil/liboil-0.3.15/autotools.patch b/recipes/liboil/files/autotools.patch
index 53501e3991..53501e3991 100644
--- a/recipes/liboil/liboil-0.3.15/autotools.patch
+++ b/recipes/liboil/files/autotools.patch
diff --git a/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch b/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch
deleted file mode 100644
index 49485e3648..0000000000
--- a/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /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/liboil_0.3.11.bb b/recipes/liboil/liboil.inc
index 44b4b5e088..728941f2e7 100644
--- a/recipes/liboil/liboil_0.3.11.bb
+++ b/recipes/liboil/liboil.inc
@@ -1,15 +1,14 @@
 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.10.bb b/recipes/liboil/liboil_0.3.10.bb
deleted file mode 100644
index 94471a26fc..0000000000
--- a/recipes/liboil/liboil_0.3.10.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-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_0.3.14.bb b/recipes/liboil/liboil_0.3.14.bb
deleted file mode 100644
index ebbe6cfb97..0000000000
--- a/recipes/liboil/liboil_0.3.14.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-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 338121ac66..dfc66fe890 100644
--- a/recipes/liboil/liboil_0.3.15.bb
+++ b/recipes/liboil/liboil_0.3.15.bb
@@ -1,16 +1,3 @@
-DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
-HOMEPAGE = "http://liboil.freedesktop.org/"
-LICENSE = "various"
-PR = "r2"
+require liboil.inc
 
-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
-}
+SRC_URI =+ "file://autotools.patch;patch=1"
diff --git a/recipes/liboil/liboil_0.3.16.bb b/recipes/liboil/liboil_0.3.16.bb
new file mode 100644
index 0000000000..dfc66fe890
--- /dev/null
+++ b/recipes/liboil/liboil_0.3.16.bb
@@ -0,0 +1,3 @@
+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
deleted file mode 100644
index 94471a26fc..0000000000
--- a/recipes/liboil/liboil_0.3.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-}