Removed upstreamed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>lilik-openwrt-22.03
@ -1,61 +1,10 @@ | |||
--- a/utils/cec-ctl/cec-ctl.cpp | |||
+++ b/utils/cec-ctl/cec-ctl.cpp | |||
@@ -18,6 +18,7 @@ | |||
#include <errno.h> | |||
#include <sys/ioctl.h> | |||
#include <stdarg.h> | |||
+#include <ctime> | |||
#include <cerrno> | |||
#include <string> | |||
#include <vector> | |||
--- a/utils/cec-follower/cec-follower.h | |||
+++ b/utils/cec-follower/cec-follower.h | |||
@@ -9,6 +9,7 @@ | |||
#define _CEC_FOLLOWER_H_ | |||
#include <stdarg.h> | |||
+#include <ctime> | |||
#include <cerrno> | |||
#include <string> | |||
#include <linux/cec-funcs.h> | |||
--- a/utils/common/media-info.cpp | |||
+++ b/utils/common/media-info.cpp | |||
@@ -21,6 +21,7 @@ | |||
#include <linux/media.h> | |||
#include <fstream> | |||
+#include <iostream> | |||
#include <media-info.h> | |||
static std::string num2s(unsigned num, bool is_hex = true) | |||
--- a/utils/rds-ctl/rds-ctl.cpp | |||
+++ b/utils/rds-ctl/rds-ctl.cpp | |||
@@ -27,6 +27,8 @@ | |||
#include <linux/videodev2.h> | |||
#include <libv4l2rds.h> | |||
--- a/utils/libcecutil/cec-info.cpp | |||
+++ b/utils/libcecutil/cec-info.cpp | |||
@@ -5,6 +5,7 @@ | |||
* Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. | |||
*/ | |||
+#include <cctype> | |||
+#include <ctime> | |||
#include <list> | |||
#include <vector> | |||
#include <map> | |||
--- a/utils/v4l2-compliance/media-info.cpp | |||
+++ b/utils/v4l2-compliance/media-info.cpp | |||
@@ -21,6 +21,7 @@ | |||
#include <linux/media.h> | |||
#include <fstream> | |||
+#include <iostream> | |||
#include <media-info.h> | |||
static std::string num2s(unsigned num, bool is_hex = true) | |||
--- a/utils/v4l2-ctl/media-info.cpp | |||
+++ b/utils/v4l2-ctl/media-info.cpp | |||
@@ -21,6 +21,7 @@ | |||
#include <linux/media.h> | |||
#include <fstream> | |||
+#include <iostream> | |||
#include <media-info.h> | |||
static std::string num2s(unsigned num, bool is_hex = true) | |||
#include <stdio.h> | |||
#include <string> | |||
#include <unistd.h> |
@ -1,34 +0,0 @@ | |||
POSIX says that behavior when subopts list is empty is undefined. | |||
musl libs will set value to NULL which leads to crash. | |||
Simply avoid getsubopt, since we cannot rely on it. | |||
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp | |||
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp | |||
@@ -679,16 +679,17 @@ static bool parse_subset(char *optarg) | |||
static bool parse_next_subopt(char **subs, char **value) | |||
{ | |||
- static char *const subopts[] = { | |||
- NULL | |||
- }; | |||
- int opt = getsubopt(subs, subopts, value); | |||
+ char *p = *subs; | |||
+ *value = *subs; | |||
- if (opt < 0 || *value) | |||
- return false; | |||
- fprintf(stderr, "No value given to suboption <%s>\n", | |||
- subopts[opt]); | |||
- return true; | |||
+ while (*p && *p != ',') | |||
+ p++; | |||
+ | |||
+ if (*p) | |||
+ *p++ = '\0'; | |||
+ | |||
+ *subs = p; | |||
+ return false; | |||
} | |||
void common_cmd(int ch, char *optarg) |
@ -1,11 +0,0 @@ | |||
--- a/utils/keytable/keytable.c | |||
+++ b/utils/keytable/keytable.c | |||
@@ -1686,7 +1686,7 @@ static void test_event(struct rc_device *rc_dev, int fd) | |||
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) { |
@ -1,13 +0,0 @@ | |||
--- a/utils/keytable/keytable.c | |||
+++ b/utils/keytable/keytable.c | |||
@@ -61,6 +61,10 @@ struct input_keymap_entry_v2 { | |||
u_int8_t scancode[32]; | |||
}; | |||
+#ifndef input_event_sec | |||
+#define input_event_sec time.tv_sec | |||
+#define input_event_usec time.tv_usec | |||
+#endif | |||
#define IR_PROTOCOLS_USER_DIR IR_KEYTABLE_USER_DIR "/protocols" | |||
#define IR_PROTOCOLS_SYSTEM_DIR IR_KEYTABLE_SYSTEM_DIR "/protocols" |