rpms/lirc/devel lirc-0.8.4-make-remote-names-all-unique.patch, NONE, 1.1 lirc-0.8.4-standardized-name-fixups.patch, NONE, 1.1 lirc-0.8.4-standardize-remote-keycodes.patch, 1.1, 1.2 lirc.spec, 1.44, 1.45 lirc-streamzap-prev-next.patch, 1.1, NONE

Jarod Wilson jwilson at fedoraproject.org
Thu Oct 16 20:52:00 UTC 2008


Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12090

Modified Files:
	lirc-0.8.4-standardize-remote-keycodes.patch lirc.spec 
Added Files:
	lirc-0.8.4-make-remote-names-all-unique.patch 
	lirc-0.8.4-standardized-name-fixups.patch 
Removed Files:
	lirc-streamzap-prev-next.patch 
Log Message:
* Thu Oct 16 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-2
- Make all remote configs have unique names (#467303)
- Fix up some key names that got screwed up by standardization script


lirc-0.8.4-make-remote-names-all-unique.patch:

--- NEW FILE lirc-0.8.4-make-remote-names-all-unique.patch ---
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
 
 begin remote
 
-  name  Medion_X10
+  name  Medion_X10_V2
   bits           16
   eps            30
   aeps          100
@@ -1872,7 +1872,7 @@ end remote
 
 begin remote
 
-  name  Medion_X10
+  name  Medion_X10_V3
   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
@@ -11,7 +11,7 @@
 
 begin remote
 
-  name  BESTBUY
+  name  BESTBUY2
   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
@@ -153,7 +153,7 @@ end remote
 
 begin remote
 
-  name  DVICO_MCE
+  name  DVICO_MCE2
   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
@@ -7,7 +7,7 @@
 
 begin remote
 
-  name  NEC
+  name  NEC_PULSE
   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
@@ -9,7 +9,7 @@
 
 begin remote
 
-  name  NEC
+  name  NEC_SHORT_PULSE
   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
@@ -6,7 +6,7 @@
 
 begin remote
 
-  name  SONY
+  name  SONY_12
   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
@@ -6,7 +6,7 @@
 
 begin remote
 
-  name  SONY
+  name  SONY_20
   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
@@ -278,14 +278,14 @@ end remote
 #
 # contributed by Matthew Wright
 #
-# brand:  Hauppauge (HRV-1600 RT Remote)
+# brand:  Hauppauge (HVR-1600 RT Remote)
 # model no. of remote control: A415-HPG-A
 # devices being controlled by this remote:
 #
 
 begin remote
 
-  name  Hauppauge
+  name  Hauppauge_HVR_1600
   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
@@ -74,7 +74,7 @@ end remote
 
 begin remote
 
-  name  PVR2000
+  name  PVR2000_V2
   bits           8
   flags  SHIFT_ENC
   gap       120000

lirc-0.8.4-standardized-name-fixups.patch:

--- NEW FILE lirc-0.8.4-standardized-name-fixups.patch ---
diff -Naurp lirc-0.8.4.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4/remotes/adaptec/lircd.conf.AVC-2410
--- lirc-0.8.4.orig/remotes/adaptec/lircd.conf.AVC-2410	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
@@ -29,30 +29,30 @@ begin remote
           Live                     0x00000000000025DA
           Timeshift                0x00000000000017E8
           Scan                     0x00000000000018e7
-          KEY_POWER                    0x00000000000009f6
-          KEY_1                        0x00000000000026D9
-          KEY_2                        0x00000000000019E6
-          KEY_3                        0x00000000000010EF
-          KEY_4                        0x00000000000027D8
-          KEY_5                        0x00000000000020DF
-          KEY_6                        0x00000000000011EE
-          KEY_7                        0x00000000000028D7
-          KEY_8                        0x00000000000021DE
-          KEY_9                        0x00000000000012ED
-          KEY_0                        0x00000000000022DD
-          KEY_MUTE                     0x00000000000013EC
+          Power                    0x00000000000009f6
+          1                        0x00000000000026D9
+          2                        0x00000000000019E6
+          3                        0x00000000000010EF
+          4                        0x00000000000027D8
+          5                        0x00000000000020DF
+          6                        0x00000000000011EE
+          7                        0x00000000000028D7
+          8                        0x00000000000021DE
+          9                        0x00000000000012ED
+          0                        0x00000000000022DD
+          Mute                     0x00000000000013EC
           Full                     0x00000000000029D6
-          KEY_PLAY                     0x00000000000030CF
-          KEY_STOP                     0x00000000000023DC
-          KEY_NEXT                     0x00000000000024DB
-          KEY_AGAIN                   0x00000000000014EB
-          KEY_REWIND                   0x00000000000031CE
-          KEY_FORWARD                  0x00000000000015EA
-          KEY_CHANNELUP                      0x00000000000001FE
-          KEY_CHANNELDOWN                      0x00000000000005FA
-          KEY_VOLUMEUP                     0x00000000000004FB
-          KEY_VOLUMEDOWN                     0x00000000000002FD
-          KEY_ENTER                    0x00000000000003FC
+          Play                     0x00000000000030CF
+          Stop                     0x00000000000023DC
+          Skip                     0x00000000000024DB
+          Replay                   0x00000000000014EB
+          Rewind                   0x00000000000031CE
+          Forward                  0x00000000000015EA
+          Ch+                      0x00000000000001FE
+          Ch-                      0x00000000000005FA
+          Vol+                     0x00000000000004FB
+          Vol-                     0x00000000000002FD
+          Enter                    0x00000000000003FC
           OSD                      0x00000000000032CD
           cc                       0x00000000000016E9
       end codes
diff -Naurp lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707
--- lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:30:37.000000000 -0400
@@ -37,10 +37,10 @@ begin remote
           KEY_7                        0x02FD54AB00
           KEY_8                        0x02FD4CB300
           KEY_9                        0x02FD5CA300
-                               0x02FD55AA00
+          Jump                         0x02FD55AA00
           KEY_0                        0x02FD4DB200
-                             0x02FD5DA200
-          Guide                    0x02FD17E800
+          Search                   0x02FD5DA200
+          GUIDE                    0x02FD17E800
           KEY_UP                       0x02FD0FF000
           KEY_MENU                     0x02FD1FE000
           KEY_LEFT                     0x02FD16E900
@@ -48,7 +48,7 @@ begin remote
           KEY_RIGHT                    0x02FD1EE100
           KEY_INFO                     0x02FD5AA500
           KEY_DOWN                     0x02FD46B900
-                               0x02FD52AD00
+          KEY_EXIT                     0x02FD52AD00
           KEY_AGAIN                   0x02FD59A600
           KEY_NEXT                     0x02FD51AE00
           KEY_REWIND                   0x02FD58A700
diff -Naurp lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4/remotes/apple/lircd.conf.macmini
--- lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/apple/lircd.conf.macmini	2008-10-16 16:30:37.000000000 -0400
@@ -30,7 +30,7 @@ begin remote
           KEY_VOLUMEDOWN	0x0D
           KEY_REWIND		0x08
           KEY_FORWARD		0x07
-          KEY_PLAY		0x04
+          KEY_PLAYPAUSE		0x04
           KEY_MENU		0x02
       end codes
 
diff -Naurp lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4/remotes/asus/lircd.conf.asusdh
--- lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/asus/lircd.conf.asusdh	2008-10-16 16:30:37.000000000 -0400
@@ -14,17 +14,17 @@ begin remote
   post_data_bits  0
 
 	begin codes
-	  KEY_POWER			0x01
+	  KEY_POWER		0x01
 	  QUICK_POWER		0x02
 	  NOISE_OFF		0x03
 	  WIFI			0x04
 	  AP_LAUNCH		0x05
 	  KEY_MAX		0x06
-	  			0x07
+	  KEY_KPPLUS		0x07
 	  REV			0x08
-	  		0x09
-	  KEY_FORWARD			0x0A
-	  			0x0B
+	  KEY_PLAYPAUSE		0x09
+	  KEY_FORWARD		0x0A
+	  KEY_KPMINUS		0x0B
         end codes
 
 end remote
diff -Naurp lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb
--- lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:30:37.000000000 -0400
@@ -32,8 +32,8 @@ begin remote
       begin codes
           KEY_STOP                     0x000231
           KEY_PAUSE                    0x000230
-                           0x000228
-          KEY_RECORD                      0x000237
+          KEY_FASTFORWARD              0x000228
+          KEY_RECORD                   0x000237
           KEY_REWIND                   0x000229
           KEY_PLAY                     0x00022C
           KEY_D                        0x00027B
@@ -46,9 +46,9 @@ begin remote
           KEY_DOWN                     0x000259
           KEY_OK                       0x00025C
           KEY_INFO                     0x0002F9
-          timer                    0x000296
+          timer                        0x000296
           KEY_MENU                     0x000254
-          check                    0x000282
+          check                        0x000282
           KEY_0                        0x000200
           KEY_1                        0x000201
           KEY_2                        0x000202
@@ -59,24 +59,24 @@ begin remote
           KEY_7                        0x000207
           KEY_8                        0x000208
           KEY_9                        0x000209
-          KEY_VOLUMEUP                    0x000210
-          KEY_VOLUMEDOWN                  0x000211
+          KEY_VOLUMEUP                 0x000210
+          KEY_VOLUMEDOWN               0x000211
           KEY_MUTE                     0x00020D
-          KEY_CHANNELUP                     0x000220
-          KEY_CHANNELDOWN                   0x000221
-          mouse_up                 0x0001FF
-          mouse_down               0x0002FF
-          BTN_LEFT               0x0020FF
-          BTN_RIGHT              0x0010FF
-          BTN_RIGHT           0x0011FF
-          mouse_down_right         0x0012FF
-          BTN_LEFT            0x0021FF
-          mouse_down_left          0x0022FF
-          right_click              0x0002AA
-          left_click               0x0002A9
-          hand                     0x0002D0
-          shrink_resize            0x0002D5
-          ?                        0x0002BE
+          KEY_CHANNELUP                0x000220
+          KEY_CHANNELDOWN              0x000221
+          mouse_up                     0x0001FF
+          mouse_down                   0x0002FF
+          BTN_LEFT                     0x0020FF
+          BTN_RIGHT                    0x0010FF
+          BTN_RIGHT                    0x0011FF
+          mouse_down_right             0x0012FF
+          BTN_LEFT                     0x0021FF
+          mouse_down_left              0x0022FF
+          right_click                  0x0002AA
+          left_click                   0x0002A9
+          hand                         0x0002D0
+          shrink_resize                0x0002D5
+          ?                            0x0002BE
           KEY_DVD                      0x000238
           KEY_TV                       0x000239
           KEY_A                        0x000278
diff -Naurp lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4/remotes/ericsson/lircd.conf.bte
--- lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/ericsson/lircd.conf.bte	2008-10-16 16:30:37.000000000 -0400
@@ -11,7 +11,7 @@
 
 begin remote
 
-    name    bte 
+    name    bte
     bits    16
 
     begin codes
@@ -25,28 +25,28 @@ begin remote
         KEY_7               0x0037
         KEY_8               0x0038
         KEY_9               0x0039
-                    0x002a  # '*'
-                    0x0023  # '#'
+        STAR                0x002a  # '*'
+        HASH                0x0023  # '#'
         KEY_UP              0x005e  # '^'
         KEY_DOWN            0x0076  # 'v'
         KEY_LEFT            0x003c  # '<'
         KEY_RIGHT           0x003e  # '>'
         KEY_CANCEL          0x0063  # 'c'
-        KEY_VOLUMEUP          0x0075  # 'u'
-        KEY_VOLUMEDOWN        0x0064  # 'd'
+        KEY_VOLUMEUP        0x0075  # 'u'
+        KEY_VOLUMEDOWN      0x0064  # 'd'
 
 # t520m
         NO              0x0065  # 'e'
-                     0x0073  # 's'
-                  0x004c  # 'L'
-                    0x0047  # 'G' - hides dialog widget!
+        YES             0x0073  # 's'
+        OPTION          0x004c  # 'L'
+        MEMO            0x0047  # 'G' - hides dialog widget!
 
 # t630
         F_LEFT          0x005b  # '['
         F_RIGHT         0x005d  # ']'  - triggers 'e'
         J_CLICK         0x3a4a  # ':J' - triggers 'e'
-        RETURN          0x3a52  # ':R' - triggers 'e'
-                  0x3a43  # ':C'
+        KEY_ENTER       0x3a52  # ':R' - triggers 'e'
+        KEY_CAMERA      0x3a43  # ':C'
         WAP             0x3a4f  # ':O'
 
       end codes
diff -Naurp lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100
--- lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:30:37.000000000 -0400
@@ -30,7 +30,7 @@ begin remote
 
       begin codes
           KEY_POWER                    0x62260942
-          KEY_EJECTCD                    0x62662409
+          KEY_EJECTCD                  0x62662409
           KEY_1                        0x62662209
           KEY_2                        0x22642209
           KEY_3                        0x62641142
@@ -41,35 +41,35 @@ begin remote
           KEY_8                        0x22646409
           KEY_9                        0x62646609
           KEY_0                        0x22464226
-                            0x62664226
-                           0x62660942
-          KEY_VOLUMEDOWN                     0x22896642
-          KEY_VOLUMEUP                     0x62622609
+          KEY_WINDOWS                  0x62664226
+          KEY_MENU                     0x62660942
+          KEY_VOLUMEDOWN               0x22896642
+          KEY_VOLUMEUP                 0x62622609
           KEY_ESC                      0x22662609
           KEY_UP                       0x22916642
           KEY_CLOSE                    0x22994642
           KEY_LEFT                     0x22994242
-          ent                      0x22892642
+          ent                          0x22892642
           KEY_RIGHT                    0x22914642
-          KEY_PREVIOUS                     0x62996242
+          KEY_PREVIOUS                 0x62996242
           KEY_DOWN                     0x22192699
           KEY_NEXT                     0x22660942
           KEY_MUTE                     0x22622409
-          step                     0x62994C42
+          step                         0x62994C42
           KEY_PLAY                     0x22246426
           KEY_STOP                     0x6246894C
-          winamp                   0x62426409
-                        0x22664409
-          hdtv                     0x22992642
-                           0x62664609
-                             0x62992299
-                           0x62912242
-          KEY_WWW                 0x62264626
-          email                    0x22998C99
-                                 0x22264426
-                                 0x22426209
-                                 0x62896442
-                                 0x22096642
+          winamp                       0x62426409
+          mediaplayer                  0x22664409
+          KEY_TV                       0x22992642
+          KEY_DVD                      0x62664609
+          windvd                       0x62992299
+          powerdvd                     0x62912242
+          KEY_WWW                      0x62264626
+          KEY_MAIL                     0x22998C99
+          b1                           0x22264426
+          b2                           0x22426209
+          b3                           0x62896442
+          b4                           0x22096642
       end codes
 
 end remote
diff -Naurp lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb
--- lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:49:17.000000000 -0400
@@ -1,7 +1,8 @@
 #
-# brand:                        HP 
-# model no. of remote control:  TSGH-IR01
-# devices being controlled by this remote: HP Slimline S3100y
+# brand:                        HP/Philips/Microsoft/Other
+# model no. of remote control:  Media Center Edition remote
+# devices being controlled by this remote: HP Slimline S3100y and a
+# myriad of devices with Media Center Edition receivers
 #
 # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
 # https://help.ubuntu.com/community/Install_Lirc_Feisty
diff -Naurp lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4/remotes/samsung/lircd.conf.samsung
--- lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/samsung/lircd.conf.samsung	2008-10-16 16:30:37.000000000 -0400
@@ -39,42 +39,42 @@ begin remote
 
 ### Propietary Samsung report, type 4
           KEY_MUTE                     0xffcc0001
-          Video_Archive            0xffcc0002
+          Video_Archive                0xffcc0002
           KEY_1                        0xffcc0003
           KEY_2                        0xffcc0004
           KEY_3                        0xffcc0005
-                              0xffcc0006
+          Sleep                        0xffcc0006
           KEY_4                        0xffcc0007
           KEY_5                        0xffcc0008
           KEY_6                        0xffcc0009
-                               0xffcc000a
+          Last                         0xffcc000a
           KEY_7                        0xffcc000b
           KEY_8                        0xffcc000c
           KEY_9                        0xffcc000d
-                           0xffcc000e
-          Full                     0xffcc000f
+          KEY_SUBTITLE                 0xffcc000e
+          Full                         0xffcc000f
           KEY_0                        0xffcc0010
-          PIP                      0xffcc0011
-          Timer                    0xffcc0012
-                             0xffcc0013
-          TV_Menu                  0xffcc0014
+          PIP                          0xffcc0011
+          Timer                        0xffcc0012
+          Source                       0xffcc0013
+          TV_Menu                      0xffcc0014
           KEY_EPG                      0xffcc0015
           KEY_TEXT                     0xffcc0016
 # gap 17..1b: probably cursor keys were previously planned here
           KEY_TV                       0xffcc001c
           KEY_RADIO                    0xffcc001d
           KEY_DVD                      0xffcc001e
-          KEY_CHANNELUP                      0xffcc001f
+          KEY_CHANNELUP                0xffcc001f
           KEY_MENU                     0xffcc0020
-          KEY_VOLUMEUP                     0xffcc0021
-          KEY_CHANNELDOWN                      0xffcc0022
+          KEY_VOLUMEUP                 0xffcc0021
+          KEY_CHANNELDOWN              0xffcc0022
           KEY_BACK                     0xffcc0023
-          KEY_VOLUMEDOWN                     0xffcc0024
+          KEY_VOLUMEDOWN               0xffcc0024
           KEY_PLAY                     0xffcc0025
           KEY_PAUSE                    0xffcc0026
           KEY_STOP                     0xffcc0027
           KEY_RECORD                   0xffcc0028
-          KEY_PREVIOUS                     0xffcc0029
+          KEY_PREVIOUS                 0xffcc0029
           KEY_REWIND                   0xffcc002a
           KEY_FORWARD                  0xffcc002b
           KEY_NEXT                     0xffcc002c
diff -Naurp lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay
--- lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:03:39.000000000 -0400
+++ lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:30:37.000000000 -0400
@@ -22,11 +22,11 @@ begin remote
   toggle_bit_mask 0x0
 
       begin codes
-          PwrOff                   0x41
-          PwrOn                    0x55
-          Movies                   0x40
-          Television               0x46
-          Photos                   0x45
+          PwrOff                       0x41
+          KEY_POWER                    0x55
+          KEY_VIDEO                    0x40
+          KEY_TV                       0x46
+          KEY_PHOTO                    0x45
           KEY_AUDIO                    0x56
           KEY_1                        0x4d
           KEY_2                        0x4e
@@ -38,33 +38,33 @@ begin remote
           KEY_8                        0x03
           KEY_9                        0x07
           KEY_0                        0x4c
-          KEY_VOLUMEUP                     0x0a
-          KEY_VOLUMEDOWN                     0x0e
-          Ch+_Lang                 0x12
-          Ch-_Page                 0x16
-          Guide                    0x0f
+          KEY_VOLUMEUP                 0x0a
+          KEY_VOLUMEDOWN               0x0e
+          KEY_CHANNELUP                0x12
+          KEY_CHANNELDOWN              0x16
+          Guide                        0x0f
           KEY_BACK                     0x0b
-                                 0x13
+          KEY_TV                       0x13
           KEY_OK                       0x42
           KEY_UP                       0x19
           KEY_LEFT                     0x54
           KEY_RIGHT                    0x43
           KEY_DOWN                     0x1d
-          Exit_Click               0x1f
-          Task_Quick               0x17
-          Run_DClick               0x1b
-          KEY_REWIND                      0x0d
+          Exit_Click                   0x1f
+          Task_Quick                   0x17
+          Run_DClick                   0x1b
+          KEY_REWIND                   0x0d
           KEY_PLAY                     0x09
-                               0x15
-          KEY_PREVIOUS                     0x1a
+          KEY_FASTFORWARD              0x15
+          KEY_PREVIOUS                 0x1a
           KEY_STOP                     0x01
           KEY_NEXT                     0x1e
           KEY_PAUSE                    0x05
           KEY_MUTE                     0x4a
-          Warp_Mouse               0x47
-          KEY_RECORD                      0x11
-          DVD_Zoom                 0x14
-          Detail                   0x4b
+          Warp_Mouse                   0x47
+          KEY_RECORD                   0x11
+          KEY_ZOOM                     0x14
+          Detail                       0x4b
       end codes
 
 end remote
--- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2008-10-01 12:09:37.000000000 +0100
+++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-10-06 09:08:57.000000000 +0100
@@ -53,8 +53,8 @@ begin remote
           KEY_PLAY                     0x17
           KEY_PAUSE                    0x18
           KEY_STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
+          KEY_PREVIOUS                      0x1A
+          KEY_NEXT                      0x1B
           KEY_RECORD                   0x1C
           KEY_REWIND                       0x1D
           KEY_FORWARD                       0x1E

lirc-0.8.4-standardize-remote-keycodes.patch:

Index: lirc-0.8.4-standardize-remote-keycodes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc-0.8.4-standardize-remote-keycodes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-0.8.4-standardize-remote-keycodes.patch	24 Sep 2008 22:15:49 -0000	1.1
+++ lirc-0.8.4-standardize-remote-keycodes.patch	16 Oct 2008 20:51:59 -0000	1.2
@@ -1,60 +1,3 @@
-diff -Naurp lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410
---- lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410	2008-09-24 17:06:37.000000000 -0400
-@@ -29,30 +29,30 @@ begin remote
-           Live                     0x00000000000025DA
-           Timeshift                0x00000000000017E8
-           Scan                     0x00000000000018e7
--          Power                    0x00000000000009f6
--          1                        0x00000000000026D9
--          2                        0x00000000000019E6
--          3                        0x00000000000010EF
--          4                        0x00000000000027D8
--          5                        0x00000000000020DF
--          6                        0x00000000000011EE
--          7                        0x00000000000028D7
--          8                        0x00000000000021DE
--          9                        0x00000000000012ED
--          0                        0x00000000000022DD
--          Mute                     0x00000000000013EC
-+          KEY_POWER                    0x00000000000009f6
-+          KEY_1                        0x00000000000026D9
-+          KEY_2                        0x00000000000019E6
-+          KEY_3                        0x00000000000010EF
-+          KEY_4                        0x00000000000027D8
-+          KEY_5                        0x00000000000020DF
-+          KEY_6                        0x00000000000011EE
-+          KEY_7                        0x00000000000028D7
-+          KEY_8                        0x00000000000021DE
-+          KEY_9                        0x00000000000012ED
-+          KEY_0                        0x00000000000022DD
-+          KEY_MUTE                     0x00000000000013EC
-           Full                     0x00000000000029D6
--          Play                     0x00000000000030CF
--          Stop                     0x00000000000023DC
--          Skip                     0x00000000000024DB
--          Replay                   0x00000000000014EB
--          Rewind                   0x00000000000031CE
--          Forward                  0x00000000000015EA
--          Ch+                      0x00000000000001FE
--          Ch-                      0x00000000000005FA
--          Vol+                     0x00000000000004FB
--          Vol-                     0x00000000000002FD
--          Enter                    0x00000000000003FC
-+          KEY_PLAY                     0x00000000000030CF
-+          KEY_STOP                     0x00000000000023DC
-+          KEY_NEXT                     0x00000000000024DB
-+          KEY_AGAIN                   0x00000000000014EB
-+          KEY_REWIND                   0x00000000000031CE
-+          KEY_FORWARD                  0x00000000000015EA
-+          KEY_CHANNELUP                      0x00000000000001FE
-+          KEY_CHANNELDOWN                      0x00000000000005FA
-+          KEY_VOLUMEUP                     0x00000000000004FB
-+          KEY_VOLUMEDOWN                     0x00000000000002FD
-+          KEY_ENTER                    0x00000000000003FC
-           OSD                      0x00000000000032CD
-           cc                       0x00000000000016E9
-       end codes
 diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707
 --- lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:05:54.000000000 -0400
 +++ lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:06:37.000000000 -0400


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- lirc.spec	13 Oct 2008 03:21:42 -0000	1.44
+++ lirc.spec	16 Oct 2008 20:51:59 -0000	1.45
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.5%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -32,7 +32,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
-Patch2:		lirc-streamzap-prev-next.patch
+Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
+Patch3:         lirc-0.8.4-standardized-name-fixups.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -152,6 +153,7 @@
 # Don't create a backup, or the original definitions will get installed
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \
@@ -263,6 +265,10 @@
 
 
 %changelog
+* Thu Oct 16 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-2
+- Make all remote configs have unique names (#467303)
+- Fix up some key names that got screwed up by standardization script
+
 * Sun Oct 12 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-1
 - Update to 0.8.4 release
 


--- lirc-streamzap-prev-next.patch DELETED ---




More information about the scm-commits mailing list