Fix brightness set on t61, #221955 by Jacek

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 86 insertions, 5 deletions

diff --git a/app-laptop/tpb/ChangeLog b/app-laptop/tpb/ChangeLog
index 0b56c146848b..2916fb66dca1 100644
--- a/app-laptop/tpb/ChangeLog
+++ b/app-laptop/tpb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/tpb
 # Copyright 2000-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpb/ChangeLog,v 1.20 2012/11/18 10:53:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpb/ChangeLog,v 1.21 2012/12/15 17:08:49 pacho Exp $
+
+*tpb-0.6.4-r1 (15 Dec 2012)
+
+  15 Dec 2012; Pacho Ramos <pacho@gentoo.org> +files/tpb-0.6.4-nvram.patch,
+  +tpb-0.6.4-r1.ebuild:
+  Fix brightness set on t61, #221955 by Jacek
 
   18 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop mobile herd as talked in gentoo-dev ML
diff --git a/app-laptop/tpb/Manifest b/app-laptop/tpb/Manifest
index 299ac241ffc4..e220c0cca9dd 100644
--- a/app-laptop/tpb/Manifest
+++ b/app-laptop/tpb/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tpb-0.6.4-nvram.patch 2321 SHA256 1979ed13e446db8f6cfe3e7af60fe51fd60481888fd73420f53fdd3f4dd82085 SHA512 0e59e3c01805c608738b6539e4cab78d7377b0550c08636b51f4df0ed02d3adb2d391d5e76bdf043a835fb523492dea8c0c7293915f0dc60df357dec4d759457 WHIRLPOOL ddee2555060017d017460a66132b1153f22188b1ceab4e7692a8bcae3aa19db64b70e03d0f3eea4fd3bccbfbb24d571abefa0a4e38d80943cdd5c1b8b10576c7
 AUX tpb-configure-fix.diff 478 SHA256 53baa3169b178737ffc59f108853cf79f78e8bf5ed0612ea3d95fe556cb4a0aa SHA512 461088eb82e66976a6bf591e4bb0de43e76c8aa9e404448d862535a27acb2857fcf3b5830edc6ece650857eb0e1ed24e7366c83d77d2e91b427f96f68928b32a WHIRLPOOL ca675b1025bc6cfda2ac4c9553c90de356d7eb24a2a331dc7fa740eb3bfce9ac77a403efed9f304e9ae814cf0e0e2be5f4f37ad1a1dc630614616ce1c9cd3c85
 DIST tpb-0.6.4.tar.gz 280316 SHA256 9ce4599ff4cb7397a3f49f747ff0225ef32bc6152778e55419f15aaf4cbff32a SHA512 1a12f4231b86bc3da2867670d5800f8f99f347743cf40b229c92485b6fe52e12b0222356d95d071ec26162ac778d2fe40867b4e635701620bc52236dbdb7b76a WHIRLPOOL 3b9fba89561d3c02cb2b36a266d52cba3d08f8305bcc2863b900ca3b8a2c8e5f1705bb1ffd20c03f8d28f531092ac26e2caaac634ad599f4601b9c6171652dfc
+EBUILD tpb-0.6.4-r1.ebuild 914 SHA256 d4a2ff28ea6cfc893e105c870fc3f4a6b1cb0aa30f1cdc8b94f8bbb6438066cf SHA512 a759ded175863b0f29b59b0ad0b777b449d8b638c7a666f1baf933d6901047d62082177081214c2dcb256ba2dc95c8351f5f3325699ec85c28c56e30ed457f78 WHIRLPOOL 67ca101bba375f97b681ab4e3b5b25e85f1a9469bef50c85414f0ef4e85b18f23c7960099314c8b65fc94f6734d83354043a46b46b8c9f7cc1451e8ce66ea251
 EBUILD tpb-0.6.4.ebuild 983 SHA256 fe2bca9b4e216cfe1dd4b3b862ad0f6ab2a91c18e65adcf437fdc9cbb12bebf2 SHA512 c137c9871807d67a3dd3d7c747c5f9e9423841310a87b4b65d284cc222bcb67c04d7f1df86f247f0fd976790eca7de2027f60f52f347543fb6c553b0228416fe WHIRLPOOL 6ccda8fb47853c79eb33c16c7cbf55f310a55f702fa01daffeedba8b80a4d2f50356b523a806237c259f844d3eda88a61e464cb28a9037938f487a643ee4c756
