From 24bd0050ed8986cc56dd6076e153905752e48d07 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 18 May 2009 12:38:48 +0100
Subject: hal: 0.5.11 -> 0.5.12rc1

---
 .../hal/hal-0.5.11+0.5.12rc1/fix-configure.diff    | 22 ++++++++++++++++++++++
 meta/packages/hal/hal-0.5.11/fix-configure.diff    | 22 ----------------------
 meta/packages/hal/hal_0.5.11+0.5.12rc1.bb          | 19 +++++++++++++++++++
 meta/packages/hal/hal_0.5.11.bb                    | 16 ----------------
 4 files changed, 41 insertions(+), 38 deletions(-)
 create mode 100644 meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
 delete mode 100644 meta/packages/hal/hal-0.5.11/fix-configure.diff
 create mode 100644 meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
 delete mode 100644 meta/packages/hal/hal_0.5.11.bb

(limited to 'meta/packages')

diff --git a/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff b/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
new file mode 100644
index 000000000..7d9d42d69
--- /dev/null
+++ b/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
@@ -0,0 +1,22 @@
+From: Rémi Cardona <remi@gentoo.org>
+Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200)
+Subject: add libtool-2.2 support
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d
+
+add libtool-2.2 support
+
+Fix for aclocal to work properly with libtool 2.2 which no longer
+checks for C++ automatically (this patch is of course backwards
+compatible with libtool 1.5.x)
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_CC_C_O
+ AC_HEADER_STDC
+ AC_PROG_LIBTOOL
diff --git a/meta/packages/hal/hal-0.5.11/fix-configure.diff b/meta/packages/hal/hal-0.5.11/fix-configure.diff
deleted file mode 100644
index 7d9d42d69..000000000
--- a/meta/packages/hal/hal-0.5.11/fix-configure.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rémi Cardona <remi@gentoo.org>
-Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200)
-Subject: add libtool-2.2 support
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d
-
-add libtool-2.2 support
-
-Fix for aclocal to work properly with libtool 2.2 which no longer
-checks for C++ automatically (this patch is of course backwards
-compatible with libtool 1.5.x)
----
-
---- a/configure.in
-+++ b/configure.in
-@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE)
- 
- AC_ISC_POSIX
- AC_PROG_CC
-+AC_PROG_CXX
- AM_PROG_CC_C_O
- AC_HEADER_STDC
- AC_PROG_LIBTOOL
diff --git a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb b/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
new file mode 100644
index 000000000..1d4ca592a
--- /dev/null
+++ b/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
@@ -0,0 +1,19 @@
+require hal.inc
+
+PR = "r1"
+
+SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.gz \
+           file://99_hal \
+           file://20hal"
+
+S = "${WORKDIR}/hal-0.5.12rc1"
+
+EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
+
+PACKAGES =+ "libhal libhal-storage"
+
+FILES_libhal = "${libdir}/libhal.so.*"
+FILES_libhal-storage = "${libdir}/libhal-storage.so.*"
+
+FILES_${PN} =+ "${bindir}/hal-disable-polling \
+                ${bindir}/hal-setup-keymap"
diff --git a/meta/packages/hal/hal_0.5.11.bb b/meta/packages/hal/hal_0.5.11.bb
deleted file mode 100644
index f13a3213e..000000000
--- a/meta/packages/hal/hal_0.5.11.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require hal.inc
-
-PR = "r1"
-
-SRC_URI += " file://hal-right-input-h.patch;patch=1 \
-             file://fix-configure.diff;patch=1"
-
-EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
-
-PACKAGES =+ "libhal libhal-storage"
-
-FILES_libhal = "${libdir}/libhal.so.*"
-FILES_libhal-storage = "${libdir}/libhal-storage.so.*"
-
-FILES_${PN} =+ "${bindir}/hal-disable-polling \
-                ${bindir}/hal-setup-keymap"
-- 
cgit v1.2.3