Merge pull request #2749 from stefansaraev/v4l-utils

[RFC] update v4l-utils
This commit is contained in:
Stefan Saraev 2013-11-09 10:17:23 -08:00
commit 9847c23597
25 changed files with 130 additions and 124 deletions

View File

@ -22,7 +22,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir
+ <select>KEY_OK</select>
+ <enter>KEY_ENTER</enter>
+ <clear>KEY_DELETE</clear>
+ <start>KEY_PROG1</start>
+ <start>KEY_MEDIA</start>
+ <back>KEY_EXIT</back>
+ <record>KEY_RECORD</record>
+ <play>KEY_PLAY</play>

View File

@ -30,7 +30,7 @@
KEY_PAGEDOWN = KEY_CHANNELDOWN # Channel Up
KEY_PAGEUP = KEY_CHANNELUP # Channel Down
KEY_MUTE = KEY_MUTE # Mute
alt+meta+KEY_ENTER = KEY_PROG1 # Start Key
alt+meta+KEY_ENTER = KEY_MEDIA # Start Key
alt+KEY_F4 = KEY_SUBTITLE # Close (used here for Subtitles)
KEY_ESC = KEY_DELETE # Clear
#KEY_ENTER = KEY_ENTER # Enter (also used for Direction OK)

View File

@ -66,7 +66,7 @@
KEY_HOMEPAGE = KEY_GREEN # Green Key
KEY_MAIL = KEY_YELLOW # Yellow Key
alt+meta+KEY_ENTER = KEY_PROG1 # Home
alt+meta+KEY_ENTER = KEY_MEDIA # Home
ctrl+KEY_M = KEY_AUDIO # Music
ctrl+KEY_I = KEY_CAMERA # Pictures
ctrl+shift+KEY_M = KEY_DVD # DVD/VCD

View File

@ -47,7 +47,7 @@
KEY_EPG = KEY_EPG # EPG
KEY_MENU = KEY_MENU # Menu
KEY_SELECT = KEY_PROG1 # Start Key/Select Key
KEY_SELECT = KEY_MEDIA # Start Key/Select Key
KEY_INFO = KEY_INFO # Info
KEY_BACK = KEY_EXIT # Back

View File

@ -36,7 +36,7 @@
BTN_RIGHT = KEY_INFO # Info/EPG
KEY_F1 = KEY_INFO # Info/EPG
KEY_COMPOSE = KEY_INFO # Info/EPG
alt+meta+KEY_ENTER = KEY_PROG1 # Media
alt+meta+KEY_ENTER = KEY_MEDIA # Media
KEY_LEFT = KEY_LEFT # Left Arrow
KEY_RIGHT = KEY_RIGHT # Right Arrow

View File

@ -36,7 +36,7 @@
KEY_CHANNELUP = KEY_CHANNELUP # CH/PG up
KEY_CHANNELDOWN = KEY_CHANNELDOWN # CH/PG down
KEY_PVR = KEY_PROG1 # Home
KEY_PVR = KEY_MEDIA # Home
KEY_TV = KEY_TV # Live TV
KEY_AUDIO = KEY_AUDIO # Audio
KEY_AUX = KEY_CAMERA # Photo

View File

@ -46,4 +46,4 @@
ctrl+shift+KEY_T = KEY_TUNER # LiveTV
ctrl+KEY_U = KEY_SUBTITLE # Subtitles
ctrl+KEY_G = KEY_EPG # Guide # remapped to EPG (Contextmenu)
alt+KEY_ENTER = KEY_PROG1 # Media/Switch Windows
alt+KEY_ENTER = KEY_MEDIA # Media/Switch Windows

View File

@ -5,7 +5,7 @@
# N: Name="Cyp Se WitheHome"
KEY_POWER = KEY_POWER # Power
alt+meta+KEY_ENTER = KEY_PROG1 # Start Key
alt+meta+KEY_ENTER = KEY_MEDIA # Start Key
ctrl+shift+KEY_P = KEY_PLAY # Play
ctrl+KEY_R = KEY_RECORD # Record
ctrl+KEY_P = KEY_PAUSE # Pause

View File

@ -44,7 +44,7 @@ BTN_TL = KEY_VOLUMEUP # L1 -> Volume Upn
BTN_TL2 = KEY_VOLUMEDOWN # L2 -> Volume down
BTN_THUMBL = KEY_MUTE # L3 -> Mute
KEY_HOMEPAGE = KEY_PROG1 # PS3 Menu
KEY_HOMEPAGE = KEY_MEDIA # PS3 Menu
KEY_SELECT = KEY_RECORD # Select
BTN_START = KEY_OK # Start

View File