-MISC ChangeLog 3118 SHA256 6ad38ccf6603724f5005fc57558a1caa48e690f8facedf61669cdf699bfb78af SHA512 44b527ee35432140b1211087a96122e0bc57d02ced28d5bcc8f2c8cf604f26871bde3e84a5064c3f8a50b214095fc5fb49945901c1ecda80b4fd3a906887d811 WHIRLPOOL dec8db794c541465c04edd55a68a39cad67d8b07394bfa8eb36615b0858f58b2f241686b888376257375dc44b12fb4222f7900001a0b14155858cae8251d6667
+MISC ChangeLog 3294 SHA256 c5b039257dfb8b7146b2cf7b6099b960dcf2e421c830b7d3d72340d55a2fba6b SHA512 10e7c4b4b38347d77b17303a6b0238c863a39274fc7b19a69844db1448b9797bb29a61531ee4eac2c9ff9b035af1b086921d0c4ce9c4f15c9a359b5cbb73bcbe WHIRLPOOL a5389b45bdfbefa919dd36e7b27928137f45d2654aabcae1dd7817beaa7b10737db5581420ab4a5e350f6446f4db7d675bed01c10c3cd99da41e816706db70a8
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCovkIACgkQCaWpQKGI+9QtUwCfczYjGmDX8CW/rjtnTntl+irX
-4XQAn1vq2tsguwk7eykgQbx7LL5l35H0
-=6Zw2
+iEYEAREIAAYFAlDMrqIACgkQCaWpQKGI+9RrmACfUaD8+ApT0JZuTwX5vofWRc6v
+QlMAn2PORO7brx6xgV/oxpZ/SV1JnVGs
+=sPPf
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/tpb/files/tpb-0.6.4-nvram.patch b/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
new file mode 100644
index 000000000000..1ead9cbe5929
--- /dev/null
+++ b/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
@@ -0,0 +1,34 @@
+diff -Naur tpb-0.6.4-org/src/tpb.c tpb-0.6.4/src/tpb.c
+--- tpb-0.6.4-org/src/tpb.c	2005-07-18 16:15:59.000000000 +0200
++++ tpb-0.6.4/src/tpb.c	2008-05-13 15:15:34.000000000 +0200
+@@ -523,10 +523,10 @@
+     /* determine the state of the brightness buttons {{{ */
+     if(thinkpad_state.brightness_level != last_thinkpad_state.brightness_level) {
+       if(cfg.verbose == STATE_ON) {
+-	printf(_("Brightness changed: Level %d\n"), thinkpad_state.brightness_level * 100 / 7);
++	printf(_("Brightness changed: Level %d\n"), thinkpad_state.brightness_level * 100 / 15);
+       }
+       if(cfg.callback != NULL) {
+-	snprintf(callback_cmd, sizeof(callback_cmd), "%s brightness %d", cfg.callback, thinkpad_state.brightness_level * 100 / 7);
++	snprintf(callback_cmd, sizeof(callback_cmd), "%s brightness %d", cfg.callback, thinkpad_state.brightness_level * 100 / 15);
+ 	if(fork_app(callback_cmd) != 0) {
+ 	  _exit(0);
+ 	}
+@@ -537,7 +537,7 @@
+       if(osd_ptr != NULL &&
+ 	 ((cfg.osd == STATE_OFF && cfg.osdbrightness == STATE_ON) || (cfg.osd == STATE_ON && cfg.osdbrightness != STATE_OFF))) {
+ 	xosd_display(osd_ptr, 0, XOSD_string, _("Brightness"));
+-	xosd_display(osd_ptr, 1, XOSD_percentage, thinkpad_state.brightness_level * 100 / 7);
++	xosd_display(osd_ptr, 1, XOSD_percentage, thinkpad_state.brightness_level * 100 / 15);
+       }
+     }
+ #endif /* HAVE_LIBXOSD */ /* }}} */
+@@ -1031,7 +1031,7 @@
+   thinkpad_state->hibernate_toggle  = (thinkpad_state->hibernate_toggle  & ~0x01) | (( buffer[0x58] & 0x01)     );
+   thinkpad_state->display_state     =                                               (( buffer[0x59] & 0x03)     );
+   thinkpad_state->expand_toggle     = (thinkpad_state->expand_toggle     & ~0x01) | (( buffer[0x59] & 0x10) >> 4);
+-  thinkpad_state->brightness_level  =                                               (( buffer[0x5E] & 0x07)     );
++  thinkpad_state->brightness_level  =                                               (( buffer[0x5E] & 0x0F)     );
+   thinkpad_state->brightness_toggle = (thinkpad_state->brightness_toggle & ~0x01) | (( buffer[0x5E] & 0x20) >> 5);
+   thinkpad_state->volume_level      =                                               (( buffer[0x60] & 0x0f)     );
+   thinkpad_state->volume_toggle     = (thinkpad_state->volume_toggle     & ~0x01) | (( buffer[0x60] & 0x80) >> 7);
diff --git a/app-laptop/tpb/tpb-0.6.4-r1.ebuild b/app-laptop/tpb/tpb-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..970623a95a59
--- /dev/null
+++ b/app-laptop/tpb/tpb-0.6.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpb/tpb-0.6.4-r1.ebuild,v 1.1 2012/12/15 17:08:48 pacho Exp $
+
+EAPI=5
+inherit linux-info eutils
+
+DESCRIPTION="IBM ThinkPad buttons utility"
+HOMEPAGE="http://savannah.nongnu.org/projects/tpb/"
+SRC_URI="http://savannah.nongnu.org/download/tpb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
+IUSE="nls xosd"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXext
+	xosd? ( >=x11-libs/xosd-2.2.0 )"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~NVRAM"
+ERROR_NVRAM="${P} requires /dev/nvram support (CONFIG_NVRAM)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-configure-fix.diff
+	epatch "${FILESDIR}"/${P}-nvram.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xosd)
+}
+
+src_install() {
+	default
+	dodoc doc/{callback_example.sh,nvram.txt,tpbrc}
+}