[lirc/f14/master: 7/7] update to 0.8.7pre2 snap and patch for use with new in-kernel lirc
Jarod Wilson
jwilson at fedoraproject.org
Mon Aug 2 21:24:14 UTC 2010
commit 2b9bd2117fdf9d2f4a549e40b323791ce2dd1a6f
Author: Jarod Wilson <jarod at redhat.com>
Date: Mon Aug 2 17:23:31 2010 -0400
update to 0.8.7pre2 snap and patch for use with new in-kernel lirc
Signed-off-by: Jarod Wilson <jarod at redhat.com>
.gitignore | 4 +
lirc-0.8.4-make-remote-names-all-unique.patch | 67 +-
lirc-0.8.6-devinput-conf-update.patch | 1340 --------------------
lirc-0.8.6-devinput-pass-mouse-events.patch | 262 ----
lirc-0.8.6-firefly-def.patch | 11 +-
lirc-0.8.6-remove-obsolete-modes.patch | 429 -------
lirc-0.8.6-standardized-remote-keycodes.patch | 586 ++++++---
lirc-in-kernel-ioctls.patch | 116 ++
...se-new-instead-of-conf-as-filename-suffix.patch | 9 +-
lirc.spec | 27 +-
sources | 1 +
11 files changed, 587 insertions(+), 2265 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91d5474..5af7df2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
lirc-*.tar.bz2
+.build-*.log
+*.rpm
+lirc-*/
+lirc-0.8.7pre2.tar.bz2
diff --git a/lirc-0.8.4-make-remote-names-all-unique.patch b/lirc-0.8.4-make-remote-names-all-unique.patch
index 5519b1f..4f8f434 100644
--- a/lirc-0.8.4-make-remote-names-all-unique.patch
+++ b/lirc-0.8.4-make-remote-names-all-unique.patch
@@ -1,7 +1,8 @@
-diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb 2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb 2008-10-16 15:24:46.000000000 -0400
-@@ -1794,7 +1794,7 @@ end remote
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+@@ -1865,7 +1865,7 @@ end remote
begin remote
@@ -10,7 +11,7 @@ diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/a
bits 16
eps 30
aeps 100
-@@ -1872,7 +1872,7 @@ end remote
+@@ -1943,7 +1943,7 @@ end remote
begin remote
@@ -19,9 +20,10 @@ diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/a
bits 16
eps 30
aeps 100
-diff -Naurp lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2 2008-10-16 15:16:45.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2
++++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
@@ -11,7 +11,7 @@
begin remote
@@ -31,9 +33,10 @@ diff -Naurp lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4.new/remote
bits 7
eps 30
aeps 100
-diff -Naurp lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV 2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV 2008-10-16 15:23:52.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV
++++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
@@ -153,7 +153,7 @@ end remote
begin remote
@@ -43,9 +46,10 @@ diff -Naurp lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4.new/remote
bits 8
eps 30
aeps 100
-diff -Naurp lirc-0.8.4/remotes/generic/NEC-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-pulse.conf
---- lirc-0.8.4/remotes/generic/NEC-pulse.conf 2000-12-03 09:21:31.000000000 -0500
-+++ lirc-0.8.4.new/remotes/generic/NEC-pulse.conf 2008-10-16 15:19:20.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/NEC-pulse.conf
++++ lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf
@@ -7,7 +7,7 @@
begin remote
@@ -55,9 +59,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/NEC-pulse.conf lirc-0.8.4.new/remotes/gen
bits 16
flags SPACE_ENC|CONST_LENGTH
eps 30
-diff -Naurp lirc-0.8.4/remotes/generic/NEC-short-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf
---- lirc-0.8.4/remotes/generic/NEC-short-pulse.conf 2000-12-03 09:21:31.000000000 -0500
-+++ lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf 2008-10-16 15:19:10.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/NEC-short-pulse.conf
++++ lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf
@@ -9,7 +9,7 @@
begin remote
@@ -67,9 +72,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/NEC-short-pulse.conf lirc-0.8.4.new/remot
bits 16
flags SPACE_ENC|CONST_LENGTH
eps 30
-diff -Naurp lirc-0.8.4/remotes/generic/SONY12.conf lirc-0.8.4.new/remotes/generic/SONY12.conf
---- lirc-0.8.4/remotes/generic/SONY12.conf 2001-08-04 06:20:11.000000000 -0400
-+++ lirc-0.8.4.new/remotes/generic/SONY12.conf 2008-10-16 15:18:02.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/SONY12.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/SONY12.conf
++++ lirc-0.8.7pre2/remotes/generic/SONY12.conf
@@ -6,7 +6,7 @@
begin remote
@@ -79,9 +85,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/SONY12.conf lirc-0.8.4.new/remotes/generi
bits 7
flags SPACE_ENC|CONST_LENGTH
eps 30
-diff -Naurp lirc-0.8.4/remotes/generic/SONY20.conf lirc-0.8.4.new/remotes/generic/SONY20.conf
---- lirc-0.8.4/remotes/generic/SONY20.conf 2000-12-03 09:21:31.000000000 -0500
-+++ lirc-0.8.4.new/remotes/generic/SONY20.conf 2008-10-16 15:18:12.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/SONY20.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/SONY20.conf
++++ lirc-0.8.7pre2/remotes/generic/SONY20.conf
@@ -6,7 +6,7 @@
begin remote
@@ -91,9 +98,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/SONY20.conf lirc-0.8.4.new/remotes/generi
bits 7
flags SPACE_ENC|CONST_LENGTH
eps 30
-diff -Naurp lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge 2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge 2008-10-16 15:16:14.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge
++++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
@@ -278,14 +278,14 @@ end remote
#
# contributed by Matthew Wright
@@ -111,9 +119,10 @@ diff -Naurp lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4.new/rem
bits 13
flags RC5|CONST_LENGTH
eps 30
-diff -Naurp lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000 2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000 2008-10-16 15:17:46.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
@@ -74,7 +74,7 @@ end remote
begin remote
diff --git a/lirc-0.8.6-firefly-def.patch b/lirc-0.8.6-firefly-def.patch
index ed88177..cd86ddd 100644
--- a/lirc-0.8.6-firefly-def.patch
+++ b/lirc-0.8.6-firefly-def.patch
@@ -1,7 +1,8 @@
-diff -upr lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb 2010-05-18 14:56:58.000000000 +0100
-+++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb 2010-05-18 15:01:33.000000000 +0100
-@@ -2124,7 +2124,7 @@ end remote
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+@@ -2195,7 +2195,7 @@ end remote
# this config file was automatically generated
# using lirc-0.8.2(default) on Wed Feb 6 01:32:32 2008
#
@@ -10,7 +11,7 @@ diff -upr lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/ati
#
# brand: Snapstream Firefly
# model no. of remote control: R1000
-@@ -2144,63 +2144,111 @@ begin remote
+@@ -2215,63 +2215,111 @@ begin remote
pre_data 0x14
post_data_bits 16
post_data 0x0
diff --git a/lirc-0.8.6-standardized-remote-keycodes.patch b/lirc-0.8.6-standardized-remote-keycodes.patch
index b0cf63d..b061416 100644
--- a/lirc-0.8.6-standardized-remote-keycodes.patch
+++ b/lirc-0.8.6-standardized-remote-keycodes.patch
@@ -1,6 +1,7 @@
-diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/adstech/lircd.conf.usbx-707
++++ lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707
@@ -26,50 +26,50 @@ begin remote
toggle_bit_mask 0x0
@@ -90,9 +91,10 @@ diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remote
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/animax/lircd.conf.animax
---- lirc-0.8.6/remotes/animax/lircd.conf.animax 1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.6.new/remotes/animax/lircd.conf.animax 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/animax/lircd.conf.animax
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/animax/lircd.conf.animax
++++ lirc-0.8.7pre2/remotes/animax/lircd.conf.animax
@@ -38,79 +38,79 @@ begin remote
begin codes
@@ -206,9 +208,10 @@ diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/a
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/apple/lircd.conf.macmini lirc-0.8.6.new/remotes/apple/lircd.conf.macmini
---- lirc-0.8.6/remotes/apple/lircd.conf.macmini 2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.6.new/remotes/apple/lircd.conf.macmini 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/apple/lircd.conf.macmini
++++ lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini
@@ -26,12 +26,12 @@ begin remote
ignore_mask 0x0000ff01
@@ -228,9 +231,10 @@ diff -Naurp lirc-0.8.6/remotes/apple/lircd.conf.macmini lirc-0.8.6.new/remotes/a
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asus lirc-0.8.6.new/remotes/asus/lircd.conf.asus
---- lirc-0.8.6/remotes/asus/lircd.conf.asus 2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.6.new/remotes/asus/lircd.conf.asus 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asus
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asus
++++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asus
@@ -19,38 +19,38 @@ begin remote
toggle_bit 0
@@ -298,9 +302,10 @@ diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asus lirc-0.8.6.new/remotes/asus/
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asusdh lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.6/remotes/asus/lircd.conf.asusdh 2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asusdh
++++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh
@@ -14,17 +14,17 @@ begin remote
post_data_bits 0
@@ -325,9 +330,10 @@ diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asusdh lirc-0.8.6.new/remotes/asu
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.digimatrix lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.6/remotes/asus/lircd.conf.digimatrix 2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.digimatrix
++++ lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix
@@ -28,43 +28,43 @@ begin remote
@@ -404,9 +410,10 @@ diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.digimatrix lirc-0.8.6.new/remotes
dvd_audio 0x00000000000050AF
ui_size 0x0000000000008877
ui_on_off 0x00000000000028D7
-diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb 2009-01-18 13:30:14.000000000 -0500
-+++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atilibusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb
@@ -30,58 +30,58 @@ begin remote
@@ -518,9 +525,10 @@ diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6.new/remote
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb 2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
@@ -37,54 +37,54 @@ begin remote
@@ -618,9 +626,10 @@ diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/a
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia 2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia
++++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia
@@ -34,37 +34,37 @@ begin remote
@@ -683,9 +692,10 @@ diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6.new/rem
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia98
++++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98
@@ -29,49 +29,49 @@ begin remote
begin codes
@@ -765,9 +775,10 @@ diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6.new/r
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate 2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.vdomate
++++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate
@@ -27,33 +27,33 @@ begin remote
@@ -820,9 +831,10 @@ diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6.new/remot
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy 2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy
++++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy
@@ -26,36 +26,36 @@ begin remote
@@ -885,9 +897,10 @@ diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6.new/remotes
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2
++++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
@@ -27,29 +27,29 @@ begin remote
begin codes
TV/FM 0x0000000000000043
@@ -937,9 +950,10 @@ diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6.new/remote
RESET 0x000000000000004D
FREEZE 0x000000000000004F
end codes
-diff -Naurp lirc-0.8.6/remotes/caraca/lircd.conf.caraca lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.6/remotes/caraca/lircd.conf.caraca 2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/caraca/lircd.conf.caraca
++++ lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca
@@ -17,29 +17,29 @@ begin remote
bits 16
@@ -991,9 +1005,10 @@ diff -Naurp lirc-0.8.6/remotes/caraca/lircd.conf.caraca lirc-0.8.6.new/remotes/c
TV/FM 0x3fe3
end codes
-diff -Naurp lirc-0.8.6/remotes/chronos/lircd.conf.chronos lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.6/remotes/chronos/lircd.conf.chronos 2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/chronos/lircd.conf.chronos
++++ lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos
@@ -20,37 +20,37 @@ begin remote
toggle_bit 0
@@ -1057,9 +1072,10 @@ diff -Naurp lirc-0.8.6/remotes/chronos/lircd.conf.chronos lirc-0.8.6.new/remotes
+ KEY_RIGHT 0x0000000000000007
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x 2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/cph03x/lircd.conf.cph03x
++++ lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x
@@ -32,39 +32,39 @@ begin remote
repeat_bit 0
@@ -1123,9 +1139,10 @@ diff -Naurp lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6.new/remotes/c
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb 2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.alsa_usb
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb
@@ -34,38 +34,38 @@ begin remote
@@ -1192,9 +1209,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6.new/remot
Step 0x0000000000007E81
end codes
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox 2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.breakoutbox
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox
@@ -19,37 +19,37 @@ begin remote
begin codes
DVD/CD 0x0000000000000001
@@ -1259,9 +1277,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6.new/re
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.creative lirc-0.8.6.new/remotes/creative/lircd.conf.creative
---- lirc-0.8.6/remotes/creative/lircd.conf.creative 2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.creative 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.creative
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.creative
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.creative
@@ -23,30 +23,30 @@ begin remote
toggle_bit 0
@@ -1312,9 +1331,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.creative lirc-0.8.6.new/remot
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.livedrive lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.6/remotes/creative/lircd.conf.livedrive 2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.livedrive
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive
@@ -29,40 +29,40 @@ begin remote
@@ -1384,9 +1404,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.livedrive lirc-0.8.6.new/remo
end codes
-diff -Naurp lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV 2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV
++++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
@@ -22,42 +22,42 @@ begin remote
toggle_bit 0
@@ -1461,9 +1482,10 @@ diff -Naurp lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6.new/remote
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/ea65/lircd.conf.ea65 lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.6/remotes/ea65/lircd.conf.ea65 2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/ea65/lircd.conf.ea65
++++ lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65
@@ -18,53 +18,53 @@ begin remote
htpc 0x0011811b
dvd/vcd 0x00128100
@@ -1552,9 +1574,10 @@ diff -Naurp lirc-0.8.6/remotes/ea65/lircd.conf.ea65 lirc-0.8.6.new/remotes/ea65/
stop-eject 0x00238107
mode- 0x00ff1080
mode+ 0x00ff1180
-diff -Naurp lirc-0.8.6/remotes/ericsson/lircd.conf.bte lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.6/remotes/ericsson/lircd.conf.bte 2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/ericsson/lircd.conf.bte
++++ lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte
@@ -11,29 +11,29 @@
begin remote
@@ -1616,9 +1639,10 @@ diff -Naurp lirc-0.8.6/remotes/ericsson/lircd.conf.bte lirc-0.8.6.new/remotes/er
WAP 0x3a4f # ':O'
end codes
-diff -Naurp lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge 2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge
++++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
@@ -27,25 +27,25 @@ begin remote
repeat_bit 2
@@ -1662,9 +1686,10 @@ diff -Naurp lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6.new/rem
RESERVED 0x000000000000101E
MINIMIZE 0x0000000000001026
end codes
-diff -Naurp lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo 2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo
++++ lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo
@@ -26,36 +26,36 @@ begin remote
@@ -1725,9 +1750,10 @@ diff -Naurp lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6.new
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon lirc-0.8.6.new/remotes/imon/lircd.conf.imon
---- lirc-0.8.6/remotes/imon/lircd.conf.imon 2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon
@@ -29,48 +29,48 @@ begin remote
duty_cycle 33
@@ -1813,10 +1839,11 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon lirc-0.8.6.new/remotes/imon/
DVD.Caption 0x00000000000052AD
DVD.Language 0x000000000000D22D
Full.Screen 0x00000000000032CD
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.6/remotes/imon/lircd.conf.imon-knob 2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob 2009-09-13 21:37:03.000000000 -0400
-@@ -23,74 +23,67 @@ begin remote
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-knob
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob
+@@ -23,83 +23,77 @@ begin remote
begin codes
@@ -1840,7 +1867,7 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
+ KEY_PLAY 0x2A8115B7
+ KEY_OPEN 0x29B195B7
+ KEY_VOLUMEUP 0x000100FF
-+ KEY_VOLUMEDOWN 0x010000FF
++ KEYVOLUMEDOWN 0x010000FF
+ KEY_MUTE 0x000008FF
+ KEY_REWIND 0x2A8195B7
+ KEY_PAUSE 0x2A9115B7
@@ -1862,8 +1889,147 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
- CursorUp 0x6902F9B7
- CursorRight 0x68A281B7
- CursorDown 0x6882A1B7
++ BTN_RIGHT 0x688481B7
++ KEY_ENTER 0x28A195B7
++ BTN_LEFT 0x688301B7
++ KEY_LEFT 0x6ABA81B7
++ KEY_UP 0x6902F9B7
++ KEY_RIGHT 0x68A281B7
++ KEY_DOWN 0x6882A1B7
+ # version 2 of keypad
+- CursorUp 0x2aa515b7
+- CursorDown 0x289515b7
+- CursorLeft 0x29a515b7
+- CursorRight 0x2ba515b7
++ KEY_UP 0x2aa515b7
++ KEY_DOWN 0x289515b7
++ KEY_LEFT 0x29a515b7
++ KEY_RIGHT 0x2ba515b7
+ # version 3 of keypad
+- CursorUp 0x01008000
+- CursorDown 0x01007f00
+- CursorLeft 0x01000080
+- CursorRight 0x0100007f
- Esc 0x2BB715B7
- Eject 0x299395B7
++ KEY_UP 0x01008000
++ KEY_DOWN 0x01007f00
++ KEY_LEFT 0x01000080
++ KEY_RIGHT 0x0100007f
++ KEY_ESC 0x2BB715B7
++ KEY_EJECT 0x299395B7
+ AppLauncher 0x29B715B7
+ MultiMon 0x2AB195B7
+ TaskSwitcher 0x2A9395B7
+- Mute 0x2B9595B7
+- VolUp 0x28A395B7
+- VolDown 0x28A595B7
+- ChUp 0x289395B7
+- ChDown 0x288795B7
++ KEY_MUTE 0x2B9595B7
++ KEY_VOLUMEUP 0x28A395B7
++ KEY_VOLUMEDOWN 0x28A595B7
++ KEY_CHANNELUP 0x289395B7
++ KEY_CHANNELDOWN 0x288795B7
+ Timer 0x2B8395B7
+- 1 0x28B595B7
+- 2 0x2BB195B7
+- 3 0x28B195B7
+- 4 0x2A8595B7
+- 5 0x299595B7
+- 6 0x2AA595B7
+- 7 0x2B9395B7
+- 8 0x2A8515B7
+- 9 0x2AA115B7
++ KEY_1 0x28B595B7
++ KEY_2 0x2BB195B7
++ KEY_3 0x28B195B7
++ KEY_4 0x2A8595B7
++ KEY_5 0x299595B7
++ KEY_6 0x2AA595B7
++ KEY_7 0x2B9395B7
++ KEY_8 0x2A8515B7
++ KEY_9 0x2AA115B7
+ ShiftTab 0x28B515B7
+- 0 0x2BA595B7
+- Tab 0x29A115B7
+- MyMovie 0x2B8515B7
+- MyMusic 0x299195B7
+- MyPhoto 0x2BA115B7
+- MyTV 0x28A515B7
+- Bookmark 0x288515B7
++ KEY_0 0x2BA595B7
++ KEY_TAB 0x29A115B7
++ KEY_VIDEO 0x2B8515B7
++ KEY_AUDIO 0x299195B7
++ KEY_PHOTO 0x2BA115B7
++ KEY_TV 0x28A515B7
++ KEY_BOOKMARKS 0x288515B7
+ Thumbnail 0x2AB715B7
+ AspectRatio 0x29A595B7
+ FullScreen 0x2AA395B7
+- MyDVD 0x29A295B7
+- Menu 0x2BA385B7
++ KEY_DVD 0x29A295B7
++ KEY_MENU 0x2BA385B7
+ Caption 0x298595B7
+- Language 0x2B8595B7
+-# these codes may be wrong, but they were included in the first version of
+-# this config file
+- 0 0x2BA595BF
+- NextChapter 0x298195BF
+- Thumbnail 0x2AB715BF
+- FullScreen 0x2AA395BF
++ KEY_LANGUAGE 0x2B8595B7
+
+ end codes
+
+@@ -124,83 +118,77 @@ begin remote
+
+
+ begin codes
+- AppExit 0x288195B7
+- Power 0x289115B7
+- Record 0x298115B7
+- Play 0x2A8115B7
+- Open 0x29B195B7
+- KnobVolUp 0x000100FF
+- KnobVolDown 0x010000FF
+- KnobMute 0x000008FF
+- Rewind 0x2A8195B7
+- Pause 0x2A9115B7
+- FastForward 0x2B8115B7
+- PrevChapter 0x2B9115B7
+- Stop 0x2B9715B7
+- NextChapter 0x298195B7
++ KEY_EXIT 0x288195B7
++ KEY_POWER 0x289115B7
++ KEY_RECORD 0x298115B7
++ KEY_PLAY 0x2A8115B7
++ KEY_OPEN 0x29B195B7
++ KEY_VOLUMEUP 0x000100FF
++ KEYVOLUMEDOWN 0x010000FF
++ KEY_MUTE 0x000008FF
++ KEY_REWIND 0x2A8195B7
++ KEY_PAUSE 0x2A9115B7
++ KEY_FASTFORWARD 0x2B8115B7
++ KEY_PREVIOUS 0x2B9115B7
++ KEY_STOP 0x2B9715B7
++ KEY_NEXT 0x298195B7
+ WindowsKey 0x2B8195B7
+- Backspace 0x28A115B7
++ KEY_BACKSPACE 0x28A115B7
+ MouseKeyboard 0x299115B7
+- SelectSpace 0x2A9315B7
++ KEY_SELECT 0x2A9315B7
+ MouseMenu 0x28B715B7
+- MouseRightClick 0x688481B7
+- Enter 0x28A195B7
+- MouseLeftClick 0x688301B7
+- CursorLeft 0x6ABA81B7
+- CursorUp 0x6902F9B7
+- CursorRight 0x68A281B7
+- CursorDown 0x6882A1B7
+ BTN_RIGHT 0x688481B7
+ KEY_ENTER 0x28A195B7
+ BTN_LEFT 0x688301B7
@@ -1871,8 +2037,28 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
+ KEY_UP 0x6902F9B7
+ KEY_RIGHT 0x68A281B7
+ KEY_DOWN 0x6882A1B7
+ # version 2 of keypad
+- CursorUp 0x2aa515b7
+- CursorDown 0x289515b7
+- CursorLeft 0x29a515b7
+- CursorRight 0x2ba515b7
++ KEY_UP 0x2aa515b7
++ KEY_DOWN 0x289515b7
++ KEY_LEFT 0x29a515b7
++ KEY_RIGHT 0x2ba515b7
+ # version 3 of keypad
+- CursorUp 0x01008000
+- CursorDown 0x01007f00
+- CursorLeft 0x01000080
+- CursorRight 0x0100007f
+- Esc 0x2BB715B7
+- Eject 0x299395B7
++ KEY_UP 0x01008000
++ KEY_DOWN 0x01007f00
++ KEY_LEFT 0x01000080
++ KEY_RIGHT 0x0100007f
+ KEY_ESC 0x2BB715B7
-+ KEY_EJECTCD 0x299395B7
++ KEY_EJECT 0x299395B7
AppLauncher 0x29B715B7
MultiMon 0x2AB195B7
TaskSwitcher 0x2A9395B7
@@ -1935,14 +2121,14 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
- NextChapter 0x298195BF
- Thumbnail 0x2AB715BF
- FullScreen 0x2AA395BF
--
+ KEY_LANGUAGE 0x2B8595B7
+
end codes
- end remote
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-pad lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.6/remotes/imon/lircd.conf.imon-pad 2009-09-03 10:33:19.000000000 -0400
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad 2009-09-13 22:12:32.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-pad
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad
@@ -24,99 +24,99 @@ begin remote
@@ -2286,9 +2472,10 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-pad lirc-0.8.6.new/remotes/i
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc 2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-rsc
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc
@@ -27,48 +27,48 @@ begin remote
gap 100000
@@ -2370,9 +2557,10 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6.new/remotes/i
Full.Screen 0x000000000000916e
end codes
-diff -Naurp lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci 2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci
++++ lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci
@@ -26,41 +26,41 @@ begin remote
@@ -2442,9 +2630,10 @@ diff -Naurp lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6.new/remot
SYNC 0x0000000000000003
end codes
-diff -Naurp lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/kanam_accent/lircd.conf.IR-100
++++ lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100
@@ -29,47 +29,47 @@ begin remote
@@ -2534,9 +2723,10 @@ diff -Naurp lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6.new/rem
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one 2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/knc_one/lircd.conf.knc_one
++++ lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one
@@ -26,37 +26,37 @@ begin remote
begin codes
@@ -2601,9 +2791,10 @@ diff -Naurp lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6.new/remotes
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/kworld/lircd.conf.kworld lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.6/remotes/kworld/lircd.conf.kworld 2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/kworld/lircd.conf.kworld
++++ lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld
@@ -29,36 +29,36 @@ begin remote
@@ -2662,9 +2853,10 @@ diff -Naurp lirc-0.8.6/remotes/kworld/lircd.conf.kworld lirc-0.8.6.new/remotes/k
snapshot 0x00000000000058A7
mts 0x000000000000B04F
function- 0x00000000000020DF
-diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
@@ -18,54 +18,54 @@ begin remote
gap 120000
@@ -2757,9 +2949,10 @@ diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6.new/remotes
TIMESHIFT 0x0000000000000035
end codes
-diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0007
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007
@@ -44,43 +44,43 @@ begin remote
begin codes
@@ -2829,9 +3022,10 @@ diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6.new/remotes
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0010
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010
@@ -43,69 +43,69 @@ begin remote
duty_cycle 33
@@ -2941,9 +3135,10 @@ diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6.new/remotes
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo 2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/life-view/lircd.conf.flyvideo
++++ lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo
@@ -35,50 +35,50 @@ begin remote
duty_cycle 33
@@ -3024,9 +3219,10 @@ diff -Naurp lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6.new/remo
end codes
-diff -Naurp lirc-0.8.6/remotes/logitech/lircd.conf.logitech lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.6/remotes/logitech/lircd.conf.logitech 2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/logitech/lircd.conf.logitech
++++ lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech
@@ -23,41 +23,41 @@ begin remote
repeat_bit 0
@@ -3096,9 +3292,10 @@ diff -Naurp lirc-0.8.6/remotes/logitech/lircd.conf.logitech lirc-0.8.6.new/remot
MOUSE_N 0x0000000000000040
MOUSE_NNE 0x0000000000000041
MOUSE_NE 0x0000000000000042
-diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb 2009-07-16 16:44:45.000000000 -0400
-+++ lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/mceusb/lircd.conf.mceusb
++++ lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb
@@ -1,7 +1,8 @@
#
-# brand: HP
@@ -3111,8 +3308,8 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
#
# RC-6 config file
#
-@@ -54,10 +55,10 @@ begin remote
- begin codes
+@@ -59,10 +60,10 @@ begin remote
+
#unused by HP remote
- Blue 0x00007ba1
@@ -3126,7 +3323,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
Teletext 0x00007ba5
#ba6 - bae unused
-@@ -71,7 +72,7 @@ begin remote
+@@ -76,7 +77,7 @@ begin remote
BAD 0x00007bad
BAE 0x00007bae
@@ -3135,7 +3332,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
Print 0x00007bb1
#bb2 - bb4 unused
-@@ -79,11 +80,11 @@ begin remote
+@@ -84,11 +85,11 @@ begin remote
BB3 0x00007bb3
BB4 0x00007bb4
@@ -3150,7 +3347,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
#bba - bbf unused
BBA 0x00007bba
-@@ -104,7 +105,7 @@ begin remote
+@@ -109,7 +110,7 @@ begin remote
BC9 0x00007bc9
BCA 0x00007bca
@@ -3159,7 +3356,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
SlideShow 0x00007bcc
Visualization 0x00007bcd
-@@ -123,50 +124,50 @@ begin remote
+@@ -128,50 +129,50 @@ begin remote
Aspect 0x00007bd8
Guide 0x00007bd9
LiveTV 0x00007bda
@@ -3244,9 +3441,10 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell 2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/packard_bell/lircd.conf.packard_bell
++++ lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell
@@ -53,38 +53,38 @@ begin remote
repeat 9050 2250
@@ -3311,9 +3509,10 @@ diff -Naurp lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6.n
Star 0x0000000000007F80
Hash 0x0000000000006B94
end codes
-diff -Naurp lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak 2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pcmak/lircd.conf.pcmak
++++ lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak
@@ -23,18 +23,18 @@ begin remote
repeat_bit 0
@@ -3457,9 +3656,10 @@ diff -Naurp lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6.new/remotes/pcm
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv 2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv
++++ lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv
@@ -24,30 +24,30 @@ begin remote
toggle_bit 0
@@ -3559,9 +3759,10 @@ diff -Naurp lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6.new/r
middle 0x0000000000000014
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv 1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv
@@ -13,22 +13,22 @@ begin remote
begin codes
TV/FM 0x00000000000000e7
@@ -3600,9 +3801,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv lirc-0.8.6.new/remote
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878
@@ -16,39 +16,39 @@ begin remote
repeat_bit 0
@@ -3669,9 +3871,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6.new/
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro 2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_pro
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro
@@ -31,15 +31,15 @@ begin remote
begin codes
@@ -3722,9 +3925,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6.new/re
end codes
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster 2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.remotemaster
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster
@@ -25,39 +25,39 @@ begin remote
gap 189264
@@ -3792,9 +3996,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6.new/
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/provideo/lircd.conf.pv951 lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.6/remotes/provideo/lircd.conf.pv951 2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/provideo/lircd.conf.pv951
++++ lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951
@@ -31,28 +31,28 @@ begin remote
repeat_bit 0
@@ -3840,9 +4045,10 @@ diff -Naurp lirc-0.8.6/remotes/provideo/lircd.conf.pv951 lirc-0.8.6.new/remotes/
func 0x0000000000009867
ttx 0x000000000000B04F
pg+ 0x000000000000708F
-diff -Naurp lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/remotec/lircd.conf.BW6130
++++ lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130
@@ -20,20 +20,20 @@ begin remote
toggle_bit 0
@@ -3878,9 +4084,10 @@ diff -Naurp lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6.new/remotes/
MOUSE_SLOW_N 0x95
MOUSE_SLOW_NNE 0xd1
MOUSE_SLOW_NE 0xcd
-diff -Naurp lirc-0.8.6/remotes/samsung/lircd.conf.samsung lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.6/remotes/samsung/lircd.conf.samsung 2008-10-05 04:42:36.000000000 -0400
-+++ lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/samsung/lircd.conf.samsung
++++ lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung
@@ -28,60 +28,60 @@ begin remote
begin codes
@@ -3991,9 +4198,10 @@ diff -Naurp lirc-0.8.6/remotes/samsung/lircd.conf.samsung lirc-0.8.6.new/remotes
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/sasem/lircd.conf.sasem lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.6/remotes/sasem/lircd.conf.sasem 2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/sasem/lircd.conf.sasem
++++ lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem
@@ -33,47 +33,47 @@ begin remote
@@ -4074,9 +4282,10 @@ diff -Naurp lirc-0.8.6/remotes/sasem/lircd.conf.sasem lirc-0.8.6.new/remotes/sas
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic 2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/sigma_designs/lircd.conf.realmagic
++++ lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic
@@ -30,43 +30,43 @@ begin remote
begin codes
@@ -4153,9 +4362,10 @@ diff -Naurp lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6.new
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/silitek/lircd.conf.silitek lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.6/remotes/silitek/lircd.conf.silitek 2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/silitek/lircd.conf.silitek
++++ lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek
@@ -30,68 +30,68 @@ begin remote
MOUSE_SSE 0x0000000000aa0004
MOUSE_SE 0x0000000000aa0003
@@ -4273,9 +4483,10 @@ diff -Naurp lirc-0.8.6/remotes/silitek/lircd.conf.silitek lirc-0.8.6.new/remotes
+ KEY_CLOSE 0x0000000000cc5d62
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap 2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/streamzap/lircd.conf.streamzap
++++ lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap
@@ -27,41 +27,41 @@ begin remote
@@ -4353,9 +4564,10 @@ diff -Naurp lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6.new/rem
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI 2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/technisat/lircd.conf.mediafocusI
++++ lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI
@@ -30,11 +30,11 @@ begin remote
duty_cycle 33
@@ -4373,9 +4585,10 @@ diff -Naurp lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6.new/r
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/tekram/lircd.conf.m230 lirc-0.8.6.new/remotes/tekram/lircd.conf.m230
---- lirc-0.8.6/remotes/tekram/lircd.conf.m230 2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.6.new/remotes/tekram/lircd.conf.m230 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/tekram/lircd.conf.m230
++++ lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230
@@ -13,36 +13,36 @@ begin remote
name M230
bits 8
@@ -4436,9 +4649,10 @@ diff -Naurp lirc-0.8.6/remotes/tekram/lircd.conf.m230 lirc-0.8.6.new/remotes/tek
+ KEY_KPMINUS 0x0C
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay 2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/vlsystem/lircd.conf.mplay
++++ lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay
@@ -22,49 +22,49 @@ begin remote
toggle_bit_mask 0x0
@@ -4532,9 +4746,10 @@ diff -Naurp lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6.new/remotes/
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.6/remotes/x10/lircd.conf.mouseremote 2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mouseremote
++++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote
@@ -24,42 +24,42 @@ begin remote
gap 140000
@@ -4617,9 +4832,10 @@ diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes
end codes
end remote
-diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere 2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere 2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mp3anywhere
++++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere
@@ -22,43 +22,43 @@ begin remote
gap 140000
diff --git a/lirc-in-kernel-ioctls.patch b/lirc-in-kernel-ioctls.patch
new file mode 100644
index 0000000..7e0d0b5
--- /dev/null
+++ b/lirc-in-kernel-ioctls.patch
@@ -0,0 +1,116 @@
+Index: lirc-0.8.7pre2/drivers/lirc.h
+===================================================================
+--- lirc-0.8.7pre2.orig/drivers/lirc.h
++++ lirc-0.8.7pre2/drivers/lirc.h
+@@ -11,6 +11,9 @@
+ #define __USE_LINUX_IOCTL_DEFS
+ #include <sys/ioctl.h>
+ #endif
++#include <stdint.h>
++
++typedef uint32_t __u32;
+
+ /* <obsolete> */
+ #define PULSE_BIT 0x01000000
+@@ -95,60 +96,60 @@ typedef int lirc_t;
+
+ /*** IOCTL commands for lirc driver ***/
+
+-#define LIRC_GET_FEATURES _IOR('i', 0x00000000, unsigned long)
++#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32)
+
+-#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, unsigned long)
+-#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, unsigned long)
+-#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, unsigned int)
+-#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, unsigned int)
+-#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, unsigned int)
+-#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, unsigned int)
+-#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, unsigned int)
+-
+-#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, lirc_t)
+-#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, lirc_t)
+-
+-#define LIRC_GET_MIN_FILTER_PULSE _IOR('i', 0x0000000a, lirc_t)
+-#define LIRC_GET_MAX_FILTER_PULSE _IOR('i', 0x0000000b, lirc_t)
+-#define LIRC_GET_MIN_FILTER_SPACE _IOR('i', 0x0000000c, lirc_t)
+-#define LIRC_GET_MAX_FILTER_SPACE _IOR('i', 0x0000000d, lirc_t)
++#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32)
++#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32)
++#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, __u32)
++#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, __u32)
++#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, __u32)
++#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, __u32)
++#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32)
++
++#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, __u32)
++#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, __u32)
++
++#define LIRC_GET_MIN_FILTER_PULSE _IOR('i', 0x0000000a, __u32)
++#define LIRC_GET_MAX_FILTER_PULSE _IOR('i', 0x0000000b, __u32)
++#define LIRC_GET_MIN_FILTER_SPACE _IOR('i', 0x0000000c, __u32)
++#define LIRC_GET_MAX_FILTER_SPACE _IOR('i', 0x0000000d, __u32)
+
+ /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
+-#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, unsigned long)
++#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32)
+
+ /* all values set should be reset by the driver when the device is
+ reopened */
+
+ /* obsolete: drivers only support one mode */
+-#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, unsigned long)
++#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32)
+ /* obsolete: drivers only support one mode */
+-#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, unsigned long)
++#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32)
+ /* Note: these can reset the according pulse_width */
+-#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, unsigned int)
+-#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, unsigned int)
+-#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, unsigned int)
+-#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, unsigned int)
+-#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, unsigned int)
++#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32)
++#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32)
++#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, __u32)
++#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, __u32)
++#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, __u32)
+
+ /* a value of 0 disables all hardware timeouts and data should be
+ reported as soon as possible */
+-#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, lirc_t)
++#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, __u32)
+ /* 1 enables, 0 disables timeout reports in MODE2 */
+-#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, unsigned int)
++#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, __u32)
+
+ /* pulses shorter than this are filtered out by hardware (software
+ emulation in lirc_dev/lircd?) */
+-#define LIRC_SET_REC_FILTER_PULSE _IOW('i', 0x0000001a, lirc_t)
++#define LIRC_SET_REC_FILTER_PULSE _IOW('i', 0x0000001a, __u32)
+ /* spaces shorter than this are filtered out by hardware (software
+ emulation in lirc_dev/lircd?) */
+-#define LIRC_SET_REC_FILTER_SPACE _IOW('i', 0x0000001b, lirc_t)
++#define LIRC_SET_REC_FILTER_SPACE _IOW('i', 0x0000001b, __u32)
+ /* if filter cannot be set independently for pulse/space, this should
+ be used */
+-#define LIRC_SET_REC_FILTER _IOW('i', 0x0000001c, lirc_t)
++#define LIRC_SET_REC_FILTER _IOW('i', 0x0000001c, __u32)
+
+ /* if enabled from the next key press on the driver will send
+ LIRC_MODE2_FREQUENCY packets */
+-#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, unsigned int)
++#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, __u32)
+
+ /*
+ * to set a range use
+@@ -157,8 +158,8 @@ typedef int lirc_t;
+ * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
+ */
+
+-#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, unsigned int)
+-#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, unsigned int)
++#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, __u32)
++#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, __u32)
+
+ #define LIRC_NOTIFY_DECODE _IO('i', 0x00000020)
+
diff --git a/lirc-use-new-instead-of-conf-as-filename-suffix.patch b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
index 2731eb6..1ca167a 100644
--- a/lirc-use-new-instead-of-conf-as-filename-suffix.patch
+++ b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -6,10 +6,11 @@ Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
to prevent a buffer overrun for 'argv[optind]'.
---
-diff -Naurp lirc.orig/daemons/irrecord.c lirc/daemons/irrecord.c
---- lirc.orig/daemons/irrecord.c 2008-08-27 13:04:46.000000000 -0400
-+++ lirc/daemons/irrecord.c 2008-09-24 17:01:37.000000000 -0400
-@@ -493,7 +493,7 @@ int main(int argc,char **argv)
+Index: lirc-0.8.7pre2/daemons/irrecord.c
+===================================================================
+--- lirc-0.8.7pre2.orig/daemons/irrecord.c
++++ lirc-0.8.7pre2/daemons/irrecord.c
+@@ -514,7 +514,7 @@ int main(int argc,char **argv)
exit(EXIT_FAILURE);
}
strcpy(filename_new, filename);
diff --git a/lirc.spec b/lirc.spec
index 400d2d5..dc3c5bb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,29 +14,36 @@
%bcond_without portaudio
%bcond_without x
%bcond_with svgalib
-#define pre pre2
+
+%global released 0
+%define pre pre2
Name: lirc
-Version: 0.8.6
-Release: 8%{?pre:.%{pre}}%{?dist}
+Version: 0.8.7
+%if 0%{?released}
+Release: 1%{?dist}
+%else
+Release: 0.1.%{pre}%{?dist}
+%endif
Summary: The Linux Infrared Remote Control package
Group: System Environment/Daemons
License: GPLv2+
URL: http://www.lirc.org/
+%if 0%{?released}
Source0: http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0: http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+%else
+Source0: http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+%endif
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: lirc-use-new-instead-of-conf-as-filename-suffix.patch
-Patch1: lirc-0.8.6-devinput-pass-mouse-events.patch
+Patch1: lirc-in-kernel-ioctls.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=457273
# http://thread.gmane.org/gmane.comp.hardware.lirc/6884
Patch2: lirc-0.8.6-standardized-remote-keycodes.patch
Patch3: lirc-0.8.4-make-remote-names-all-unique.patch
-Patch4: lirc-0.8.6-remove-obsolete-modes.patch
-Patch5: lirc-0.8.6-devinput-conf-update.patch
-Patch6: lirc-0.8.6-firefly-def.patch
+Patch4: lirc-0.8.6-firefly-def.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{__perl}
@@ -167,8 +174,6 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
# Re-run autofoo for new cvs features
#autoreconf -i -f
#automake
@@ -292,7 +297,7 @@ fi
%changelog
-* Thu Jul 08 2010 Jarod Wilson <jarod at redhat.com> 0.8.6-8
+* Mon Aug 02 2010 Jarod Wilson <jarod at redhat.com> 0.8.7-0.1.pre2
- Fix up sub-package license file inclusion per new fedora
licensing guidelines
- Update to lirc 0.8.7pre2 snapshot
diff --git a/sources b/sources
index ca8889f..df4a541 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
4ca24da6f5e7c2dcea74878c27a4a3f7 lirc-0.8.6.tar.bz2
+2da1dad0b3de588f316a5e11562fdd8d lirc-0.8.7pre2.tar.bz2
More information about the scm-commits
mailing list