Fix for kernel 2.6.21 thanks to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> in bug 177956

Package-Manager: portage-2.1.2.7

5 files changed, 255 insertions, 5 deletions

diff --git a/app-laptop/acpi4asus/ChangeLog b/app-laptop/acpi4asus/ChangeLog
index b8ebe6f6d8ad..678b40e554b9 100644
--- a/app-laptop/acpi4asus/ChangeLog
+++ b/app-laptop/acpi4asus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/acpi4asus
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/ChangeLog,v 1.14 2007/04/07 13:26:15 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/ChangeLog,v 1.15 2007/05/12 22:29:25 genstef Exp $
+
+*acpi4asus-0.41 (12 May 2007)
+
+  12 May 2007; Stefan Schweizer <genstef@gentoo.org> +files/cvs.patch,
+  +acpi4asus-0.41.ebuild:
+  Fix for kernel 2.6.21 thanks to Pacho Ramos
+  <pacho@condmat1.ciencias.uniovi.es> in bug 177956
 
   22 Mar 2007; Stefan Schweizer <genstef@gentoo.org> +acpi4asus-0.40-r1.ebuild:
   change emake command thanks CHARY Corentin <corentincj@iksaif.net> in bug
diff --git a/app-laptop/acpi4asus/Manifest b/app-laptop/acpi4asus/Manifest
index 7385224cb335..11a9678a1209 100644
--- a/app-laptop/acpi4asus/Manifest
+++ b/app-laptop/acpi4asus/Manifest
@@ -2,9 +2,14 @@ AUX acpi4asus-0.32-2.6.20.patch 517 RMD160 cf5840ab44536c7c9a0a957e0e2edf230c8be
 MD5 963e3e6de1330c5a61a9c5910b8dbcb4 files/acpi4asus-0.32-2.6.20.patch 517
 RMD160 cf5840ab44536c7c9a0a957e0e2edf230c8be587 files/acpi4asus-0.32-2.6.20.patch 517
 SHA256 9a5864c5369795cd81444b80114df43d9e9e7a6a76b840fd093a4156a6dc70e9 files/acpi4asus-0.32-2.6.20.patch 517
+AUX cvs.patch 5028 RMD160 f78514595cafca03c28e6a906cbc206c342deb53 SHA1 c22be1c83e1d0ba40625d1028f737a3d28c80f6c SHA256 f4fe9ae9e2c263e8d3915504f942e80aab1175c4c8166cbfb7f1fbd496f84bce
+MD5 652f2b05489472a4bad080bf09dcd2f9 files/cvs.patch 5028
+RMD160 f78514595cafca03c28e6a906cbc206c342deb53 files/cvs.patch 5028
+SHA256 f4fe9ae9e2c263e8d3915504f942e80aab1175c4c8166cbfb7f1fbd496f84bce files/cvs.patch 5028
 DIST acpi4asus-0.30.tar.bz2 30223 RMD160 bbe265b21c94e2d9ed34f64404506a38330d63a9 SHA1 51419da50c17be2e02e9a5c9f7fc84b73098462a SHA256 bb21acac7df47ac9748328d01a99d1d8f6972438fad8fe0868f68bfcfa8dc6e5
 DIST acpi4asus-0.32.tar.bz2 32043 RMD160 253564a1ecb40649100637ecf02e76fb230b39cf SHA1 3ff06c204f9699eebafeecfce6df9389d1dcbe48 SHA256 852482d59f66d2f918a223e27b169d8835efa38a573cfad584d484ef1cffaa09
 DIST acpi4asus-0.40.tar.bz2 29681 RMD160 5c6602abf1b2e5e584325c2d8b2d55cf47a2e692 SHA1 3a09ad05bb9df1e8a85283a5e983e62251275f7e SHA256 3e25cbeac4d07fdc9849438b47143b77c9f622865840400db9a34ec060123ffc
+DIST acpi4asus-0.41.tar.bz2 29958 RMD160 deb610db482dcab1d81425c8def8ec5851aa34b7 SHA1 79b0ee868c6745aa0be658c057f9331f32ab3805 SHA256 f63b8d9f0c259e66988c436faeb5481781a016f3cb796e4995ab966514fa2e24
 EBUILD acpi4asus-0.30.ebuild 1195 RMD160 f7fc51de5dfc39c30a81fdf476818b8593d272e8 SHA1 d7f9bf7eaf09307ed854d0992f2704bda98a674a SHA256 a09759182689833b314d1c6bb2b36ef157e71865ec1f4353745dcbcd05325719
 MD5 1ca8b30285c7547fcaea56bb2d131c12 acpi4asus-0.30.ebuild 1195
 RMD160 f7fc51de5dfc39c30a81fdf476818b8593d272e8 acpi4asus-0.30.ebuild 1195
