Updated imon-pad2key patch. This makes the option switchable via module-parameter instead of recompiling. Bug 196134

Package-Manager: portage-2.1.3.14

4 files changed, 282 insertions, 14 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index d48ba447e839..5f864dc98262 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.156 2007/10/14 10:16:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.157 2007/10/17 20:48:26 zzam Exp $
+
+  17 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/lirc-0.8.3_pre1-imon-pad2keys.patch, lirc-0.8.3_pre1.ebuild:
+  Updated imon-pad2key patch. This makes the option switchable via
+  module-parameter instead of recompiling. Bug 196134
 
   14 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
   +files/lirc-0.8.3_pre1-remotewonderplus.patch, lirc-0.8.3_pre1.ebuild:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1640ad43d321..8509811d19d3 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -69,6 +69,10 @@ AUX lirc-0.8.2-kernel-2.6.23.patch 1224 RMD160 6e780550ddeb24d2ef58702b01c263d6a
 MD5 c2fca4693f97f9bb5735f2b96ea6f205 files/lirc-0.8.2-kernel-2.6.23.patch 1224
 RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 files/lirc-0.8.2-kernel-2.6.23.patch 1224
 SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce files/lirc-0.8.2-kernel-2.6.23.patch 1224
+AUX lirc-0.8.3_pre1-imon-pad2keys.patch 10312 RMD160 6f61031cd3035289b2d52797dd02d027f593873d SHA1 c59aab62c9b59e27b93d5613e050438fcf2c6eed SHA256 2f79f223d5d2e998321284c50edea044ad26ab8607eae1e9e79e7c0ea6a8f2cd
+MD5 e0b6d2d19ba942d7702dd14cef641885 files/lirc-0.8.3_pre1-imon-pad2keys.patch 10312
+RMD160 6f61031cd3035289b2d52797dd02d027f593873d files/lirc-0.8.3_pre1-imon-pad2keys.patch 10312
+SHA256 2f79f223d5d2e998321284c50edea044ad26ab8607eae1e9e79e7c0ea6a8f2cd files/lirc-0.8.3_pre1-imon-pad2keys.patch 10312
 AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 SHA1 971ad8b27d57c31439a1f7fb87dac2dc39d6c1e8 SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29
 MD5 b3dbfd336f080c2040325fb7fdbf280a files/lirc-0.8.3_pre1-remotewonderplus.patch 943
 RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 files/lirc-0.8.3_pre1-remotewonderplus.patch 943
@@ -130,14 +134,14 @@ EBUILD lirc-0.8.2_pre2.ebuild 7768 RMD160 2437273d778a5ba426026aaafab4e2528c4619
 MD5 4c7863d2f6891a08995b48c67e42f7c8 lirc-0.8.2_pre2.ebuild 7768
 RMD160 2437273d778a5ba426026aaafab4e2528c4619e6 lirc-0.8.2_pre2.ebuild 7768
 SHA256 b35bdae2c7011fb84d2279d12de811dbc128266d197f83e4bb70bb9e5c8ec67b lirc-0.8.2_pre2.ebuild 7768
