Touch up MacBook detection patch. Add firewire prober update for ioctls. Fix pm-suspend/pm-hibernate options

(Portage version: 2.1.2.5)

6 files changed, 130 insertions, 10 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 3ff45fc68c4e..a49e7a7e3823 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.181 2007/05/07 16:18:33 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.182 2007/05/08 03:17:59 cardoe Exp $
+
+  08 May 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/0.5.9/13_detect_newer_macbooks.patch,
+  +files/0.5.9/20_firewire_prober_ioctls_fix.patch,
+  +files/0.5.9/21_pm-suspend_correct_options.patch,
+  +files/0.5.9/22_pm-hibernate_correct_options.patch, files/0.5.9/series:
+  Touch up MacBook detection patch. Add firewire prober update for ioctls. Fix
+  pm-suspend/pm-hibernate options
 
   07 May 2007; Tony Vroon <chainsaw@gentoo.org> hal-0.5.9.ebuild,
   hal-0.5.9-r1.ebuild:
diff --git a/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch b/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch
index e14c3d280c06..81c15bd47e84 100644
--- a/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch
+++ b/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch
@@ -1,13 +1,41 @@
+From: Martin Pitt <martin@piware.de>
+Date: Wed, 18 Apr 2007 19:33:07 +0000 (-0400)
+Subject: support more Macbook Pro models
+X-Git-Tag: HAL_0_2
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=98e53bff6ee6c94113b2e745f727c7a78bae5f06
+
+support more Macbook Pro models
+
+Matthew recently fixed the FDIs to support newer MacBook Pro models.
+
+Patch applies cleanly to 0.5.9 and git head.
+
+(changed by davidz: s/smbios.system.product/system.hardware.product)
+---
+
 Index: b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
 ===================================================================
---- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-03-07 16:52:19.000000000 -0500
-+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-04-18 10:18:41.000000000 -0400
-@@ -6,7 +6,7 @@
-   <device>
-     <match key="system.kernel.name" string="Linux">
-       <match key="system.hardware.vendor" string="Apple Computer, Inc.">
--        <match key="system.hardware.product" string="MacBookPro1,1">
-+        <match key="system.hardware.product" contains="MacBookPro">
-           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
+--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-04-30 14:56:39.000000000 -0400
++++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-04-30 14:56:58.000000000 -0400
+@@ -11,6 +11,21 @@
            <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
            <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
+         </match>
++        <match key="system.hardware.product" string="MacBookPro1,2">
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
++        </match>
++        <match key="system.hardware.product" string="MacBookPro2,1">
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
++        </match>
++        <match key="system.hardware.product" string="MacBookPro2,2">
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
++        </match>
+       </match>
+     </match>
+   </device>
diff --git a/sys-apps/hal/files/0.5.9/20_firewire_prober_ioctls_fix.patch b/sys-apps/hal/files/0.5.9/20_firewire_prober_ioctls_fix.patch
new file mode 100644
index 000000000000..2d9dd8bd153a
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/20_firewire_prober_ioctls_fix.patch
@@ -0,0 +1,31 @@
+From: Kristian Høgsberg <krh@redhat.com>
+Date: Wed, 25 Apr 2007 19:20:39 +0000 (-0400)
+Subject: update firewire prober to use correct ioctl codes
+X-Git-Tag: HAL_0_2
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c2b62d08f68881584e020fd031dc6bb143a78a43
+
+update firewire prober to use correct ioctl codes
+---
+
+--- a/hald/linux/probing/probe-ieee1394-unit.c
++++ b/hald/linux/probing/probe-ieee1394-unit.c
+@@ -83,14 +83,11 @@ struct fw_cdev_event_request {
+ 	__u32 data[0];
+ };
+ 
+-#define FW_CDEV_IOC_GET_INFO		_IO('#', 0x00)
+-#define FW_CDEV_IOC_SEND_REQUEST	_IO('#', 0x01)
+-#define FW_CDEV_IOC_ALLOCATE		_IO('#', 0x02)
+-#define FW_CDEV_IOC_DEALLOCATE		_IO('#', 0x03)
+-#define FW_CDEV_IOC_SEND_RESPONSE	_IO('#', 0x04)
+-#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IO('#', 0x05)
+-#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IO('#', 0x06)
+-#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IO('#', 0x07)
++#define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
++#define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
++#define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
++#define FW_CDEV_IOC_DEALLOCATE		_IOW('#', 0x03, struct fw_cdev_deallocate)
++#define FW_CDEV_IOC_SEND_RESPONSE	_IOW('#', 0x04, struct fw_cdev_send_response)
+ 
+ /* FW_CDEV_VERSION History
+  *
diff --git a/sys-apps/hal/files/0.5.9/21_pm-suspend_correct_options.patch b/sys-apps/hal/files/0.5.9/21_pm-suspend_correct_options.patch
new file mode 100644
index 000000000000..1f497958eb35
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/21_pm-suspend_correct_options.patch
@@ -0,0 +1,25 @@
+From: David Zeuthen <davidz@redhat.com>
+Date: Wed, 25 Apr 2007 19:24:23 +0000 (-0400)
+Subject: pass correct options to pm-suspend
+X-Git-Tag: HAL_0_2
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=4149d09581cdc3a17e118d9324a1c194e6461cc2
+
+pass correct options to pm-suspend
+---
+
+--- a/tools/linux/hal-system-power-suspend-linux
++++ b/tools/linux/hal-system-power-suspend-linux
+@@ -26,10 +26,10 @@ QUIRKS=""
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_S3_MODE" = "true" ] && QUIRKS="$QUIRKS --quirk-s3-mode"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_SUSPEND" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-suspend"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-on"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate-restore"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode-restore"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+ 
+ #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
diff --git a/sys-apps/hal/files/0.5.9/22_pm-hibernate_correct_options.patch b/sys-apps/hal/files/0.5.9/22_pm-hibernate_correct_options.patch
new file mode 100644
index 000000000000..6da14ec587b2
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/22_pm-hibernate_correct_options.patch
@@ -0,0 +1,25 @@
+From: David Zeuthen <davidz@redhat.com>
+Date: Wed, 25 Apr 2007 19:25:27 +0000 (-0400)
+Subject: also pass correct options for pm-hibernate
+X-Git-Tag: HAL_0_2
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=3344f424207ce676b1910a2b3e10c8f2442750c6
+
+also pass correct options for pm-hibernate
+---
+
+--- a/tools/linux/hal-system-power-hibernate-linux
++++ b/tools/linux/hal-system-power-hibernate-linux
+@@ -18,10 +18,10 @@ QUIRKS=""
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_S3_MODE" = "true" ] && QUIRKS="$QUIRKS --quirk-s3-mode"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_SUSPEND" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-suspend"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-on"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate-restore"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode-restore"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+ 
+ #ALTLinux only supports powersave
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 174b39b3c0bd..08ebb4c3ce24 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -17,6 +17,9 @@
 17_autoconf_cflag_cleanup.patch
 18_hal_fix_info.category_for_laptop_panel_v2.patch
 19_hald_runner_catch_dbus_disconnect.patch
+20_firewire_prober_ioctls_fix.patch
+21_pm-suspend_correct_options.patch
+22_pm-hibernate_correct_options.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch
 97_ignore_fixed_drives.patch