From f629930ce8c8e4950e46af9bae5b911ca150e7c7 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@openmoko.org>
Date: Thu, 28 Aug 2008 19:24:37 +0200
Subject: [hal] Add latest hal and hal-info hal-0.5.11 should fix many many
leaks compared to hal-0.5.9 and upgrade hal-info on the way as well
---
packages/hal/files/hal-right-input-h.patch | 29 +++++++++++++++++++++++++++++
packages/hal/hal-info_20080508.bb | 1 +
packages/hal/hal.inc | 4 ++--
packages/hal/hal_0.5.11.bb | 4 ++++
4 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 packages/hal/files/hal-right-input-h.patch
create mode 100644 packages/hal/hal-info_20080508.bb
create mode 100644 packages/hal/hal_0.5.11.bb
(limited to 'packages')
diff --git a/packages/hal/files/hal-right-input-h.patch b/packages/hal/files/hal-right-input-h.patch
new file mode 100644
index 0000000000..f820b7790a
--- /dev/null
+++ b/packages/hal/files/hal-right-input-h.patch
@@ -0,0 +1,29 @@
+diff --git a/configure.in b/configure.in
+index e76ff51..5e8cc21 100644
+--- a/configure.in
++++ b/configure.in
+@@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header],
+ [Use an given Linux input.h rather than that installed on the system (<linux/input.h>)]))
+ if test "x$with_linux_input_header" != "x"; then
+ AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>])
++ LINUX_INPUT_H=$with_linux_input_header
++ AC_SUBST(LINUX_INPUT_H)
++else
++ LINUX_INPUT_H=/usr/include/linux/input.h
++ AC_SUBST(LINUX_INPUT_H)
+ fi
+
+ dnl
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index ae03edd..7d1cbab 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -79,7 +79,7 @@ endif
+ if BUILD_KEYMAPS
+
+ if HAVE_GPERF
+-hal-setup-keymap-keys.txt: /usr/include/linux/input.h
++hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
+ awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
+
+ hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
diff --git a/packages/hal/hal-info_20080508.bb b/packages/hal/hal-info_20080508.bb
new file mode 100644
index 0000000000..e6d50e3981
--- /dev/null
+++ b/packages/hal/hal-info_20080508.bb
@@ -0,0 +1 @@
+require hal-info.inc
diff --git a/packages/hal/hal.inc b/packages/hal/hal.inc
index 73046dfb8c..d0c74e84af 100644
--- a/packages/hal/hal.inc
+++ b/packages/hal/hal.inc
@@ -3,13 +3,13 @@ HOMEPAGE = "http://freedesktop.org/Software/hal"
SECTION = "unknown"
LICENSE = "GPL LGPL AFL"
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
+SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
S = "${WORKDIR}/hal-${PV}"
inherit autotools pkgconfig
-DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb"
+DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native"
RDEPENDS += "udev hal-info"
RRECOMMENDS = "udev-utils"
diff --git a/packages/hal/hal_0.5.11.bb b/packages/hal/hal_0.5.11.bb
new file mode 100644
index 0000000000..5408756510
--- /dev/null
+++ b/packages/hal/hal_0.5.11.bb
@@ -0,0 +1,4 @@
+require hal.inc
+
+SRC_URI += " file://hal-right-input-h.patch;patch=1"
+EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
--
cgit v1.2.3