rpms/lirc/F-9 lirc-0.8.4-make-remote-names-all-unique.patch, NONE, 1.1 lirc-0.8.4-standardize-remote-keycodes.patch, NONE, 1.1 lirc-0.8.4-standardized-name-fixups.patch, NONE, 1.1 lirc-use-new-instead-of-conf-as-filename-suffix.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 lirc.init, 1.3, 1.4 lirc.spec, 1.32, 1.33 lirc.sysconfig, 1.1, 1.2 sources, 1.23, 1.24 lirc-0.8.3-validate-transmit-buffer.patch, 1.1, NONE lirc-dont-exit.patch, 1.2, NONE
Jarod Wilson
jwilson at fedoraproject.org
Mon Nov 3 15:08:39 UTC 2008
Author: jwilson
Update of /cvs/pkgs/rpms/lirc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29006
Modified Files:
.cvsignore lirc.init lirc.spec lirc.sysconfig sources
Added Files:
lirc-0.8.4-make-remote-names-all-unique.patch
lirc-0.8.4-standardize-remote-keycodes.patch
lirc-0.8.4-standardized-name-fixups.patch
lirc-use-new-instead-of-conf-as-filename-suffix.patch
Removed Files:
lirc-0.8.3-validate-transmit-buffer.patch lirc-dont-exit.patch
Log Message:
* Sun Oct 26 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4a-1
- Update to lirc 0.8.4a release (fixes mode2 irrecord failures)
- Really fix the mceusb remote config file this time
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-standardize-remote-keycodes.patch:
--- NEW FILE lirc-0.8.4-standardize-remote-keycodes.patch ---
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
@@ -26,50 +26,50 @@ begin remote
toggle_bit_mask 0x0
begin codes
- Power 0x02FD5BA400
- Mute 0x02FD5FA000
- 1 0x02FD57A800
- 2 0x02FD4FB000
- 3 0x02FD53AC00
- 4 0x02FD56A900
- 5 0x02FD4EB100
- 6 0x02FD5EA100
- 7 0x02FD54AB00
- 8 0x02FD4CB300
- 9 0x02FD5CA300
- Jump 0x02FD55AA00
- 0 0x02FD4DB200
- Search 0x02FD5DA200
+ KEY_POWER 0x02FD5BA400
+ KEY_MUTE 0x02FD5FA000
+ KEY_1 0x02FD57A800
+ KEY_2 0x02FD4FB000
+ KEY_3 0x02FD53AC00
+ KEY_4 0x02FD56A900
+ KEY_5 0x02FD4EB100
+ KEY_6 0x02FD5EA100
+ KEY_7 0x02FD54AB00
+ KEY_8 0x02FD4CB300
+ KEY_9 0x02FD5CA300
+ 0x02FD55AA00
+ KEY_0 0x02FD4DB200
+ 0x02FD5DA200
Guide 0x02FD17E800
- Up 0x02FD0FF000
- Menu 0x02FD1FE000
- Left 0x02FD16E900
- Enter 0x02FD0EF100
- Right 0x02FD1EE100
- Info 0x02FD5AA500
- Down 0x02FD46B900
- Exit 0x02FD52AD00
- Replay 0x02FD59A600
- Skip 0x02FD51AE00
- Rewind 0x02FD58A700
- Play 0x02FD44BB00
- Forward 0x02FD50AF00
- Stop 0x02FD07F800
- Record 0x02FD1BE400
+ KEY_UP 0x02FD0FF000
+ KEY_MENU 0x02FD1FE000
+ KEY_LEFT 0x02FD16E900
+ KEY_ENTER 0x02FD0EF100
+ KEY_RIGHT 0x02FD1EE100
+ KEY_INFO 0x02FD5AA500
+ KEY_DOWN 0x02FD46B900
+ 0x02FD52AD00
+ KEY_AGAIN 0x02FD59A600
+ KEY_NEXT 0x02FD51AE00
+ KEY_REWIND 0x02FD58A700
+ KEY_PLAY 0x02FD44BB00
+ KEY_FORWARD 0x02FD50AF00
+ KEY_STOP 0x02FD07F800
+ KEY_RECORD 0x02FD1BE400
Live 0x02FD13EC00
- A 0x02FD0AF500
- DVD 0x02FD06F900
- B 0x02FD12ED00
+ KEY_A 0x02FD0AF500
+ KEY_DVD 0x02FD06F900
+ KEY_B 0x02FD12ED00
Photo 0x02FD48B700
- Video 0x02FD40BF00
- Music 0x02FD19E600
- Ch+ 0x02FD0BF400
- Ch- 0x02FD08F700
+ KEY_VIDEO 0x02FD40BF00
+ KEY_AUDIO 0x02FD19E600
+ KEY_CHANNELUP 0x02FD0BF400
+ KEY_CHANNELDOWN 0x02FD08F700
S1 0x02FD03FC00
S2 0x02FD01FE00
S3 0x02FD00FF00
- Vol+ 0x02FD15EA00
- Vol- 0x02FD1CE300
+ KEY_VOLUMEUP 0x02FD15EA00
+ KEY_VOLUMEDOWN 0x02FD1CE300
end codes
end remote
diff -Naurp lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.4pre1/remotes/animax/lircd.conf.animax
--- lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax 1999-04-29 17:30:59.000000000 -0400
+++ lirc-0.8.4pre1/remotes/animax/lircd.conf.animax 2008-09-24 17:06:37.000000000 -0400
@@ -38,79 +38,79 @@ begin remote
begin codes
CD_DOWN 0x000000000000DB24
- CD_UP 0x0000000000005BA4
+ KEY_CD 0x0000000000005BA4
TV_DOWN 0x000000000000DC23
- TV_UP 0x0000000000005CA3
+ KEY_TV 0x0000000000005CA3
PHONE_DOWN 0x000000000000DD22
- PHONE_UP 0x0000000000005DA2
+ KEY_PHONE 0x0000000000005DA2
RADIO_DOWN 0x000000000000DE21
- RADIO_UP 0x0000000000005EA1
+ KEY_RADIO 0x0000000000005EA1
VIDEO_DOWN 0x000000000000DF20
- VIDEO_UP 0x0000000000005FA0
+ KEY_VIDEO 0x0000000000005FA0
AUX1_DOWN 0x000000000000E01F
- AUX1_UP 0x000000000000609F
+ KEY_AUX 0x000000000000609F
MAIL_DOWN 0x000000000000E11E
- MAIL_UP 0x000000000000619E
+ KEY_MAIL 0x000000000000619E
AUX2_DOWN 0x000000000000E21D
AUX2_UP 0x000000000000629D
POWER_DOWN 0x000000000000E31C
- POWER_UP 0x000000000000639C
+ KEY_POWER 0x000000000000639C
LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B
LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B
REWIND_DOWN 0x000000000000E51A
- REWIND_UP 0x000000000000659A
+ KEY_REWIND 0x000000000000659A
PLAY_DOWN 0x000000000000E619
- PLAY_UP 0x0000000000006699
+ KEY_PLAY 0x0000000000006699
FORWARD_DOWN 0x000000000000E718
- FORWARD_UP 0x0000000000006798
+ KEY_FORWARD 0x0000000000006798
SKIP_BACKWARD_DOWN 0x000000000000E817
SKIP_BACKWARD 0x0000000000006897
STOP_DOWN 0x000000000000E916
- STOP_UP 0x0000000000006996
+ KEY_STOP 0x0000000000006996
SKIP_FORWARD_DOWN 0x000000000000EA15
SKIP_FORWARD_UP 0x0000000000006A95
CHANNEL_UP_DOWN 0x000000000000EB14
- CHANNEL_UP_UP 0x0000000000006B94
+ KEY_CHANNELUP 0x0000000000006B94
MENU_DOWN 0x000000000000EC13
- MENU_UP 0x0000000000006C93
+ KEY_MENU 0x0000000000006C93
VOLUME_UP_DOWN 0x000000000000ED12
- VOLUME_UP_UP 0x0000000000006D92
+ KEY_VOLUMEUP 0x0000000000006D92
BLUE_BUTTON_DOWN 0x000000000000EE11
- BLUE_BUTTON_UP 0x0000000000006E91
+ KEY_BLUE 0x0000000000006E91
MUTE_DOWN 0x000000000000EF10
- MUTE_UP 0x0000000000006F90
+ KEY_MUTE 0x0000000000006F90
VOLUME_DOWN_DOWN 0x000000000000F00F
- VOLUME_DOWN_UP 0x000000000000708F
+ KEY_VOLUMEDOWN 0x000000000000708F
RED_BUTTON_DOWN 0x000000000000F10E
- RED_BUTTON_UP 0x000000000000718E
+ KEY_RED 0x000000000000718E
GREEN_BUTTON_DOWN 0x000000000000F20D
- GREEN_BUTTON_UP 0x000000000000728D
+ KEY_GREEN 0x000000000000728D
CHANNEL_DOWN_DOWN 0x000000000000F30C
- CHANNEL_DOWN_UP 0x000000000000738C
+ KEY_CHANNELDOWN 0x000000000000738C
1_DOWN 0x000000000000F40B
- 1_UP 0x000000000000748B
+ KEY_1 0x000000000000748B
2_DOWN 0x000000000000F50A
- 2_UP 0x000000000000758A
+ KEY_2 0x000000000000758A
3_DOWN 0x000000000000F609
- 3_UP 0x0000000000007689
+ KEY_3 0x0000000000007689
4_DOWN 0x000000000000F708
- 4_UP 0x0000000000007788
+ KEY_4 0x0000000000007788
5_DOWN 0x000000000000F807
- 5_UP 0x0000000000007887
+ KEY_5 0x0000000000007887
6_DOWN 0x000000000000F906
- 6_UP 0x0000000000007986
+ KEY_6 0x0000000000007986
7_DOWN 0x000000000000FA05
- 7_UP 0x0000000000007A85
+ KEY_7 0x0000000000007A85
8_DOWN 0x000000000000FB04
- 8_UP 0x0000000000007B84
+ KEY_8 0x0000000000007B84
9_DOWN 0x000000000000FC03
- 9_UP 0x0000000000007C83
+ KEY_9 0x0000000000007C83
SLASH_DOWN 0x000000000000FD02
- SLASH_UP 0x0000000000007D82
+ KEY_SLASH 0x0000000000007D82
[...4080 lines suppressed...]
- Down 0x1d
+ KEY_BACK 0x0b
+ 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
- Rew 0x0d
- Play 0x09
- Ffwd 0x15
- Prev 0x1a
- Stop 0x01
- Next 0x1e
- Pause 0x05
- Mute 0x4a
+ KEY_REWIND 0x0d
+ KEY_PLAY 0x09
+ 0x15
+ KEY_PREVIOUS 0x1a
+ KEY_STOP 0x01
+ KEY_NEXT 0x1e
+ KEY_PAUSE 0x05
+ KEY_MUTE 0x4a
Warp_Mouse 0x47
- Rec 0x11
+ KEY_RECORD 0x11
DVD_Zoom 0x14
Detail 0x4b
end codes
diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote
--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote 2005-01-22 05:40:43.000000000 -0500
+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote 2008-09-24 17:06:37.000000000 -0400
@@ -24,42 +24,42 @@ begin remote
gap 140000
begin codes
- POWER 0x000000000000000F
- PC 0x000000000000002B
+ KEY_POWER 0x000000000000000F
+ KEY_PC 0x000000000000002B
LAST 0x000000000000004F
- CHANUP 0x0000000000000002
- CHANDOWN 0x0000000000000003
- VOLUP 0x0000000000000006
- VOLDOWN 0x0000000000000007
- MUTE 0x0000000000000005
- 1 0x0000000000000041
- 2 0x0000000000000042
- 3 0x0000000000000043
- 4 0x0000000000000044
- 5 0x0000000000000045
- 6 0x0000000000000046
- 7 0x0000000000000047
- 8 0x0000000000000048
- 9 0x0000000000000049
- 0 0x0000000000000040
- ENTER 0x000000000000004a
+ KEY_CHANNELUP 0x0000000000000002
+ KEY_CHANNELDOWN 0x0000000000000003
+ KEY_VOLUMEUP 0x0000000000000006
+ KEY_VOLUMEDOWN 0x0000000000000007
+ KEY_MUTE 0x0000000000000005
+ KEY_1 0x0000000000000041
+ KEY_2 0x0000000000000042
+ KEY_3 0x0000000000000043
+ KEY_4 0x0000000000000044
+ KEY_5 0x0000000000000045
+ KEY_6 0x0000000000000046
+ KEY_7 0x0000000000000047
+ KEY_8 0x0000000000000048
+ KEY_9 0x0000000000000049
+ KEY_0 0x0000000000000040
+ KEY_ENTER 0x000000000000004a
ADOTB 0x000000000000005D
- REWIND 0x000000000000001C
- PLAY 0x000000000000000D
- FFWD 0x000000000000001D
- STOP 0x000000000000000E
- PAUSE 0x000000000000004E
- RECORD 0x00000000000000FF
- ENTER 0x000000000000004A
+ KEY_REWIND 0x000000000000001C
+ KEY_PLAY 0x000000000000000D
+ KEY_FASTFORWARD 0x000000000000001D
+ KEY_STOP 0x000000000000000E
+ KEY_PAUSE 0x000000000000004E
+ KEY_RECORD 0x00000000000000FF
+ KEY_ENTER 0x000000000000004A
LAST 0x000000000000004F
DISP 0x000000000000005C
SHIFT 0x000000000000006B
GUIDE 0x000000000000006D
- SELECT 0x0000000000000093
- PHONE 0x000000000000004B
- WEB 0x000000000000008B
- CD 0x00000000000000AB
- DVD 0x00000000000000CB
+ KEY_SELECT 0x0000000000000093
+ KEY_PHONE 0x000000000000004B
+ KEY_WWW 0x000000000000008B
+ KEY_CD 0x00000000000000AB
+ KEY_DVD 0x00000000000000CB
MOUSE_SLOW_N 0x0000000000000110
MOUSE_SLOW_NNE 0x0000000000000131
MOUSE_SLOW_NE 0x0000000000000111
@@ -110,7 +110,7 @@ begin remote
MOUSE_FAST_NNW 0x0000000000000539
BUTTONR_DOWN 0x0000000000000801
BUTTONL_DOWN 0x0000000000000804
- BUTTON_UP 0x0000000000000800
+ KEY_UP 0x0000000000000800
end codes
end remote
diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere
--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere 2007-07-01 03:09:11.000000000 -0400
+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere 2008-09-24 17:06:37.000000000 -0400
@@ -22,43 +22,43 @@ begin remote
gap 140000
begin codes
- POWER 0x00000000000000F0
- PC 0x00000000000000D4
+ KEY_POWER 0x00000000000000F0
+ KEY_PC 0x00000000000000D4
LAST 0x00000000000000F2
- CHANUP 0x0000000000000040
- CHANDOWN 0x00000000000000C0
- VOLUP 0x0000000000000060
- VOLDOWN 0x00000000000000E0
- MUTE 0x00000000000000A0
- ONE 0x0000000000000082
- TWO 0x0000000000000042
- THREE 0x00000000000000C2
- FOUR 0x0000000000000022
- FIVE 0x00000000000000A2
- SIX 0x0000000000000062
- SEVEN 0x00000000000000E2
- EIGHT 0x0000000000000012
- NINE 0x0000000000000092
- ZERO 0x0000000000000002
- ENTER 0x0000000000000052
+ KEY_CHANNELUP 0x0000000000000040
+ KEY_CHANNELDOWN 0x00000000000000C0
+ KEY_VOLUMEUP 0x0000000000000060
+ KEY_VOLUMEDOWN 0x00000000000000E0
+ KEY_MUTE 0x00000000000000A0
+ KEY_1 0x0000000000000082
+ KEY_2 0x0000000000000042
+ KEY_3 0x00000000000000C2
+ KEY_4 0x0000000000000022
+ KEY_5 0x00000000000000A2
+ KEY_6 0x0000000000000062
+ KEY_7 0x00000000000000E2
+ KEY_8 0x0000000000000012
+ KEY_9 0x0000000000000092
+ KEY_0 0x0000000000000002
+ KEY_ENTER 0x0000000000000052
ADOTB 0x00000000000000BA
- A 0x000000000000003A
- B 0x00000000000000D8
- C 0x00000000000000D6
- D 0x00000000000000D4
- MENU 0x00000000000000B6
- EXIT 0x00000000000000C9
- UP 0x00000000000000D5
- DOWN 0x00000000000000D3
- LEFT 0x00000000000000D2
- RIGHT 0x00000000000000D1
- OK 0x0000000000000052
- REWIND 0x0000000000000038
- PLAY 0x00000000000000B0
- FFWD 0x00000000000000B8
- RECORD 0x00000000000000FF
- STOP 0x0000000000000070
- PAUSE 0x0000000000000072
+ KEY_A 0x000000000000003A
+ KEY_B 0x00000000000000D8
+ KEY_C 0x00000000000000D6
+ KEY_D 0x00000000000000D4
+ KEY_MENU 0x00000000000000B6
+ KEY_EXIT 0x00000000000000C9
+ KEY_UP 0x00000000000000D5
+ KEY_DOWN 0x00000000000000D3
+ KEY_LEFT 0x00000000000000D2
+ KEY_RIGHT 0x00000000000000D1
+ KEY_OK 0x0000000000000052
+ KEY_REWIND 0x0000000000000038
+ KEY_PLAY 0x00000000000000B0
+ KEY_FASTFORWARD 0x00000000000000B8
+ KEY_RECORD 0x00000000000000FF
+ KEY_STOP 0x0000000000000070
+ KEY_PAUSE 0x0000000000000072
end codes
end remote
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/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 17:01:59.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 17:01:59.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 17:01:59.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 17:01:59.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 17:01:59.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 17:01:59.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 17:18:58.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
@@ -94,7 +95,7 @@ begin remote
BBB 0x00007bbb
BBC 0x00007bbc
BBD 0x00007bbd
- 0x00007bbe
+ BBE 0x00007bbe
BBF 0x00007bbf
#bc1 - bca unused
BC1 0x00007bc1
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 17:01:59.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 17:01:59.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-use-new-instead-of-conf-as-filename-suffix.patch:
--- NEW FILE lirc-use-new-instead-of-conf-as-filename-suffix.patch ---
>From 3e45e512719feccaa16edfd208273bade4f724e4 Mon Sep 17 00:00:00 2001
From: Mathias Hasselmann <mathias at openismus.com>
Date: Wed, 13 Feb 2008 21:16:09 +0100
Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
and append that the suffix to 'filename_new' instead of 'filename',
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)
exit(EXIT_FAILURE);
}
strcpy(filename_new, filename);
- strcat(filename_new, ".conf");
+ strcat(filename_new, ".new");
filename = filename_new;
}
else
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 4 May 2008 18:21:52 -0000 1.23
+++ .cvsignore 3 Nov 2008 15:08:08 -0000 1.24
@@ -1 +1,5 @@
lirc-0.8.3.tar.bz2
+lirc-0.8.4pre1.tar.bz2
+lirc-0.8.4pre2.tar.bz2
+lirc-0.8.4.tar.bz2
+lirc-0.8.4a.tar.bz2
Index: lirc.init
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/lirc.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lirc.init 16 Aug 2007 09:16:35 -0000 1.3
+++ lirc.init 3 Nov 2008 15:08:09 -0000 1.4
@@ -30,9 +30,40 @@
lockfile=/var/lock/subsys/lirc
+build_lirc_args ()
+{
+ local LIRC_ARGS="$*"
+
+ # For remote only detection support, we need
+ # LIRC_DEVICE undefined
+ if [ -z "$LIRC_DEVICE" ] ; then
+ for dev in /dev/lirc0; do
+ if [ -c $dev ]; then
+ LIRC_DEVICE="$dev"
+ break
+ fi
+ done
+ fi
+
+ # If we have a LIRC_DEVICE or LIRC_DRIVER defined (either because
+ # no devices were defined, OR if we explicitly did), then
+ # populate LIRC_ARGS
+ if [ ! -z "$LIRC_DEVICE" ] || [ ! -z "$LIRC_DRIVER" ]; then
+ if [ -n "$LIRC_DEVICE" ] && [ "$LIRC_DEVICE" != "none" ]; then
+ LIRC_ARGS="--device=$LIRC_DEVICE $LIRC_ARGS"
+ fi
+ if [ -n "$LIRC_DRIVER" ] && [ "$LIRC_DRIVER" != "none" ]; then
+ LIRC_ARGS="--driver=$LIRC_DRIVER $LIRC_ARGS"
+ fi
+ fi
+ echo $LIRC_ARGS
+}
+
start() {
+ LIRC_ARGS=`build_lirc_args $LIRC_ARGS`
+
echo -n $"Starting infrared remote control daemon ($prog): "
- daemon $exec $LIRCD_OPTIONS
+ daemon $exec $LIRC_ARGS $LIRCD_OPTIONS
retval=$?
echo
status $prog >/dev/null 2>&1
Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/lirc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lirc.spec 16 Sep 2008 13:49:52 -0000 1.32
+++ lirc.spec 3 Nov 2008 15:08:09 -0000 1.33
@@ -11,14 +11,14 @@
# - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
%bcond_without alsa
-%bcond_with portaudio
-%bcond_with svgalib
+%bcond_without portaudio
%bcond_without x
-#define pre pre3
+%bcond_with svgalib
+#define pre pre2
Name: lirc
-Version: 0.8.3
-Release: 2%{?pre:.%{pre}}%{?dist}
+Version: 0.8.4a
+Release: 1%{?pre:.%{pre}}%{?dist}
Summary: The Linux Infrared Remote Control package
Group: System Environment/Daemons
@@ -28,8 +28,12 @@
#Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
Source1: %{name}.init
Source2: %{name}.sysconfig
-Patch0: lirc-0.8.3-validate-transmit-buffer.patch
-Patch1: lirc-dont-exit.patch
+Patch0: lirc-use-new-instead-of-conf-as-filename-suffix.patch
+# 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-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}
@@ -38,7 +42,7 @@
BuildRequires: alsa-lib-devel
%endif
%if %{with portaudio}
-BuildRequires: portaudio-devel >= 18
+BuildRequires: portaudio-devel >= 19
%endif
%if %{with svgalib}
BuildRequires: svgalib-devel
@@ -96,13 +100,24 @@
Included applications include daemons which decode the received
signals as well as user space applications which allow controlling a
computer with a remote control. This package contains LIRC
-documentation and a collection of remote control configuration files.
+documentation.
+
+%package remotes
+Summary: LIRC remote definitions
+Group: System Environment/Daemons
+
+%description remotes
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control. This package contains a collection
+of remote control configuration files.
%prep
%setup -q -n %{name}-%{version}%{?pre}
-%patch0 -p1 -b .xbuf
-%patch1 -p1 -b .exit
+%patch0 -p1 -b .suf
chmod 644 contrib/*
@@ -134,6 +149,11 @@
touch -r aclocal.m4 configure.ac # avoid autofoo re-run
+# Do this after, as we're touching the remote definitions earlier
+# Don't create a backup, or the original definitions will get installed
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%configure \
@@ -147,7 +167,6 @@
--with-driver=userspace
make %{?_smp_mflags}
-
%install
rm -rf $RPM_BUILD_ROOT __docs
@@ -185,6 +204,8 @@
rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
+# Put remote definitions in place
+cp -ar remotes $RPM_BUILD_ROOT%{_datadir}/lirc-remotes
%clean
rm -rf $RPM_BUILD_ROOT
@@ -235,16 +256,67 @@
%files doc
%defattr(-,root,root,-)
-%doc __docs/* remotes/
+%doc __docs/*
+
+%files remotes
+%defattr(-,root,root,-)
+%dir %{_datadir}/lirc-remotes
+%{_datadir}/lirc-remotes/*
%changelog
-* Tue Sep 16 2008 Jarod Wilson <jarod at redhat.com> - 0.8.3-2
+* Sun Oct 26 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4a-1
+- Update to lirc 0.8.4a release (fixes mode2 irrecord failures)
+- Really fix the mceusb remote config file this time
+
+* 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
+
+* Fri Oct 10 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-0.5.pre2
+- Re-enable portaudio driver by default, require v19 or later
+
+* Mon Oct 06 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-0.4.pre2
+- Update to 0.8.4pre2
+
+* Mon Oct 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.8.4-0.3.pre1
+- Fix more keycodes for the streamzap remote
+
+* Wed Oct 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.8.4-0.2.pre1
+- Don't create a backup for the keycodes patch, or all the original files
+ will also get installed, and get used in gnome-lirc-properties
+
+* Wed Sep 24 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.4-0.1.pre1
+- Update to 0.8.4pre1
+- Drop upstream patches
+- Adds support for the CommandIR II userspace driver
+
+* Tue Sep 16 2008 - Jarod Wilson <jarod at redhat.com> - 0.8.3-7
- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
-- Include upstream patch to validate transmit buffers
+
+* Thu Aug 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.8.3-6
- Make lircd not exit when there's no device available, so that the
daemon is running as expected when the hardware is plugged back in
- (Bastien Nocera, #440231)
+ (#440231)
+
+* Thu Aug 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.8.3-5
+- Add huge patch to fix the majority of remotes to have sensible keycodes,
+ so they work out-of-the-box (#457273)
+
+* Mon Jun 23 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-4
+- Drop resume switch patch, no longer required
+- Add support for config option style used by gnome-lirc-properties (#442341)
+
+* Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-3
+- Add additional required patches for gnome-lirc-properties (#442248)
+- Put remote definitions in their own sub-package (#442328)
+
+* Mon May 12 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-2
+- Include upstream patch for lircd.conf remote include directives (#442248)
+- Include upstream patch to validate transmit buffers
* Sun May 04 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-1
- Update to 0.8.3 release
Index: lirc.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/lirc.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc.sysconfig 5 Dec 2004 23:17:51 -0000 1.1
+++ lirc.sysconfig 3 Nov 2008 15:08:09 -0000 1.2
@@ -1,13 +1,23 @@
# Note: in addition to these parameters, you need to have working -*- sh -*-
# configuration file for lircd (and lircmd if enabled).
-# Options to lircd(8). Typically, at least a remote controller driver
-# ("-H foo") needs to be specified here. Run "/usr/sbin/lircd -H help" to get
-# a listing of supported drivers.
+# Options to lircd(8). Typically, this will be empty, as which driver to use
+# should be specified using the LIRC_DRIVER variable below.
LIRCD_OPTIONS=""
+# The infrared receiver (and/or transmitter) driver to be used by lircd(8),
+# similar to passing "-H driver" to lircd(8).
+# Run "/usr/sbin/lircd -H help" to get a listing of supported drivers.
+LIRC_DRIVER=""
+
+# Which lirc device will be used by lircd(8).
+# This is the same as passing "-d device" to lircd.
+# An empty value will use the default /dev/lirc device.
+LIRC_DEVICE=""
+
# If "yes", the init script will try to start lircmd(8) too.
ENABLE_LIRCMD="no"
# Options to lircmd(8).
LIRCMD_OPTIONS=""
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 4 May 2008 18:21:52 -0000 1.23
+++ sources 3 Nov 2008 15:08:09 -0000 1.24
@@ -1 +1 @@
-8e78eeded7b31e5ad02e328970437c0f lirc-0.8.3.tar.bz2
+606b714ed843d28060163ffc571fc1f7 lirc-0.8.4a.tar.bz2
--- lirc-0.8.3-validate-transmit-buffer.patch DELETED ---
--- lirc-dont-exit.patch DELETED ---
More information about the fedora-extras-commits
mailing list