aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@openmoko.org>2008-08-28 19:24:37 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-10-15 21:04:17 +0200
commitf629930ce8c8e4950e46af9bae5b911ca150e7c7 (patch)
treedc37867b853203b7d555b5da8d110558655e205f
parentb0252872d7f9fbb0d9d735713a467643405fb4c5 (diff)
downloadopenembedded-f629930ce8c8e4950e46af9bae5b911ca150e7c7.tar.gz
openembedded-f629930ce8c8e4950e46af9bae5b911ca150e7c7.tar.bz2
openembedded-f629930ce8c8e4950e46af9bae5b911ca150e7c7.zip
[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
-rw-r--r--conf/checksums.ini4
-rw-r--r--packages/hal/files/hal-right-input-h.patch29
-rw-r--r--packages/hal/hal-info_20080508.bb1
-rw-r--r--packages/hal/hal.inc4
-rw-r--r--packages/hal/hal_0.5.11.bb4
5 files changed, 40 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index da666634d0..e89bc6b28c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6178,6 +6178,10 @@ sha256=5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
md5=a6f532770cf9286e1de38d6570cbc6bc
sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
+[http://hal.freedesktop.org/releases/hal-0.5.11.tar.gz]
+md5=750cf074e88b6fb7012f26d99cd39b9b
+sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
+
[http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz]
md5=c7005ccb1765d8359fd2348350770495
sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
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"