-EBUILD lirc-0.8.3_pre1.ebuild 7713 RMD160 643a0e7985f2811ad504227f69b892199fb8c707 SHA1 3e2d224df7f9f32ee5f1ffaf4d6bb33f739fdc88 SHA256 b529c1acde83ea9e466d4fc19bc3ac3a22e47dc6cb4138d64f9ef0761d72ec42
-MD5 70e8cc4cc0065827251081589df0bfee lirc-0.8.3_pre1.ebuild 7713
-RMD160 643a0e7985f2811ad504227f69b892199fb8c707 lirc-0.8.3_pre1.ebuild 7713
-SHA256 b529c1acde83ea9e466d4fc19bc3ac3a22e47dc6cb4138d64f9ef0761d72ec42 lirc-0.8.3_pre1.ebuild 7713
-MISC ChangeLog 24161 RMD160 66b04dd53d2a6a30e7b2c516e411229d0ac98f82 SHA1 737dad9ebb7ef5b2586628e56df866202d0d651b SHA256 0cad6e968d2704d00af4ad0f2a42e888a5d8de14ff9b69529258dd1fbdbbb7fc
-MD5 b795c1e0a8fa862aa8ec4889d4dfc407 ChangeLog 24161
-RMD160 66b04dd53d2a6a30e7b2c516e411229d0ac98f82 ChangeLog 24161
-SHA256 0cad6e968d2704d00af4ad0f2a42e888a5d8de14ff9b69529258dd1fbdbbb7fc ChangeLog 24161
+EBUILD lirc-0.8.3_pre1.ebuild 7773 RMD160 1cb320cb81a7c716d61eef825a0e4998c576c968 SHA1 ee40e30dde87f5c91f3ced50e623af66b637ae08 SHA256 a4f2493e557674ea445c0d61ccf99047c81df4a3568bc5928f522659391e4efb
+MD5 4678b420d56412d704259414f6c46b3b lirc-0.8.3_pre1.ebuild 7773
+RMD160 1cb320cb81a7c716d61eef825a0e4998c576c968 lirc-0.8.3_pre1.ebuild 7773
+SHA256 a4f2493e557674ea445c0d61ccf99047c81df4a3568bc5928f522659391e4efb lirc-0.8.3_pre1.ebuild 7773
+MISC ChangeLog 24406 RMD160 b04762dd31efafecacfdd9dadcffb9fbd2151a95 SHA1 1f4e6822883bca2da188d5c106380c9d109c68fd SHA256 149740e358db1269c184df6a47b4c4527798f08d52c8aa9e990ba145d59f71d1
+MD5 1a66f1109bd2ca444b968e17911bfcc6 ChangeLog 24406
+RMD160 b04762dd31efafecacfdd9dadcffb9fbd2151a95 ChangeLog 24406
+SHA256 149740e358db1269c184df6a47b4c4527798f08d52c8aa9e990ba145d59f71d1 ChangeLog 24406
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -166,7 +170,7 @@ SHA256 24e0ee567b857e06d93d64cbf7e9cbaee53a734e5c76862d9ff64dba06739dc3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHEeyYt2vP6XvVdOcRAmHJAKDSO22lkUO+l6NAiol9EuSUpbhIkQCgtw12
-sQja7k9QJm3ynPJ4+7u9rIs=
-=JJGk
+iD8DBQFHFnUgt2vP6XvVdOcRAtb6AJ0WdD0cNozwRrIeWSox9XUvTCe4KACg0gcs
+G/e9Wgg56PmRFAVKoZ+yLEo=
+=LQqh
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch
new file mode 100644
index 000000000000..59ed4c9a1ea4
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch
@@ -0,0 +1,257 @@
+diff -NuBbwr lirc-0.8.3pre1-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.3pre1/drivers/lirc_imon/lirc_imon.c
+--- lirc-0.8.3pre1-orig/drivers/lirc_imon/lirc_imon.c	2007-09-30 11:58:45.000000000 +0200
++++ lirc-0.8.3pre1/drivers/lirc_imon/lirc_imon.c	2007-10-14 14:20:07.000000000 +0200
+@@ -69,9 +69,9 @@
+ 
+ 
+ #define MOD_AUTHOR	"Venky Raju <dev@venky.ws>"
+-#define MOD_DESC	"Driver for Soundgraph iMON MultiMedia IR/VFD"
++#define MOD_DESC	"Driver for Soundgraph iMON MultiMedia IR/VFD w/imon pad2keys patch"
+ #define MOD_NAME	"lirc_imon"
+-#define MOD_VERSION	"0.3"
++#define MOD_VERSION	"0.3p2k"
+ 
+ #define VFD_MINOR_BASE	144	/* Same as LCD */
+ #define DEVFS_MODE	(S_IFCHR | S_IRUSR | S_IWUSR | \
+@@ -87,6 +87,7 @@
+ #define	TRUE		1
+ #define FALSE		0
+ 
++#define CURSOR_LIMIT    16
+ 
+ /* ------------------------------------------------------------
+  *		     P R O T O T Y P E S
+@@ -169,6 +170,10 @@
+ 		atomic_t busy;			/* write in progress */
+ 		int status;			/* status of tx completion */
+ 	} tx;
++        
++        int key_x;
++        int key_y;
++        int last_count;                      /* number of times pressed   */
+ };
+ 
+ #define LOCK_CONTEXT	down(&context->sem)
+@@ -235,6 +240,9 @@
+ 
+ static int debug;
+ 
++/* pad2keys module parameter. pad2keys patch active? */
++static int pad2keys_active = 0;
++
+ #if !defined(KERNEL_2_5)
+ 
+ #define MAX_DEVICES	4	/* In case there's more than one iMON device */
+@@ -258,10 +266,13 @@
+ 
+ MODULE_AUTHOR(MOD_AUTHOR);
+ MODULE_DESCRIPTION(MOD_DESC);
++MODULE_VERSION(MOD_VERSION);    /* MBr: was missing */
+ MODULE_LICENSE("GPL");
+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
+ module_param(debug, int, 0);
+ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)");
++module_param (pad2keys_active, int, 0);
++MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)");
+ 
+ static inline void delete_context(struct imon_context *context)
+ {
+@@ -684,6 +695,11 @@
+ 	context->rx.initial_space = 1;
+ 	context->rx.prev_bit = 0;
+ 
++        /* init pad context for pad2keys */
++        context ->key_x = 0;
++        context ->key_y = 0;
++        context ->last_count = 0;
++ 
+ 	usb_fill_int_urb(context->rx_urb, context->dev,
+ 		usb_rcvintpipe(context->dev,
+ 				context->rx_endpoint->bEndpointAddress),
+@@ -834,6 +850,94 @@
+ 
+ 	if (context->ir_onboard_decode) {
+ 		/* The signals have been decoded onboard the iMON controller */
++                
++                if (pad2keys_active)
++                {
++                   /* imon pad2keys patch
++                    *
++                    * make PAD and mouse buttons available for use with VDR,
++                    * based on pad-mouse-emu patch from venky's forum
++                    *
++                    * last change: M.Brakemeier 2007-10-14
++                    *
++                    * generated PAD key codes:
++                    * Mouse_N                  0x690281B7
++                    * Mouse_S                  0x688291B7
++                    * Mouse_W                  0x6A8281B7
++                    * Mouse_E                  0x688A81B7
++                    *
++                    * mouse buttons (non-synthetic):
++                    * MouseRightClick          0x688481B7
++                    * MouseLeftClick           0x688301B7
++                    */
++                    if((buf[0] & 0x40) &&
++                        !(buf[1] & 0x01 || buf[1] >> 2 & 0x01))
++                    {
++                        int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6;
++                        int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6;
++        
++                        if(buf[0] & 0x02)
++                            rel_x |= ~0x10+1;
++                        if(buf[0] & 0x01)
++                            rel_y |= ~0x10+1;
++        
++                        /* keyboard direction key emulation */
++                        if( context->last_count > 32 )
++                        {  /* Hopefully eliminate drift*/
++                            context->last_count=0;
++                            context->key_y=0;
++                            context->key_x=0;
++                        }
++                        context->last_count++;
++        
++                        /* limit decoded events */
++                        if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT )
++                        {
++                            if(abs(context->key_y ) > abs(context->key_x))
++                            { /* mouse s/n */
++                                if(context->key_y > 0 && rel_y > 0)
++                                { /* mouse s */
++                                    buf[0] = 0x68;
++                                    buf[1] = 0x82;
++                                    buf[2] = 0x91;
++                                }
++                                else if(context->key_y < 0 && rel_y < 0)
++                                { /* mouse n */
++                                    buf[0] = 0x69;
++                                    buf[1] = 0x02;
++                                    buf[2] = 0x81;
++                                }
++                            }
++                            else
++                            { /* mouse e/w*/
++                                if(context->key_x > 0 && rel_x > 0 )
++                                { /* mouse e */
++                                    buf[0] = 0x68;
++                                    buf[1] = 0x8A;
++                                    buf[2] = 0x81;
++                                }
++                                else if(context->key_x < 0 && rel_x < 0  )
++                                { /* mouse w */
++                                    buf[0] = 0x6A;
++                                    buf[1] = 0x82;
++                                    buf[2] = 0x81;
++                                }
++                            }
++                        }
++                        else
++                        {
++                            context->key_x += rel_x;
++                            context->key_y += rel_y;
++        
++                            return; /* discard those key codes */
++                        }
++                    }
++                    /* a key was pressed, reset count */
++                    context->key_x = 0;
++                    context->key_y = 0;
++                    context->last_count = 0;
++                }
++                
+ 		lirc_buffer_write_1(context->plugin->rbuf, buf);
+ 		wake_up(&context->plugin->rbuf->wait_poll);
+ 		return;
+diff -NuBbwr lirc-0.8.3pre1-orig/remotes/imon/lircd.conf.imon-pad2keys lirc-0.8.3pre1/remotes/imon/lircd.conf.imon-pad2keys
+--- lirc-0.8.3pre1-orig/remotes/imon/lircd.conf.imon-pad2keys	1970-01-01 01:00:00.000000000 +0100
++++ lirc-0.8.3pre1/remotes/imon/lircd.conf.imon-pad2keys	2007-10-14 14:13:01.000000000 +0200
+@@ -0,0 +1,88 @@
++# Please make this file available to others

++# by sending it to <lirc@bartelmus.de>

++#

++# this config file was generated

++# using lirc-0.8.3pre1 (imon w/pad2keys patch)

++#

++# contributed by M.Brakemeier

++#

++# brand:                       SoundGraph

++# model no. of remote control: iMON-PAD

++# devices being controlled by this remote:

++#

++

++begin remote

++

++  name     iMON-PAD

++  bits           32

++  eps            30

++  aeps          100

++

++  one             0     0

++  zero            0     0

++  gap          235965

++  min_repeat      1

++  toggle_bit      0

++

++    begin codes

++        AppExit                  0x288195B7

++        Power                    0x289115B7

++        Record                   0x298115B7

++        Play                     0x2A8115B7

++        Open                     0x29B1D5B7

++        Rewind                   0x2A8195B7

++        Pause                    0x2A9115B7

++        FastForward              0x2B8115B7

++        PrevChapter              0x2B9115B7

++        Stop                     0x2B9715B7

++        NextChapter              0x298195B7

++        Esc                      0x2BB715B7

++        Eject                    0x299395B7

++        AppLauncher              0x29B715B7

++        MultiMon                 0x2AB195B7

++        TaskSwitcher             0x2A9395B7

++        Mute                     0x2B9595B7

++        Vol+                     0x28A395B7

++        Vol-                     0x28A595B7

++        Ch+                      0x289395B7

++        Ch-                      0x288795B7

++        Timer                    0x2B8395B7

++        1                        0x28B595B7

++        2                        0x2BB195B7

++        3                        0x28B195B7

++        4                        0x2A8595B7

++        5                        0x299595B7

++        6                        0x2AA595B7

++        7                        0x2B9395B7

++        8                        0x2A8515B7

++        9                        0x2AA115B7

++        0                        0x2BA595B7

++        ShiftTab                 0x28B515B7

++        Tab                      0x29A115B7

++        Red                      0x2B8515B7 # MyMovie

++        Green                    0x299195B7 # MyMusic

++        Blue                     0x2BA115B7 # MyPhoto

++        Yellow                   0x28A515B7 # MyTV

++        Bookmark                 0x288515B7

++        Thumbnail                0x2AB715B7

++        AspectRatio              0x29A595B7

++        FullScreen               0x2AA395B7

++        Purple                   0x29A295B7 # MyDVD

++        Menu                     0x2BA385B7

++        Caption                  0x298595B7

++        Language                 0x2B8595B7

++        MouseKeyboard            0x299115B7

++        SelectSpace              0x2A9315B7

++        MouseMenu                0x28B715B7

++        MouseRightClick          0x688481B7

++        Enter                    0x28A195B7

++        MouseLeftClick           0x688301B7

++        WindowsKey               0x2B8195B7

++        Backspace                0x28A115B7

++        Mouse_N                  0x690281B7

++        Mouse_S                  0x688291B7

++        Mouse_W                  0x6A8281B7

++        Mouse_E                  0x688A81B7

++    end codes

++

++end remote 

diff --git a/app-misc/lirc/lirc-0.8.3_pre1.ebuild b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
index 63e90c9cf9d5..a553b043a112 100644
--- a/app-misc/lirc/lirc-0.8.3_pre1.ebuild
+++ b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.2 2007/10/14 10:16:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.3 2007/10/17 20:48:26 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -146,6 +146,8 @@ pkg_setup() {
 
 		if use lirc_devices_imon_pad2keys; then
 			add_device imon_pad "device imon_pad (with converting pad input to keyspresses)"
+			ewarn "You need to set the option pad2keys_active=1"
+			ewarn "when loading the module lirc_imon"
 		fi
 
 		if use lirc_devices_xboxusb; then
@@ -233,7 +235,7 @@ src_unpack() {
 	edos2unix contrib/lirc.rules
 
 	# Apply patches needed for some special device-types
-	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
+	epatch "${FILESDIR}"/${P}-imon-pad2keys.patch
 	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems