Patch which fixes backlight compilation with kernels>=2.6.34. Fixes bug #311621

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 83 insertions, 3 deletions

diff --git a/app-laptop/omnibook/ChangeLog b/app-laptop/omnibook/ChangeLog
index 93359d1bc475..f556f5043579 100644
--- a/app-laptop/omnibook/ChangeLog
+++ b/app-laptop/omnibook/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-laptop/omnibook
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.26 2009/11/01 16:30:24 hwoarang Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.27 2010/03/29 15:44:37 hwoarang Exp $
+
+*omnibook-20090628-r1 (29 Mar 2010)
+
+  29 Mar 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/backlight-2.6.34-omnibook-20090628.patch,
+  +omnibook-20090628-r1.ebuild:
+  Patch which fixes backlight compilation with kernels>=2.6.34. Thanks to
+  Tiago Batista <a19944@gmail.com> for the patch. Fixes bug #311621
 
   01 Nov 2009; Markos Chandras <hwoarang@gentoo.org>
   -omnibook-20080125.ebuild:
diff --git a/app-laptop/omnibook/Manifest b/app-laptop/omnibook/Manifest
index 7eb2b92b6239..775541db2332 100644
--- a/app-laptop/omnibook/Manifest
+++ b/app-laptop/omnibook/Manifest
@@ -1,5 +1,7 @@
+AUX backlight-2.6.34-omnibook-20090628.patch 1412 RMD160 063588a215535c8ed7c41a541b450fbe367c55e9 SHA1 465a52482f0f24ea9ae8d63fc2011a509705a14f SHA256 2f31afa510e75f45de23d435970c68cc164c8bc2852ab5386133b396719c4ab4
 AUX remove_owner.patch 636 RMD160 f7c63406f258af97fdf24aaecaea4c4bb60af2af SHA1 ec1641c0ac0cec333b80d23ba3c500bc5f142c28 SHA256 e1033c02b48705d7d9dc66480b6d69232a7e7d64aee2c5a1fdc9854229f771f4
 DIST omnibook-20090628.tar.gz 74902 RMD160 a0f87f219502410324fb360a662d267fb2b3bbad SHA1 02c82ac1115e0b9f6b7c8c45c5921579b61e65d3 SHA256 8ed58d82b3848ee78e012fb0a3faa597f53b0ae26c7586da4d9485763b032a19
+EBUILD omnibook-20090628-r1.ebuild 939 RMD160 b2faf5b910a044aef92fc883f7fc9c987327d8e3 SHA1 f1232929bc738eb7cc424d2940cde5e6995166cb SHA256 e69c45b4fa1242b1a022fb3f6bbd677f313607dc234c8939f9770662f6fe5b1c
 EBUILD omnibook-20090628.ebuild 880 RMD160 aa782fa23252bbab36261345c8c4e4504b2912dc SHA1 c0e11b6c0336891acba281473c0890d51abf7234 SHA256 87bb8d08e446214a23d3aeff66525efa97164a88a613527f1c5662a9f96000e2
-MISC ChangeLog 6126 RMD160 26aa2f6f4a7597498a5ff83ad0146123395caf6c SHA1 a960a1912b783edbd747690b00610813abe9f772 SHA256 0d53d90c429f7764f4072007b8e102651263d14981e97334ad51db59a3eb958c
+MISC ChangeLog 6442 RMD160 7a20dddedade7a41116d977c670f803af004e298 SHA1 1c86373bbd3ae4025d58b3edcbf37408486711ea SHA256 11efcf61d7be8f640f2f0eb948a8cf63065abd2ad58b858e2957c44fd33c1e1f
 MISC metadata.xml 264 RMD160 cc1e4ed8626ce4d64e9751426b6bfe745b4877a0 SHA1 b4a0bc5985aad0a3557c6014d06a57861babf191 SHA256 5e91db5222af6a504cc9809814fe28b5cab3e6c0099aa1d120ceb8d1587f3834
diff --git a/app-laptop/omnibook/files/backlight-2.6.34-omnibook-20090628.patch b/app-laptop/omnibook/files/backlight-2.6.34-omnibook-20090628.patch
new file mode 100644
index 000000000000..933d9b7f4921
--- /dev/null
+++ b/app-laptop/omnibook/files/backlight-2.6.34-omnibook-20090628.patch
@@ -0,0 +1,32 @@
+diff -ur omnibook-20090628/lcd.c omnibook-20090628-mod/lcd.c
+--- omnibook-20090628/lcd.c	2009-06-28 13:24:21.000000000 +0100
++++ omnibook-20090628-mod/lcd.c	2010-03-27 13:09:16.540833150 +0000
+@@ -146,8 +146,14 @@
+ 	}
+ 
+ #ifdef CONFIG_OMNIBOOK_BACKLIGHT
+-	
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
++	struct backlight_properties props;
++	memset (&props, 0, sizeof(struct backlight_properties));
++	props.max_brightness = omnibook_max_brightness;
++	omnibook_backlight_device =
++	    backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op, 
++	                              &omnibookbl_ops, &props);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+ 	omnibook_backlight_device =
+ 	    backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op, &omnibookbl_ops);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+@@ -161,8 +167,9 @@
+ 		printk(O_ERR "Unable to register as backlight device.\n");
+ 		return -ENODEV;
+ 	}
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
++	backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+ 	omnibook_backlight_device->props.max_brightness = omnibook_max_brightness;
+ 	backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
+ #else /* < 2.6.21 */
diff --git a/app-laptop/omnibook/omnibook-20090628-r1.ebuild b/app-laptop/omnibook/omnibook-20090628-r1.ebuild
new file mode 100644
index 000000000000..b87ae54fe08b
--- /dev/null
+++ b/app-laptop/omnibook/omnibook-20090628-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20090628-r1.ebuild,v 1.1 2010/03/29 15:44:37 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils linux-mod
+
+DESCRIPTION="Linux kernel module for (but not limited to) HP Omnibook support"
+HOMEPAGE="http://www.sourceforge.net/projects/omnibook"
+# Revision 280 from upstream SVN repository
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 -ppc ~x86"
+IUSE=""
+
+MODULE_NAMES="omnibook(char:)"
+BUILD_TARGETS=" "
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNEL=${KV_MAJOR}.${KV_MINOR} KSRC=${KV_DIR}"
+}
+
+src_prepare() {
+	epatch  "${FILESDIR}/remove_owner.patch"
+	epatch  "${FILESDIR}/backlight-2.6.34-${P}.patch"
+}
+
+src_install() {
+	dodoc doc/*
+	docinto misc
+	dodoc misc/*.patch misc/*.txt
+	docinto hotkeys
+	dodoc misc/hotkeys/*
+
+	linux-mod_src_install
+}