From 8cc3a30690305fe0bc53f98beed114fc84fcf6c4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 8 Nov 2014 17:57:16 +0100 Subject: [PATCH] v4l-utils: update to v4l-utils-1.6.0 Signed-off-by: Stephan Raue --- .../eventlircd/evmap/03_0bc7_0006.evmap | 6 +++-- packages/sysutils/v4l-utils/package.mk | 9 +------ .../v4l-utils-02-fix_OTHER_protocol.patch | 13 --------- .../v4l-utils-20-add_samsung_keytable.patch | 27 +++++++++---------- .../v4l-utils-22-add-XBOX_One-remote.patch | 4 +-- 5 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-02-fix_OTHER_protocol.patch diff --git a/packages/sysutils/eventlircd/evmap/03_0bc7_0006.evmap b/packages/sysutils/eventlircd/evmap/03_0bc7_0006.evmap index 1cfee9fcbf..a07b021022 100644 --- a/packages/sysutils/eventlircd/evmap/03_0bc7_0006.evmap +++ b/packages/sysutils/eventlircd/evmap/03_0bc7_0006.evmap @@ -26,11 +26,13 @@ KEY_RIGHT = KEY_RIGHT # Direction Right KEY_PLAY = KEY_PLAY # Play (also used for Pause) - KEY_STOP = KEY_STOP # Stop + KEY_STOP = KEY_STOP # Stop #deprecated + KEY_STOPCD = KEY_STOP # Stop KEY_PAUSE = KEY_PAUSE # PAUSE KEY_RECORD = KEY_RECORD # Record - KEY_FORWARD = KEY_FORWARD # Forward + KEY_FORWARD = KEY_FORWARD # Forward # deprecated + KEY_FASTFORWARD = KEY_FORWARD # Forward KEY_REWIND = KEY_REWIND # Reverse KEY_NEXT = KEY_NEXT # Next track KEY_PREVIOUS = KEY_PREVIOUS # Pre-track diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index 36e5f1ac26..9b8d77f62a 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -19,7 +19,7 @@ # with 1.0.0 repeat delay is broken. test on upgrade PKG_NAME="v4l-utils" -PKG_VERSION="0.8.9" +PKG_VERSION="1.6.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -39,10 +39,3 @@ PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr -C utils/keytable" make_target() { make -C utils/keytable CFLAGS="$TARGET_CFLAGS" } - -post_makeinstall_target() { - rm -rf $INSTALL/lib/udev/rules.d - - mkdir -p $INSTALL/usr/lib/udev/rules.d - cp utils/keytable/*.rules $INSTALL/usr/lib/udev/rules.d -} diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-02-fix_OTHER_protocol.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-02-fix_OTHER_protocol.patch deleted file mode 100644 index 1da1b6f4f3..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-02-fix_OTHER_protocol.patch +++ /dev/null @@ -1,13 +0,0 @@ -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, ",;"); diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-20-add_samsung_keytable.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-20-add_samsung_keytable.patch index 5d54a77bc7..12f38bafdd 100644 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-20-add_samsung_keytable.patch +++ b/packages/sysutils/v4l-utils/patches/v4l-utils-20-add_samsung_keytable.patch @@ -1,8 +1,6 @@ -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 +diff -Naur v4l-utils-1.6.0/utils/keytable/rc_keymaps/samsung v4l-utils-1.6.0.patch/utils/keytable/rc_keymaps/samsung +--- v4l-utils-1.6.0/utils/keytable/rc_keymaps/samsung 1970-01-01 01:00:00.000000000 +0100 ++++ v4l-utils-1.6.0.patch/utils/keytable/rc_keymaps/samsung 2014-11-08 17:51:13.358148309 +0100 @@ -0,0 +1,31 @@ +# table samsung, type: NEC +0x43532f KEY_NUMERIC_0 @@ -35,15 +33,14 @@ index 0000000..2b0c81d +0x43530f KEY_ZOOM +0x43530e KEY_SUBTITLE +0x43537e KEY_BACK -diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg -index 567b8e0..04bed89 100644 ---- a/utils/keytable/rc_maps.cfg -+++ b/utils/keytable/rc_maps.cfg -@@ -49,6 +49,7 @@ - * rc-winfast-usbii-deluxe winfast_usbii_deluxe - * rc-anysee anysee +diff -Naur v4l-utils-1.6.0/utils/keytable/rc_maps.cfg v4l-utils-1.6.0.patch/utils/keytable/rc_maps.cfg +--- v4l-utils-1.6.0/utils/keytable/rc_maps.cfg 2014-09-08 08:58:40.000000000 +0200 ++++ v4l-utils-1.6.0.patch/utils/keytable/rc_maps.cfg 2014-11-08 17:52:02.895229258 +0100 +@@ -65,6 +65,7 @@ + * rc-ati-x10 ati_x10 + * rc-iodata-bctv7e iodata_bctv7e * rc-rc6-mce rc6_mce +* rc-samsung samsung - * rc-adstech-dvb-t-pci adstech_dvb_t_pci - * rc-kworld-pc150u kworld_pc150u - * rc-iodata-bctv7e iodata_bctv7e + * rc-technisat-usb2 technisat_usb2 + * rc-hauppauge hauppauge + * rc-terratec-cinergy-xs terratec_cinergy_xs diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch index db4f1206d9..6528149545 100644 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch +++ b/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch @@ -2,8 +2,8 @@ diff -Naur v4l-utils-0.8.9/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.9.pat --- v4l-utils-0.8.9/utils/keytable/rc_keymaps/rc6_mce 2014-05-20 14:31:04.585559227 +0200 +++ v4l-utils-0.8.9.patch/utils/keytable/rc_keymaps/rc6_mce 2014-05-20 17:47:04.341378915 +0200 @@ -1,4 +1,4 @@ --# table rc6_mce, type: RC6 -+# table rc6_mce, type: RC6 NEC +-# table rc6_mce, type: RC6_MCE ++# table rc6_mce, type: RC6_MCE NEC 0x800f0400 KEY_NUMERIC_0 0x800f0401 KEY_NUMERIC_1 0x800f0402 KEY_NUMERIC_2