summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-03 16:25:57 +0000
committerRoss Burton <ross@openedhand.com>2007-08-03 16:25:57 +0000
commit1900143c5bd02e780c87c8d1574f3da45350e8b8 (patch)
tree0d9a68c434169479dc7b38ccd1fd6e0f6c97ceb8
parent205d909071c5f4f7f681757bba0078d664bf61c3 (diff)
downloadpoky-1900143c5bd02e780c87c8d1574f3da45350e8b8.tar.gz
Upgrade hal-info and hal to 0.5.9.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2355 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/hal/files/sg-inhibit.patch24
-rw-r--r--meta/packages/hal/hal_0.5.9.1.bb (renamed from meta/packages/hal/hal_0.5.9.bb)18
3 files changed, 32 insertions, 14 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 1344a4a9ab..56441d4319 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -111,7 +111,7 @@ SRCDATE_oh-puzzles = "20070714"
111SRCDATE_libowl = "20070715" 111SRCDATE_libowl = "20070715"
112SRCDATE_libxcalibrate = "20070607" 112SRCDATE_libxcalibrate = "20070607"
113SRCDATE_calibrateproto = "20070607" 113SRCDATE_calibrateproto = "20070607"
114SRCDATE_hal-info = "20070513" 114SRCDATE_hal-info = "20070727"
115SRCDATE_gtk-theme-torturer = "20070529" 115SRCDATE_gtk-theme-torturer = "20070529"
116SRCDATE_libsyncml = "20070529" 116SRCDATE_libsyncml = "20070529"
117SRCDATE_matchbox-applet-light = "20070529" 117SRCDATE_matchbox-applet-light = "20070529"
@@ -181,7 +181,7 @@ PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
181PREFERRED_VERSION_xst ?= "0.15" 181PREFERRED_VERSION_xst ?= "0.15"
182PREFERRED_VERSION_oprofile ?= "0.9.2+cvs${SRCDATE}" 182PREFERRED_VERSION_oprofile ?= "0.9.2+cvs${SRCDATE}"
183PREFERRED_VERSION_elfutils ?= "0.89" 183PREFERRED_VERSION_elfutils ?= "0.89"
184PREFERRED_VERSION_hal ?= "0.5.9" 184PREFERRED_VERSION_hal ?= "0.5.9.1"
185 185
186require conf/distro/include/preferred-xorg-versions.inc 186require conf/distro/include/preferred-xorg-versions.inc
187 187
diff --git a/meta/packages/hal/files/sg-inhibit.patch b/meta/packages/hal/files/sg-inhibit.patch
new file mode 100644
index 0000000000..f0cc41448a
--- /dev/null
+++ b/meta/packages/hal/files/sg-inhibit.patch
@@ -0,0 +1,24 @@
1--- hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c.old 2007-08-03 17:24:12.000000000 +0100
2+++ hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c 2007-08-03 17:25:06.000000000 +0100
3@@ -58,6 +58,10 @@
4
5 #include "linux_dvd_rw_utils.h"
6
7+#if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
8+# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
9+#endif
10+
11 typedef enum {
12 NONE = CGC_DATA_NONE, // 3
13 READ = CGC_DATA_READ, // 2
14@@ -153,8 +153,8 @@
15 errno = EIO;
16 ret = -1;
17 if (cmd->sg_io.masked_status & CHECK_CONDITION) {
18- CREAM_ON_ERRNO (cmd->sg_io.sbp);
19- ret = ERRCODE (cmd->sg_io.sbp);
20+ CREAM_ON_ERRNO ((char*)cmd->sg_io.sbp);
21+ ret = ERRCODE ((char*)cmd->sg_io.sbp);
22 if (ret == 0)
23 ret = -1;
24 }
diff --git a/meta/packages/hal/hal_0.5.9.bb b/meta/packages/hal/hal_0.5.9.1.bb
index 2e8ffd96e1..4e3c7ed926 100644
--- a/meta/packages/hal/hal_0.5.9.bb
+++ b/meta/packages/hal/hal_0.5.9.1.bb
@@ -3,15 +3,12 @@ HOMEPAGE = "http://freedesktop.org/Software/hal"
3SECTION = "unknown" 3SECTION = "unknown"
4LICENSE = "GPL LGPL AFL" 4LICENSE = "GPL LGPL AFL"
5 5
6DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb" 6DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
7RDEPENDS += "udev hal-info" 7RDEPENDS += "udev hal-info"
8#RDEPENDS_hal-device-manager = "python hal python-pygnome"
9RRECOMMENDS = "udev-utils" 8RRECOMMENDS = "udev-utils"
10 9
11PR = "r1"
12
13SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ 10SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
14 file://autoconf.diff;patch=1 \ 11 file://sg-inhibit.patch;patch=1 \
15 file://99_hal" 12 file://99_hal"
16 13
17S = "${WORKDIR}/hal-${PV}" 14S = "${WORKDIR}/hal-${PV}"
@@ -24,7 +21,9 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
24 --with-hotplug=${sysconfdir}/hotplug.d \ 21 --with-hotplug=${sysconfdir}/hotplug.d \
25 --disable-docbook-docs \ 22 --disable-docbook-docs \
26 --disable-policy-kit \ 23 --disable-policy-kit \
27 --disable-acpi --disable-pmu --disable-pci \ 24 --disable-acpi --disable-acpi-acpid --disable-acpi-proc \
25 --disable-sonypic \
26 --disable-pmu --disable-pci \
28 --disable-pci-ids --disable-pnp-ids \ 27 --disable-pci-ids --disable-pnp-ids \
29 " 28 "
30 29
@@ -64,12 +63,6 @@ pkg_postrm_hal () {
64 delgroup haldaemon || true 63 delgroup haldaemon || true
65} 64}
66 65
67#PACKAGES += "hal-device-manager"
68
69#FILES_hal-device-manager = " \
70# ${datadir}/hal/device-manager/ \
71# ${bindir}/hal-device-manager"
72
73FILES_${PN} = "${sysconfdir} \ 66FILES_${PN} = "${sysconfdir} \
74 ${bindir}/lshal \ 67 ${bindir}/lshal \
75 ${bindir}/hal-find-by-capability \ 68 ${bindir}/hal-find-by-capability \
@@ -79,6 +72,7 @@ FILES_${PN} = "${sysconfdir} \
79 ${bindir}/hal-set-property \ 72 ${bindir}/hal-set-property \
80 ${bindir}/hal-lock \ 73 ${bindir}/hal-lock \
81 ${bindir}/hal-is-caller-locked-out \ 74 ${bindir}/hal-is-caller-locked-out \
75 ${bindir}/hal-disable-polling \
82 ${sbindir} \ 76 ${sbindir} \
83 ${libdir}/libhal.so.* \ 77 ${libdir}/libhal.so.* \
84 ${libdir}/libhal-storage.so.* \ 78 ${libdir}/libhal-storage.so.* \