v4l-utils: update to v4l-utils-1.0.0

This commit is contained in:
Stefan Saraev 2013-11-09 17:22:17 +02:00 committed by Stephan Raue
parent 3a764bd33d
commit 664a373128
9 changed files with 41 additions and 109 deletions

View File

@ -22,7 +22,16 @@
. config/options $1 . 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 KERNEL_DIR=$(kernel_path) sync-with-kernel
make CFLAGS="$TARGET_CFLAGS" make CFLAGS="$TARGET_CFLAGS"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="v4l-utils" PKG_NAME="v4l-utils"
PKG_VERSION="0.8.3" PKG_VERSION="1.0.0"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" 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_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
PKG_IS_ADDON="no" 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 0x800f7480 KEY_BRIGHTNESSDOWN
0x800f7481 KEY_PLAYPAUSE 0x800f7481 KEY_PLAYPAUSE
+ +
+#Zotac AD10 Remote +Zotac AD10 Remote
+0x8034048e KEY_POWER +0x8034048e KEY_POWER
+0x8034043d KEY_POWER +0x8034043d KEY_POWER
+0x80340400 KEY_NUMERIC_0 +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 +0x80340433 KEY_NUMERIC_STAR
+0x8034043a KEY_DELETE +0x8034043a KEY_DELETE
+0x80340434 KEY_ENTER +0x80340434 KEY_ENTER
+0x8034045d KEY_PROG1 +0x8034045d KEY_MEDIA
+0x8034040d KEY_MUTE +0x8034040d KEY_MUTE
+0x803404cb KEY_INFO +0x803404cb KEY_INFO
+0x80340410 KEY_VOLUMEUP +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 diff --git a/utils/keytable/rc_keymaps/samsung b/utils/keytable/rc_keymaps/samsung
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/samsung 1970-01-01 01:00:00.000000000 +0100 new file mode 100644
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/samsung 2011-05-26 21:04:44.676539080 +0200 index 0000000..2b0c81d
--- /dev/null
+++ b/utils/keytable/rc_keymaps/samsung
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+# table samsung, type: NEC +# table samsung, type: NEC
+0x43532f KEY_NUMERIC_0 +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 +0x43530f KEY_ZOOM
+0x43530e KEY_SUBTITLE +0x43530e KEY_SUBTITLE
+0x43531c KEY_BACK +0x43531c KEY_BACK
\ Kein Zeilenumbruch am Dateiende. diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_maps.cfg v4l-utils-0.8.3.patch/utils/keytable/rc_maps.cfg index f354dfe..ebaa301 100644
--- v4l-utils-0.8.3/utils/keytable/rc_maps.cfg 2011-02-09 23:04:27.000000000 +0100 --- a/utils/keytable/rc_maps.cfg
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_maps.cfg 2011-05-26 21:05:25.944028544 +0200 +++ b/utils/keytable/rc_maps.cfg
@@ -82,6 +82,7 @@ @@ -49,6 +49,7 @@
* rc-alink-dtu-m alink_dtu_m * rc-videomate-s350 videomate_s350
* rc-imon-mce imon_mce * rc-digitalnow-tinytwin digitalnow_tinytwin
* rc-rc6-mce rc6_mce * rc-rc6-mce rc6_mce
+* rc-samsung samsung +* rc-samsung samsung
* rc-pv951 pv951 * rc-avermedia-cardbus avermedia_cardbus
* rc-kworld-315u kworld_315u * rc-dib0700-nec dib0700_nec
* rc-nebula nebula * rc-nebula nebula