@ -43,7 +43,7 @@
KEY_ESC = KEY_DELETE # Delete/Clear
KEY_HOME = KEY_DELETE # Delete/Clear
KEY_TEXT = KEY_TEXT # Teletext
KEY_MEDIA = KEY_PROG1 # Media
KEY_MEDIA = KEY_MEDIA # Media
KEY_VIDEO = KEY_VIDEO # Videos
KEY_DVD = KEY_DVD # DVD

View File

@ -36,7 +36,7 @@
KEY_OPEN = KEY_NEXT # Next
KEY_TIME = KEY_PREVIOUS # Prev
KEY_F6 = KEY_PROG1 # HOME
KEY_F6 = KEY_MEDIA # HOME
KEY_INFO = KEY_INFO # Info
KEY_AUDIO = KEY_NUMERIC_POUND # Audio
KEY_SUBTITLE = KEY_NUMERIC_STAR # Subtitle

View File

@ -28,7 +28,7 @@
KEY_ESC = KEY_DELETE # Delete/Clear
KEY_HOME = KEY_HOME # Home
KEY_MEDIA = KEY_PROG1 # Home
KEY_MEDIA = KEY_MEDIA # Home
KEY_SLEEP = KEY_POWER # Power
KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol -

View File

@ -9,6 +9,6 @@ KEY_RIGHT = KEY_RIGHT # Right
KEY_PREVIOUS = KEY_VOLUMEDOWN # Vol-
KEY_NEXT = KEY_VOLUMEUP # Vol+
BTN_MODE = KEY_PROG1 # Home
BTN_MODE = KEY_MEDIA # Home
BTN_1 = KEY_CHANNELUP # Channel Up
BTN_2 = KEY_CHANNELDOWN # Channel Down

View File

@ -337,7 +337,7 @@ begin remote
KEY_PREVIOUS 0xDD
KEY_FASTFORWARD 0xE3
KEY_REWIND 0xE2
KEY_PROG1 0xD5
KEY_MEDIA 0xD5
KEY_EPG 0xE5
KEY_INFO 0xC3
KEY_UP 0xA6

View File

@ -37,7 +37,7 @@ begin remote
KEY_PREVIOUS 0xDD
KEY_FASTFORWARD 0xE3
KEY_REWIND 0xE2
KEY_PROG1 0xD5
KEY_MEDIA 0xD5
KEY_EPG 0xE5
KEY_INFO 0xC3
KEY_UP 0xA6

View File

