diff options
Diffstat (limited to 'package/libv4l')
-rw-r--r-- | package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch | 35 | ||||
-rw-r--r-- | package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch | 39 |
2 files changed, 74 insertions, 0 deletions
diff --git a/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch b/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch new file mode 100644 index 0000000000..656008b708 --- /dev/null +++ b/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch @@ -0,0 +1,35 @@ +From 663b7be9d27c979c914011a3ce707e227987bc59 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Sat, 3 Feb 2018 22:47:18 +0100 +Subject: [PATCH] keytable: fix EVIOCSCLOCKID related compile failure + +Fixes: + + keytable.c: In function 'test_event': + keytable.c:1351:12: error: 'EVIOCSCLOCKID' undeclared (first use in this function) + ioctl(fd, EVIOCSCLOCKID, &mode); + ^~~~~~~~~~~~~ + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + utils/keytable/keytable.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c +index 34a1522e..925eab00 100644 +--- a/utils/keytable/keytable.c ++++ b/utils/keytable/keytable.c +@@ -55,6 +55,10 @@ struct input_keymap_entry_v2 { + u_int8_t scancode[32]; + }; + ++#ifndef EVIOCSCLOCKID ++#define EVIOCSCLOCKID _IOW('E', 0xa0, int) ++#endif ++ + #ifndef EVIOCGKEYCODE_V2 + #define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry_v2) + #define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry_v2) +-- +2.16.1 + diff --git a/package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch b/package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch new file mode 100644 index 0000000000..cd22be15c4 --- /dev/null +++ b/package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch @@ -0,0 +1,39 @@ +From abfe3e7b2b4af1de9b891f3a7a996b70533b0a27 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Sun, 4 Mar 2018 09:07:51 +0100 +Subject: [PATCH] libdvbv5: add optional copy of TEMP_FAILURE_RETRY macro (fix + musl compile) + +Fixes: + + ../../lib/libdvbv5/.libs/libdvbv5.so: undefined reference to `TEMP_FAILURE_RETRY' + +[Upstream: https://www.mail-archive.com/linux-media@vger.kernel.org/msg127134.html] +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + lib/libdvbv5/dvb-dev-local.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/lib/libdvbv5/dvb-dev-local.c b/lib/libdvbv5/dvb-dev-local.c +index 8bc99d1..7a76d65 100644 +--- a/lib/libdvbv5/dvb-dev-local.c ++++ b/lib/libdvbv5/dvb-dev-local.c +@@ -44,6 +44,15 @@ + # define _(string) string + #endif + ++/* taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; }) ++#endif ++ + struct dvb_dev_local_priv { + dvb_dev_change_t notify_dev_change; + +-- +2.16.2 + |