@@ -25,10 +30,14 @@ EBUILD acpi4asus-0.40.ebuild 1435 RMD160 138a98c68ac25ba6a3a073f1ed5aa757368a90c
 MD5 a108b096a0efadb1a53cd6518892c2cb acpi4asus-0.40.ebuild 1435
 RMD160 138a98c68ac25ba6a3a073f1ed5aa757368a90ca acpi4asus-0.40.ebuild 1435
 SHA256 1a968f1c45bddc0ea9bafee4cc8bc09aa5bd019899e632804a5e8e4d4d2b1110 acpi4asus-0.40.ebuild 1435
-MISC ChangeLog 2343 RMD160 09dfe432a72ce4240fd6c4a9b5d8861733d68b60 SHA1 0bcb20cbc0e5c6bf699b484042f4548dff544d12 SHA256 fbfcbe294d874f67392d55cffc668b690b7c58e31dd0377ceb6133518d284ee1
-MD5 e6b27543e437559423d263adfd50914d ChangeLog 2343
-RMD160 09dfe432a72ce4240fd6c4a9b5d8861733d68b60 ChangeLog 2343
-SHA256 fbfcbe294d874f67392d55cffc668b690b7c58e31dd0377ceb6133518d284ee1 ChangeLog 2343
+EBUILD acpi4asus-0.41.ebuild 1374 RMD160 bcd0b4cf0a16fd002b7e26010f09b94c9bede115 SHA1 f6ea791a9c28657d4970484e9625416b79e4e2e5 SHA256 b7816fecdf3a614b82854148cba1853a630190ca24e3695dc1c6e1479f70d887
+MD5 b0e7d3a13afaa444fc412712912c22e4 acpi4asus-0.41.ebuild 1374
+RMD160 bcd0b4cf0a16fd002b7e26010f09b94c9bede115 acpi4asus-0.41.ebuild 1374
+SHA256 b7816fecdf3a614b82854148cba1853a630190ca24e3695dc1c6e1479f70d887 acpi4asus-0.41.ebuild 1374
+MISC ChangeLog 2570 RMD160 4c7304f679f2f00f7674a44d5c8a959b12678e90 SHA1 a035e0df3969299a9b43d3fd3c0236d454b995a9 SHA256 0627202793952dccf13a0aa7857d459c3eea84a17de51449bfada1212b0d30f6
+MD5 1a408c3487cd8220abcbe9c2d16319d2 ChangeLog 2570
+RMD160 4c7304f679f2f00f7674a44d5c8a959b12678e90 ChangeLog 2570
+SHA256 0627202793952dccf13a0aa7857d459c3eea84a17de51449bfada1212b0d30f6 ChangeLog 2570
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
@@ -48,3 +57,6 @@ SHA256 95245f3b635faf2be23567355e8d3e615a2542d20c4fee3b557dd2b0768f4499 files/di
 MD5 059f2854f7e3ff56fa2462b8f1b95ba4 files/digest-acpi4asus-0.40-r1 244
 RMD160 41cef4ccaf3ad0e941ea93569cae531b7dc37aa4 files/digest-acpi4asus-0.40-r1 244
 SHA256 95245f3b635faf2be23567355e8d3e615a2542d20c4fee3b557dd2b0768f4499 files/digest-acpi4asus-0.40-r1 244
+MD5 121c7c3eadbbc9692f1f38d65a8a449a files/digest-acpi4asus-0.41 244
+RMD160 a2d32b403ed069a3001544f0c90cc9156db026f7 files/digest-acpi4asus-0.41 244
+SHA256 3b7f243b079546000ef5755e74cb22a44322b47c5341288c6dcc6725d981fc5f files/digest-acpi4asus-0.41 244
diff --git a/app-laptop/acpi4asus/acpi4asus-0.41.ebuild b/app-laptop/acpi4asus/acpi4asus-0.41.ebuild
new file mode 100644
index 000000000000..bfafc659b6c0
--- /dev/null
+++ b/app-laptop/acpi4asus/acpi4asus-0.41.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild,v 1.1 2007/05/12 22:29:25 genstef Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="Acpi daemon and kernel module to control ASUS Laptop Hotkeys"
+HOMEPAGE="http://sourceforge.net/projects/acpi4asus"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+MODULE_NAMES="asus-laptop(acpi:${S}/driver)"
+BUILD_TARGETS=" "
+RDEPEND="sys-power/acpid"
+CONFIG_CHECK="LEDS_CLASS"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if kernel_is ge 2 6 21 ; then
+		epatch ${FILESDIR}/cvs.patch
+	fi
+}
+
+src_compile() {
+	linux-mod_src_compile
+	emake -C asus_acpid
+}
+
+
+src_install() {
+	linux-mod_src_install
+
+	dobin asus_acpid/asus_acpid
+	doman asus_acpid/asus_acpid.8
+
+	dodoc README Changelog
+
+	dodir /usr/share/${PN}/samples
+
+	dodir /usr/share/${PN}/samples/actions
+	insinto /usr/share/${PN}/samples/actions
+	doins samples/actions/*.sh
+
+	dodir /usr/share/${PN}/samples/events
+	insinto /usr/share/${PN}/samples/events
+	doins samples/events/*
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	einfo
+	einfo "Don't forget to create your ~/.asus_acpi,"
+	einfo "see /usr/share/doc/${PF}/README.gz for details"
+	einfo
+}
diff --git a/app-laptop/acpi4asus/files/cvs.patch b/app-laptop/acpi4asus/files/cvs.patch
new file mode 100644
index 000000000000..0d13484e1f55
--- /dev/null
+++ b/app-laptop/acpi4asus/files/cvs.patch
@@ -0,0 +1,165 @@
+--- ../../acpi4asus-0.41/driver/asus-laptop.c	2007-05-05 16:57:34.000000000 +0200
++++ ./asus-laptop.c	2007-05-05 17:08:51.000000000 +0200
+@@ -3,7 +3,7 @@
+  *
+  *
+  *  Copyright (C) 2002-2005 Julien Lerouge, 2003-2006 Karol Kozimor
+- *  Copyright (C) 2006 Corentin Chary
++ *  Copyright (C) 2006-2007 Corentin Chary
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -35,8 +35,8 @@
+ 
+ #include <linux/version.h>
+ 
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,19)
+-#warning "This module does not support 2.6.19"
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20)
++#warning "This module does not support 2.6.20"
+ #endif
+ 
+ #include <linux/autoconf.h>
+@@ -54,7 +54,7 @@
+ #include <acpi/acpi_bus.h>
+ #include <asm/uaccess.h>
+ 
+-#define ASUS_LAPTOP_VERSION "0.41"
++#define ASUS_LAPTOP_VERSION "0.42-cvs"
+ 
+ #define ASUS_HOTK_NAME          "Asus Laptop Support"
+ #define ASUS_HOTK_CLASS         "hotkey"
+@@ -222,11 +222,9 @@
+  */
+ static int read_brightness(struct backlight_device *bd);
+ static int update_bl_status(struct backlight_device *bd);
+-static struct backlight_properties asusbl_data = {
+-	.owner = THIS_MODULE,
++static struct backlight_ops asusbl_ops = {
+ 	.get_brightness = read_brightness,
+ 	.update_status = update_bl_status,
+-	.max_brightness = 15,
+ };
+ 
+ /* These functions actually update the LED's, and are called from a
+@@ -238,9 +236,9 @@
+ #define ASUS_LED(object, ledname)					\
+ 	static void object##_led_set(struct led_classdev *led_cdev,	\
+ 				     enum led_brightness value);	\
++	static void object##_led_update(struct work_struct *ignored);	\
+ 	static int object##_led_wk;					\
+-	static void object##_led_update(struct work_struct *dummy);	\
+-        static DECLARE_WORK(object##_led_work, object##_led_update);	\
++	static DECLARE_WORK(object##_led_work, object##_led_update);	\
+ 	static struct led_classdev object##_led = {			\
+ 		.name           = "asus:" ledname,			\
+ 		.brightness_set = object##_led_set,			\
+@@ -326,7 +324,7 @@
+ 		out = !out & 0x1;
+ 		break;
+ 	case GLED_ON:
+-		out += 1;
++		out = (out & 0x1) + 1;
+ 		break;
+ 	case GPS_ON:
+ 		handle = (out) ? gps_on_handle : gps_off_handle;
+@@ -349,7 +347,7 @@
+ 		object##_led_wk = value;				\
+ 		queue_work(led_workqueue, &object##_led_work);		\
+ 	}								\
+-	static void object##_led_update(struct work_struct *dummy)	\
++	static void object##_led_update(struct work_struct *ignored)	\
+ 	{								\
+ 		int value = object##_led_wk;				\
+ 		write_status(object##_set_handle, value, (mask));	\
+@@ -393,13 +391,8 @@
+ 	struct backlight_device *bd = asus_backlight_device;
+ 
+ 	if (bd) {
+-		down(&bd->sem);
+-		if (likely(bd->props)) {
+-			bd->props->power = blank;
+-			if (likely(bd->props->update_status))
+-				bd->props->update_status(bd);
+-		}
+-		up(&bd->sem);
++		bd->props.power = blank;
++		backlight_update_status(bd);
+ 	}
+ }
+ 
+@@ -433,13 +426,13 @@
+ static int update_bl_status(struct backlight_device *bd)
+ {
+ 	int rv;
+-	int value = bd->props->brightness;
++	int value = bd->props.brightness;
+ 
+ 	rv = set_brightness(bd, value);
+ 	if (rv)
+ 		return rv;
+ 
+-	value = (bd->props->power == FB_BLANK_UNBLANK) ? 1 : 0;
++	value = (bd->props.power == FB_BLANK_UNBLANK) ? 1 : 0;
+ 	return set_lcd_state(value);
+ }
+ 
+@@ -850,7 +843,7 @@
+ static int asus_hotk_get_info(void)
+ {
+ 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+-	struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
++
+ 	union acpi_object *model = NULL;
+ 	ulong bsts_result, hwrs_result;
+ 	char *string = NULL;
+@@ -864,11 +857,9 @@
+ 	 * HID), this bit will be moved. A global variable asus_info contains
+ 	 * the DSDT header.
+ 	 */
+-	status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);
++	status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info);
+ 	if (ACPI_FAILURE(status))
+ 		printk(ASUS_WARNING "Couldn't get the DSDT table header\n");
+-	else
+-		asus_info = dsdt.pointer;
+ 
+ 	/* We have to write 0 on init this far for all ASUS models */
+ 	if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
+@@ -1107,8 +1098,6 @@
+ 	sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group);
+ 	platform_device_unregister(asuspf_device);
+ 	platform_driver_unregister(&asuspf_driver);
+-
+-	kfree(asus_info);
+ }
+ 
+ static int asus_backlight_init(struct device *dev)
+@@ -1117,7 +1106,7 @@
+ 
+ 	if (brightness_set_handle && lcd_switch_handle) {
+ 		bd = backlight_device_register(ASUS_HOTK_FILE, dev,
+-					       NULL, &asusbl_data);
++					       NULL, &asusbl_ops);
+ 
+ 		if (IS_ERR(bd)) {
+ 			printk(ASUS_ERR
+@@ -1128,14 +1117,10 @@
+ 
+ 		asus_backlight_device = bd;
+ 
+-		down(&bd->sem);
+-		if (likely(bd->props)) {
+-			bd->props->brightness = read_brightness(NULL);
+-			bd->props->power = FB_BLANK_UNBLANK;
+-			if (likely(bd->props->update_status))
+-				bd->props->update_status(bd);
+-		}
+-		up(&bd->sem);
++		bd->props.max_brightness = 15;
++		bd->props.brightness = read_brightness(NULL);
++		bd->props.power = FB_BLANK_UNBLANK;
++		backlight_update_status(bd);
+ 	}
+ 	return 0;
+ }
diff --git a/app-laptop/acpi4asus/files/digest-acpi4asus-0.41 b/app-laptop/acpi4asus/files/digest-acpi4asus-0.41
new file mode 100644
index 000000000000..81e525d57e1f
--- /dev/null
+++ b/app-laptop/acpi4asus/files/digest-acpi4asus-0.41
@@ -0,0 +1,3 @@
+MD5 2b88f79ea714987189105193aff9a52f acpi4asus-0.41.tar.bz2 29958
+RMD160 deb610db482dcab1d81425c8def8ec5851aa34b7 acpi4asus-0.41.tar.bz2 29958
+SHA256 f63b8d9f0c259e66988c436faeb5481781a016f3cb796e4995ab966514fa2e24 acpi4asus-0.41.tar.bz2 29958