From 0deff2dc98a2771a00c048a2e2294671844001c9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 26 Oct 2019 13:33:09 +0200 Subject: [PATCH] v4l-utils: update to 1.18.0 Disable bpf decoder support for now, it's not yet supported in the LE kernels and needs clang to compile. Signed-off-by: Matthias Reichl --- packages/sysutils/v4l-utils/package.mk | 5 ++- ...utils-0001-fix-build-with-glibc_2.28.patch | 37 ------------------- ...kport-imon-and-rcmm-protocol-support.patch | 35 ------------------ ...v4l-utils-0003-add-xbox-dvd-protocol.patch | 33 ----------------- 4 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-0001-fix-build-with-glibc_2.28.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-0002-backport-imon-and-rcmm-protocol-support.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-0003-add-xbox-dvd-protocol.patch diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index 10e967b077..c5fe2534f2 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -5,8 +5,8 @@ # with 1.0.0 repeat delay is broken. test on upgrade PKG_NAME="v4l-utils" -PKG_VERSION="1.14.2" -PKG_SHA256="e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692" +PKG_VERSION="1.18.0" +PKG_SHA256="6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d" PKG_LICENSE="GPL" PKG_SITE="http://linuxtv.org/" PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2" @@ -14,6 +14,7 @@ PKG_DEPENDS_TARGET="toolchain alsa-lib systemd" PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)." PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \ + --disable-bpf \ --enable-static \ --disable-shared" diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-0001-fix-build-with-glibc_2.28.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-0001-fix-build-with-glibc_2.28.patch deleted file mode 100644 index 851406f40f..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-0001-fix-build-with-glibc_2.28.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a46598389950a9764399667c7d30f318c95ffd0a Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Wed, 1 Aug 2018 23:21:24 +0100 -Subject: [PATCH] fix build with glibc-2.28 - ---- - lib/libv4lconvert/control/libv4lcontrol.c | 1 + - utils/v4l2-ctl/v4l2-ctl.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c -index 1e784ed..1252847 100644 ---- a/lib/libv4lconvert/control/libv4lcontrol.c -+++ b/lib/libv4lconvert/control/libv4lcontrol.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp -index e02dc75..287114b 100644 ---- a/utils/v4l2-ctl/v4l2-ctl.cpp -+++ b/utils/v4l2-ctl/v4l2-ctl.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.1 - diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-0002-backport-imon-and-rcmm-protocol-support.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-0002-backport-imon-and-rcmm-protocol-support.patch deleted file mode 100644 index 9b04950ee0..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-0002-backport-imon-and-rcmm-protocol-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dc70f6cdfa9980b707a958cfca9a3820d51af8f6 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sat, 23 Mar 2019 10:11:55 +0100 -Subject: [PATCH] keytable: backport imon and rc-mm protocols - -Signed-off-by: Matthias Reichl ---- - utils/keytable/keytable.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 34a1522e..67c6f92c 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -112,6 +112,8 @@ enum sysfs_protocols { - SYSFS_SHARP = (1 << 11), - SYSFS_XMP = (1 << 12), - SYSFS_CEC = (1 << 13), -+ SYSFS_IMON = (1 << 14), -+ SYSFS_RCMM = (1 << 15), - SYSFS_INVALID = 0, - }; - -@@ -145,6 +147,8 @@ const struct protocol_map_entry protocol_map[] = { - { "sharp", NULL, SYSFS_SHARP }, - { "xmp", "/xmp_decoder", SYSFS_XMP }, - { "cec", NULL, SYSFS_CEC }, -+ { "imon", NULL, SYSFS_IMON }, -+ { "rc-mm", NULL, SYSFS_RCMM }, - { NULL, NULL, SYSFS_INVALID }, - }; - --- -2.20.1 - diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-0003-add-xbox-dvd-protocol.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-0003-add-xbox-dvd-protocol.patch deleted file mode 100644 index 1bbfabae7a..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-0003-add-xbox-dvd-protocol.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dbf64abf9eed823b35a2931d4882905b6106461e Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sat, 23 Mar 2019 10:19:48 +0100 -Subject: [PATCH] keytable: add xbox-dvd protocol - -Signed-off-by: Matthias Reichl ---- - utils/keytable/keytable.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 67c6f92c..4ee280cc 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -114,6 +114,7 @@ enum sysfs_protocols { - SYSFS_CEC = (1 << 13), - SYSFS_IMON = (1 << 14), - SYSFS_RCMM = (1 << 15), -+ SYSFS_XBOX_DVD = (1 << 16), - SYSFS_INVALID = 0, - }; - -@@ -149,6 +150,7 @@ const struct protocol_map_entry protocol_map[] = { - { "cec", NULL, SYSFS_CEC }, - { "imon", NULL, SYSFS_IMON }, - { "rc-mm", NULL, SYSFS_RCMM }, -+ { "xbox-dvd", NULL, SYSFS_XBOX_DVD }, - { NULL, NULL, SYSFS_INVALID }, - }; - --- -2.20.1 -