@ -22,7 +22,16 @@
. config/options $1
cd $PKG_BUILD/utils/keytable
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--disable-libdvbv5 \
--disable-libv4l \
--disable-v4l-utils \
--disable-qv4l2
cd $ROOT/$PKG_BUILD/utils/keytable
# make KERNEL_DIR=$(kernel_path) sync-with-kernel
make CFLAGS="$TARGET_CFLAGS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="v4l-utils"
PKG_VERSION="0.8.3"
PKG_VERSION="1.0.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@ -33,4 +33,4 @@ PKG_SHORTDESC="v4l-utils: Linux V4L2 and DVB API utilities and v4l libraries (li
PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_AUTORECONF="yes"

View File

@ -1,12 +0,0 @@
diff -Naur v4l-utils-0.8.3/utils/keytable/keytable.c v4l-utils-0.8.3.patch/utils/keytable/keytable.c
--- v4l-utils-0.8.3/utils/keytable/keytable.c 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/keytable.c 2011-03-22 22:40:16.957618675 +0100
@@ -267,7 +267,7 @@
perror("value");
}
- nextkey->codes[0] = (unsigned) strtol(scancode, NULL, 0);
+ nextkey->codes[0] = (unsigned) strtoul(scancode, NULL, 0);
nextkey->codes[1] = (unsigned) value;
nextkey->next = calloc(1, sizeof(*nextkey));
if (!nextkey->next) {

View File

@ -1,12 +0,0 @@
diff -Naur v4l-utils-0.8.3/utils/keytable/keytable.c v4l-utils-0.8.3.patch/utils/keytable/keytable.c
--- v4l-utils-0.8.3/utils/keytable/keytable.c 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/keytable.c 2011-03-23 10:24:09.391305852 +0100
@@ -454,6 +454,8 @@
ch_proto |= SONY;
else if (!strcasecmp(p,"lirc"))
ch_proto |= LIRC;
+ else if (!strcasecmp(p,"other"))
+ ch_proto |= OTHER;
else
goto err_inval;
p = strtok(NULL, ",;");

View File

@ -1,68 +0,0 @@
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_mce
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_mce 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_mce 2011-04-05 17:55:00.641736994 +0200
@@ -16,7 +16,7 @@
0x800ff420 KEY_LEFT
0x800ff421 KEY_RIGHT
0x800ff40b KEY_ENTER
-0x02000028 KEY_ENTER
+# 0x02000028 KEY_ENTER # same as KEY_OK
0x02000028 KEY_OK
0x800ff422 KEY_OK
0x0200002a KEY_EXIT
@@ -67,7 +67,7 @@
0x800ff45d KEY_YELLOW
0x800ff45e KEY_BLUE
0x800ff466 KEY_RED
-0x800ff425 KEY_GREEN
+# 0x800ff425 KEY_GREEN # same as KEY_TUNER
0x800ff468 KEY_YELLOW
0x800ff41d KEY_BLUE
0x800ff40f KEY_INFO
@@ -75,4 +75,4 @@
0x800ff45a KEY_SUBTITLE
0x800ff44d KEY_TITLE
0x800ff40c KEY_POWER
-0x800ff40d KEY_LEFTMETA
+0x800ff40d KEY_PROG1
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_pad v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_pad
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_pad 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_pad 2011-04-05 17:38:46.644003338 +0200
@@ -72,3 +72,15 @@
0x2aa395b7 KEY_SCREEN
0x299115b7 KEY_KEYBOARD
0x299135b7 KEY_KEYBOARD
+
+0x29b195b7 KEY_EJECTCD
+0x02000065 KEY_COMPOSE
+0x02800000 KEY_CONTEXT_MENU
+0x01020000 BTN_RIGHT
+0x01010000 BTN_LEFT
+0x29b715b7 KEY_DASHBOARD
+0x2a9395b7 KEY_CYCLEWINDOWS
+0x299395b7 KEY_EJECTCLOSECD
+0x2ab195b7 KEY_PROG1
+0x2b8395b7 KEY_TIME
+0x289115b7 KEY_POWER
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/kworld_plus_tv_analog v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/kworld_plus_tv_analog
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/kworld_plus_tv_analog 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/kworld_plus_tv_analog 2011-04-05 17:38:46.645003319 +0200
@@ -1,5 +1,5 @@
# table kworld_plus_tv_analog, type: UNKNOWN
-0x0c KEY_LEFTMETA
+0x0c KEY_PROG1
0x16 KEY_CLOSECD
0x1d KEY_POWER2
0x00 KEY_1
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce 2011-04-05 17:38:46.801000225 +0200
@@ -12,7 +12,7 @@
0x800f040a KEY_DELETE
0x800f040b KEY_ENTER
0x800f040c KEY_POWER
-0x800f040d KEY_LEFTMETA
+0x800f040d KEY_PROG1
0x800f040e KEY_MUTE
0x800f040f KEY_INFO
0x800f0410 KEY_VOLUMEUP

View File

@ -0,0 +1,13 @@
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
index 8bcd5c4..e8e67da 100644
--- a/utils/keytable/keytable.c
+++ b/utils/keytable/keytable.c
@@ -471,6 +471,8 @@ static error_t parse_opt(int k, char *arg, struct argp_state *state)
ch_proto |= LIRC;
else if (!strcasecmp(p,"rc-5-sz"))
ch_proto |= RC_5_SZ;
+ else if (!strcasecmp(p,"other"))
+ ch_proto |= OTHER;
else
goto err_inval;
p = strtok(NULL, ",;");

View File

@ -6,7 +6,7 @@ diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.pat
0x800f7480 KEY_BRIGHTNESSDOWN
0x800f7481 KEY_PLAYPAUSE
+
+Zotac AD10 Remote
+#Zotac AD10 Remote
+0x8034048e KEY_POWER
+0x8034043d KEY_POWER
+0x80340400 KEY_NUMERIC_0
@ -23,7 +23,7 @@ diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.pat
+0x80340433 KEY_NUMERIC_STAR
+0x8034043a KEY_DELETE
+0x80340434 KEY_ENTER
+0x8034045d KEY_PROG1
+0x8034045d KEY_MEDIA
+0x8034040d KEY_MUTE
+0x803404cb KEY_INFO
+0x80340410 KEY_VOLUMEUP

View File

@ -1,6 +1,8 @@
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/samsung v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/samsung
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/samsung 1970-01-01 01:00:00.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/samsung 2011-05-26 21:04:44.676539080 +0200
diff --git a/utils/keytable/rc_keymaps/samsung b/utils/keytable/rc_keymaps/samsung
new file mode 100644
index 0000000..2b0c81d
--- /dev/null
+++ b/utils/keytable/rc_keymaps/samsung
@@ -0,0 +1,31 @@
+# table samsung, type: NEC
+0x43532f KEY_NUMERIC_0
@ -33,15 +35,15 @@ diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/samsung v4l-utils-0.8.3.pat
+0x43530f KEY_ZOOM
+0x43530e KEY_SUBTITLE
+0x43531c KEY_BACK
\ Kein Zeilenumbruch am Dateiende.
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_maps.cfg v4l-utils-0.8.3.patch/utils/keytable/rc_maps.cfg
--- v4l-utils-0.8.3/utils/keytable/rc_maps.cfg 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_maps.cfg 2011-05-26 21:05:25.944028544 +0200
@@ -82,6 +82,7 @@
* rc-alink-dtu-m alink_dtu_m
* rc-imon-mce imon_mce
diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
index f354dfe..ebaa301 100644
--- a/utils/keytable/rc_maps.cfg
+++ b/utils/keytable/rc_maps.cfg
@@ -49,6 +49,7 @@
* rc-videomate-s350 videomate_s350
* rc-digitalnow-tinytwin digitalnow_tinytwin
* rc-rc6-mce rc6_mce
+* rc-samsung samsung
* rc-pv951 pv951
* rc-kworld-315u kworld_315u
* rc-avermedia-cardbus avermedia_cardbus
* rc-dib0700-nec dib0700_nec
* rc-nebula nebula

View File

@ -0,0 +1,74 @@
diff --git a/utils/keytable/rc_keymaps/rc6_mce b/utils/keytable/rc_keymaps/rc6_mce
index 9dca275..3b284a0 100644
--- a/utils/keytable/rc_keymaps/rc6_mce
+++ b/utils/keytable/rc_keymaps/rc6_mce
@@ -173,3 +173,70 @@ Zotac AD10 Remote
0x8034046e KEY_GREEN
0x8034046f KEY_YELLOW
0x80340470 KEY_BLUE
+
+#HP MCE Remote
+0x80111200 KEY_NUMERIC_0
+0x80111201 KEY_NUMERIC_1
+0x80111202 KEY_NUMERIC_2
+0x80111203 KEY_NUMERIC_3
+0x80111204 KEY_NUMERIC_4
+0x80111205 KEY_NUMERIC_5
+0x80111206 KEY_NUMERIC_6
+0x80111207 KEY_NUMERIC_7
+0x80111208 KEY_NUMERIC_8
+0x80111209 KEY_NUMERIC_9
+0x80111256 KEY_DELETE
+0x8011125c KEY_ENTER
+0x801112a8 KEY_POWER
+0x801112a1 KEY_MEDIA
+0x8011120d KEY_MUTE
+0x80111281 KEY_INFO
+0x80111210 KEY_VOLUMEUP
+0x80111211 KEY_VOLUMEDOWN
+0x8011121e KEY_CHANNELUP
+0x8011121f KEY_CHANNELDOWN
+0x80111228 KEY_FASTFORWARD
+0x80111229 KEY_REWIND
+0x8011122c KEY_PLAY
+0x80111237 KEY_RECORD
+0x80111230 KEY_PAUSE
+0x7011126e KEY_PLAYPAUSE
+0x80111231 KEY_STOP
+0x80111220 KEY_NEXT
+0x80111221 KEY_PREVIOUS
+0x801112a2 KEY_NUMERIC_POUND
+0x801112ac KEY_NUMERIC_STAR
+0x80111258 KEY_UP
+0x80111259 KEY_DOWN
+0x8011125a KEY_LEFT
+0x8011125b KEY_RIGHT
+0x8011125c KEY_OK
+0x80111255 KEY_EXIT
+0x70111224 KEY_DVD
+0x80111292 KEY_TUNER
+0x801112cc KEY_EPG
+0x70111227 KEY_ZOOM
+0x7011123a KEY_BRIGHTNESSUP
+0x70111246 KEY_TV
+0x70111247 KEY_AUDIO
+0x801112a0 KEY_PVR
+0x70111249 KEY_CAMERA
+0x7011124a KEY_VIDEO
+0x7011124c KEY_LANGUAGE
+0x7011124d KEY_TITLE
+0x7011124e KEY_PRINT
+0x70111250 KEY_RADIO
+0x7011125a KEY_SUBTITLE
+0x801112e4 KEY_RED
+0x801112e5 KEY_GREEN
+0x801112e6 KEY_YELLOW
+0x801112e7 KEY_BLUE
+0x8011120c KEY_POWER2
+0x7011126e KEY_PLAYPAUSE
+0x8011120b KEY_MEDIA
+0x70111280 KEY_BRIGHTNESSDOWN
+0x80111254 KEY_SETTINGS
+0x8011129f KEY_LASTSOURCE
+0x8011128b KEY_SOURCE
+0x801112a3 KEY_SCREEN