rpms/lirc/devel hw_commandir.h, NONE, 1.1 lirc-0.8.4-standardize-remote-keycodes.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 lirc-use-new-instead-of-conf-as-filename-suffix.patch, 1.1, 1.2 lirc.spec, 1.38, 1.39 sources, 1.23, 1.24 lirc-0.8.3-fix-remote-keycodes.patch, 1.1, NONE lirc-0.8.3-remote-includes-directive.patch, 1.1, NONE lirc-0.8.3-validate-transmit-buffer.patch, 1.2, NONE
Jarod Wilson
jwilson at fedoraproject.org
Wed Sep 24 22:16:19 UTC 2008
Author: jwilson
Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21600
Modified Files:
.cvsignore
lirc-use-new-instead-of-conf-as-filename-suffix.patch
lirc.spec sources
Added Files:
hw_commandir.h lirc-0.8.4-standardize-remote-keycodes.patch
Removed Files:
lirc-0.8.3-fix-remote-keycodes.patch
lirc-0.8.3-remote-includes-directive.patch
lirc-0.8.3-validate-transmit-buffer.patch
Log Message:
* 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
--- NEW FILE hw_commandir.h ---
/****************************************************************************
** hw_commandir.h **********************************************************
****************************************************************************
*
* Copyright (C) 1999 Christoph Bartelmus <lirc at bartelmus.de>
* -- Original hw_default.h
* Modified for CommandIR Transceivers, April-June 2008, Matthew Bodkin
*
*/
#ifndef HW_COMMANDIR_H
#define HW_COMMANDIR_H
#define RX_BUFFER_SIZE 1024
#define TX_BUFFER_SIZE 1024
#define TX_QUEUE 1
#define RX_QUEUE 0
#define MAX_COMMANDIRS 4
#define MAX_COMMAND 8192
/* transmitter channel control */
#define MAX_DEVICES 4
#define MAX_CHANNELS 16
#define DEVICE_CHANNELS 4
#define MAX_MASK 0xffff
#define MAX_SIGNALQ 100
/* CommandIR control codes */
#define CHANNEL_EN_MASK 1
#define FREQ_HEADER 2
#define MCU_CTRL_SIZE 3
#define TX_HEADER 7
#define TX_HEADER_NEW 8
/* New for CommandIR II */
#define READ_INPUTS 10
#define PROC_SET 11
#define INIT_FUNCTION 12
#define RX_SELECT 13
#define TX_COMMANDIR_II 14
/* Internal to driver */
#define TX_LIRC_T 15
#define FREQ_HEADER_LIRC 16
#define RXDECODE_HEADER_LIRC 17
#define INIT_HEADER_LIRC 18
#define DEINIT_HEADER_LIRC 19
#define GET_VERSION 20
#define COMMANDIR_2_PULSE_MASK 0x8000
#define COMMANDIR_2_OVERFLOW_MASK 0x4000
#define DEFAULT_PULSE_WIDTH 13
#define USB_CMDIR_VENDOR_ID 0x10c4
#define USB_CMDIR_PRODUCT_ID 0x0003
#define USB_CMDIR_MINOR_BASE 192
#define HW_COMMANDIR_MINI 1
#define HW_COMMANDIR_2 2
#define HW_COMMANDIR_UNKNOWN 127
#define MAX_HW_MINI_PACKET 64
// CommandIR has lots of buffer room, we don't need to poll constantly
#define USB_TIMEOUT_MS 5000
#define USB_TIMEOUT_US 1000
#define WAIT_BETWEEN_READS_US 10000
#define MAX_WAIT_BETWEEN_READS_US 5000000
#define MIN_WAIT_BETWEEN_READS_US 5000
#define USB_MAX_BUSES 8
#define USB_MAX_BUSDEV 127
#define RX_HEADER_DATA 0x01
#define RX_HEADER_EVENTS 0x02
#define RX_HEADER_TXAVAIL 0x03
// We keep CommandIR's OPEN even on -deinit for speed and to monitor
// Other non-LIRC events (plugin, suspend, etc)
#define USB_KEEP_WARM 1
// CommandIR lircd.conf event driven code definitions
#define LIRCCODE_GAP 125000
#define JACK_PLUG_1 0x01
#define JACK_PLUG_2 0x02
#define JACK_PLUG_3 0x03
#define JACK_PLUG_4 0x04
#define JACK_PLUG_5 0x11
#define JACK_PLUG_6 0x12
#define JACK_PLUG_7 0x13
#define JACK_PLUG_8 0x14
#define JACK_PLUG_9 0x21
#define JACK_PLUG_10 0x22
#define JACK_PLUG_11 0x23
#define JACK_PLUG_12 0x24
#define JACK_PLUG_13 0x31
#define JACK_PLUG_14 0x32
#define JACK_PLUG_15 0x33
#define JACK_PLUG_16 0x34
#define JACK_UNPLUG_1 0x05
#define JACK_UNPLUG_2 0x06
#define JACK_UNPLUG_3 0x07
#define JACK_UNPLUG_4 0x08
#define JACK_UNPLUG_5 0x15
#define JACK_UNPLUG_6 0x16
#define JACK_UNPLUG_7 0x17
#define JACK_UNPLUG_8 0x18
#define JACK_UNPLUG_9 0x25
#define JACK_UNPLUG_10 0x26
#define JACK_UNPLUG_11 0x27
#define JACK_UNPLUG_12 0x28
#define JACK_UNPLUG_13 0x35
#define JACK_UNPLUG_14 0x36
#define JACK_UNPLUG_15 0x37
#define JACK_UNPLUG_16 0x38
#define SELECT_TX_INTERNAL 0x09
#define SELECT_TX_ExTERNAL 0x0A
#define SELECT_TX_ON_1 0x0D
#define SELECT_TX_ON_2 0x1D
#define SELECT_TX_ON_3 0x2D
#define SELECT_TX_ON_4 0x3D
#define JACK_PLUG_RX_1 0x0B
#define JACK_UNPLUG_RX_1 0x0C
#define JACK_PLUG_RX_2 0x1B
#define JACK_UNPLUG_RX_2 0x1C
#define JACK_PLUG_RX_3 0x2B
#define JACK_UNPLUG_RX_3 0x2C
#define JACK_PLUG_RX_4 0x3B
#define JACK_UNPLUG_RX_4 0x3C
#define COMMANDIR_PLUG_1 0x41
#define COMMANDIR_PLUG_2 0x42
#define COMMANDIR_PLUG_3 0x43
#define COMMANDIR_PLUG_4 0x44
#define COMMANDIR_UNPLUG_1 0x45
#define COMMANDIR_UNPLUG_2 0x46
#define COMMANDIR_UNPLUG_3 0x47
#define COMMANDIR_UNPLUG_4 0x48
#define COMMANDIR_REORDERED 0x50
#define COMMANDIR_READY 0x51
#define COMMANDIR_STOPPED 0x52
#define COMMANDIR_POLL_FASTER 0x53
#define COMMANDIR_POLL_SLOWER 0x54
#define SETTRANSMITTERS_1 0xf0
#define SETTRANSMITTERS_2 0xf1
#define SETTRANSMITTERS_3 0xf2
#define SETTRANSMITTERS_4 0xf3
#define SETTRANSMITTERS_5 0xf4
#define SETTRANSMITTERS_6 0xf5
#define SETTRANSMITTERS_7 0xf6
#define SETTRANSMITTERS_8 0xf7
#define SETTRANSMITTERS_9 0xf8
#define SETTRANSMITTERS_10 0xf9
#define SETTRANSMITTERS_11 0xfa
#define SETTRANSMITTERS_12 0xfb
#define SETTRANSMITTERS_13 0xfc
#define SETTRANSMITTERS_14 0xfd
#define SETTRANSMITTERS_15 0xfe
#define SETTRANSMITTERS_16 0xff
// What's in a returning data packet
#define COMMANDIR_RX_EVENTS 0x02
#define COMMANDIR_RX_DATA 0x01
#endif
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/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
@@ -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
[...4137 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 4 May 2008 18:08:35 -0000 1.23
+++ .cvsignore 24 Sep 2008 22:15:49 -0000 1.24
@@ -1 +1,2 @@
lirc-0.8.3.tar.bz2
+lirc-0.8.4pre1.tar.bz2
lirc-use-new-instead-of-conf-as-filename-suffix.patch:
Index: lirc-use-new-instead-of-conf-as-filename-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc-use-new-instead-of-conf-as-filename-suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-use-new-instead-of-conf-as-filename-suffix.patch 2 Jun 2008 18:57:47 -0000 1.1
+++ lirc-use-new-instead-of-conf-as-filename-suffix.patch 24 Sep 2008 22:15:49 -0000 1.2
@@ -6,23 +6,15 @@
to prevent a buffer overrun for 'argv[optind]'.
---
- daemons/irrecord.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/daemons/irrecord.c b/daemons/irrecord.c
-index ea298e3..df03c7b 100644
---- a/daemons/irrecord.c
-+++ b/daemons/irrecord.c
-@@ -364,7 +364,7 @@ int main(int argc,char **argv)
+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;
++ strcat(filename_new, ".new");
+ filename = filename_new;
}
- fout=fopen(filename,"w");
- if(fout==NULL)
---
-1.5.3.7
-
+ else
Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- lirc.spec 16 Sep 2008 13:36:23 -0000 1.38
+++ lirc.spec 24 Sep 2008 22:15:49 -0000 1.39
@@ -14,29 +14,26 @@
%bcond_with portaudio
%bcond_with svgalib
%bcond_without x
-#define pre pre3
+%define pre pre1
Name: lirc
-Version: 0.8.3
-Release: 7%{?pre:.%{pre}}%{?dist}
+Version: 0.8.4
+Release: 0.1%{?pre:.%{pre}}%{?dist}
Summary: The Linux Infrared Remote Control package
Group: System Environment/Daemons
License: GPLv2+
URL: http://www.lirc.org/
-Source0: http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0: http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
Source1: %{name}.init
Source2: %{name}.sysconfig
-Patch0: lirc-0.8.3-remote-includes-directive.patch
-Patch1: lirc-0.8.3-validate-transmit-buffer.patch
-Patch2: lirc-use-new-instead-of-conf-as-filename-suffix.patch
+# temporary, was accidentally left out of 0.8.4pre1 tarball
+Source3: hw_commandir.h
+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
-Patch3: lirc-0.8.3-fix-remote-keycodes.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=440231
-# http://thread.gmane.org/gmane.comp.hardware.lirc/6889
-Patch4: lirc-dont-exit.patch
+Patch1: lirc-0.8.4-standardize-remote-keycodes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{__perl}
@@ -120,10 +117,8 @@
%prep
%setup -q -n %{name}-%{version}%{?pre}
-%patch0 -p1 -b .incl
-%patch1 -p1 -b .xbuf
-%patch2 -p1 -b .suf
-%patch4 -p0 -b .exit
+%patch0 -p1 -b .suf
+cp %{SOURCE3} daemons/
chmod 644 contrib/*
@@ -156,7 +151,7 @@
touch -r aclocal.m4 configure.ac # avoid autofoo re-run
# Do this after, as we're touching the remote definitions earlier
-%patch3 -p1 -b .keycode
+%patch1 -p1 -b .keycode
%build
%configure \
@@ -268,6 +263,11 @@
%changelog
+* 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)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 4 May 2008 18:08:35 -0000 1.23
+++ sources 24 Sep 2008 22:15:49 -0000 1.24
@@ -1 +1 @@
-8e78eeded7b31e5ad02e328970437c0f lirc-0.8.3.tar.bz2
+b79601ea90fa552653dfc69e29fd5c4d lirc-0.8.4pre1.tar.bz2
--- lirc-0.8.3-fix-remote-keycodes.patch DELETED ---
--- lirc-0.8.3-remote-includes-directive.patch DELETED ---
--- lirc-0.8.3-validate-transmit-buffer.patch DELETED ---
More information about the fedora-extras-commits
mailing list