From 5b8f39d5813b76ec697221dac54270be8e751577 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 22 Nov 2014 12:52:18 +0100 Subject: [PATCH] v4l-utils: update to v4l-utils-1.6.2 Signed-off-by: Stephan Raue --- packages/sysutils/v4l-utils/package.mk | 2 +- .../patches/v4l-utils-22-add-XBOX_One-remote.patch | 4 ++-- .../v4l-utils/patches/v4l-utils-99-upstream.patch | 12 ------------ 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index fb4add55b0..81a2daedc0 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="1.6.0" +PKG_VERSION="1.6.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" 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 6528149545..db4f1206d9 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_MCE -+# table rc6_mce, type: RC6_MCE NEC +-# table rc6_mce, type: RC6 ++# table rc6_mce, type: RC6 NEC 0x800f0400 KEY_NUMERIC_0 0x800f0401 KEY_NUMERIC_1 0x800f0402 KEY_NUMERIC_2 diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch deleted file mode 100644 index c0f209fbf5..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur v4l-utils-1.6.0/utils/keytable/keytable.c v4l-utils-1.6.0.patch/utils/keytable/keytable.c ---- v4l-utils-1.6.0/utils/keytable/keytable.c 2014-08-22 16:59:47.000000000 +0200 -+++ v4l-utils-1.6.0.patch/utils/keytable/keytable.c 2014-11-15 21:57:15.200451780 +0100 -@@ -226,7 +226,7 @@ - goto err_einval; - if (!strcasecmp(p,"rc5") || !strcasecmp(p,"rc-5")) - ch_proto |= RC_5; -- else if (!strcasecmp(p,"rc6") || !strcasecmp(p,"rc-6")) -+ else if (!strcasecmp(p,"rc6") || !strcasecmp(p,"rc-6") || !strcasecmp(p,"rc6-mce") || !strcasecmp(p,"rc6_mce")) - ch_proto |= RC_6; - else if (!strcasecmp(p,"nec")) - ch_proto |= NEC;