diff --git a/srcpkgs/qv4l2/patches/musl.patch b/srcpkgs/qv4l2/patches/musl.patch deleted file mode 100644 index 869ca324f29..00000000000 --- a/srcpkgs/qv4l2/patches/musl.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git utils/ir-ctl/keymap.h utils/ir-ctl/keymap.h -index f2b2963..51e4440 100644 ---- a/utils/ir-ctl/keymap.h -+++ b/utils/ir-ctl/keymap.h -@@ -1,6 +1,11 @@ - /* SPDX-License-Identifier: GPL-2.0 */ - #ifndef __KEYMAP_H - #define __KEYMAP_H -+#include -+#ifndef __error_t_defined -+# define __error_t_defined 1 -+typedef int error_t; -+#endif - - struct keymap { - struct keymap *next; -@@ -20,16 +25,16 @@ struct protocol_param { - - struct scancode_entry { - struct scancode_entry *next; -- u_int32_t scancode; -+ uint32_t scancode; - char *keycode; - }; - - struct raw_entry { - struct raw_entry *next; -- u_int32_t scancode; -- u_int32_t raw_length; -+ uint32_t scancode; -+ uint32_t raw_length; - char *keycode; -- u_int32_t raw[1]; -+ uint32_t raw[1]; - }; - - void free_keymap(struct keymap *map); -diff --git utils/keytable/keymap.h utils/keytable/keymap.h -index f2b2963..51e4440 100644 ---- a/utils/keytable/keymap.h -+++ b/utils/keytable/keymap.h -@@ -1,6 +1,11 @@ - /* SPDX-License-Identifier: GPL-2.0 */ - #ifndef __KEYMAP_H - #define __KEYMAP_H -+#include -+#ifndef __error_t_defined -+# define __error_t_defined 1 -+typedef int error_t; -+#endif - - struct keymap { - struct keymap *next; -@@ -20,16 +25,16 @@ struct protocol_param { - - struct scancode_entry { - struct scancode_entry *next; -- u_int32_t scancode; -+ uint32_t scancode; - char *keycode; - }; - - struct raw_entry { - struct raw_entry *next; -- u_int32_t scancode; -- u_int32_t raw_length; -+ uint32_t scancode; -+ uint32_t raw_length; - char *keycode; -- u_int32_t raw[1]; -+ uint32_t raw[1]; - }; - - void free_keymap(struct keymap *map); diff --git a/srcpkgs/qv4l2/patches/time64.patch b/srcpkgs/qv4l2/patches/time64.patch deleted file mode 100644 index fdfc7de4cb2..00000000000 --- a/srcpkgs/qv4l2/patches/time64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/utils/keytable/keytable.c 2019-09-22 11:22:54.000000000 +0200 -+++ b/utils/keytable/keytable.c 2021-01-15 14:48:30.569549169 +0100 -@@ -1533,7 +1533,7 @@ - - for (i = 0; i < rd / sizeof(struct input_event); i++) { - printf(_("%ld.%06ld: event type %s(0x%02x)"), -- ev[i].time.tv_sec, ev[i].time.tv_usec, -+ ev[i].input_event_sec, ev[i].input_event_usec, - get_event_name(events_type, ev[i].type), ev[i].type); - - switch (ev[i].type) { diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index 292be169c20..0bd15a30a73 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -1,7 +1,7 @@ # Template file for 'qv4l2' pkgname=qv4l2 -version=1.18.0 -revision=2 +version=1.22.1 +revision=1 wrksrc="v4l-utils-${version}" build_style=gnu-configure configure_args="--enable-qv4l2 --with-udevdir=/usr/lib/udev" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://linuxtv.org/" distfiles="https://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2" -checksum=6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d +checksum=65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel"