mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
v4l-utils: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
Martin Jansa
parent
85d4fe7335
commit
0f55207ad2
|
|
@ -0,0 +1,55 @@
|
|||
From e60aea50e41ae8a17672beb5859beecb66e7a305 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 14 Jul 2017 13:11:25 -0700
|
||||
Subject: [PATCH 1/3] ir-ctl: Define TEMP_FAILURE_RETRY if undefined
|
||||
|
||||
use strndup() instead of strndupa() which is not
|
||||
universally available in C libraries
|
||||
|
||||
Taken from AlpineLinux
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
utils/ir-ctl/ir-ctl.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c
|
||||
index bc58cee..1a44011 100644
|
||||
--- a/utils/ir-ctl/ir-ctl.c
|
||||
+++ b/utils/ir-ctl/ir-ctl.c
|
||||
@@ -42,6 +42,16 @@
|
||||
# define _(string) string
|
||||
#endif
|
||||
|
||||
+/* taken from glibc unistd.h */
|
||||
+#ifndef TEMP_FAILURE_RETRY
|
||||
+#define TEMP_FAILURE_RETRY(expression) \
|
||||
+ (__extension__ \
|
||||
+ ({ long int __result; \
|
||||
+ do __result = (long int) (expression); \
|
||||
+ while (__result == -1L && errno == EINTR); \
|
||||
+ __result; }))
|
||||
+#endif
|
||||
+
|
||||
# define N_(string) string
|
||||
|
||||
|
||||
@@ -344,12 +354,14 @@ static struct file *read_scancode(const char *name)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- pstr = strndupa(name, p - name);
|
||||
+ pstr = strndup(name, p - name);
|
||||
|
||||
if (!protocol_match(pstr, &proto)) {
|
||||
fprintf(stderr, _("error: protocol '%s' not found\n"), pstr);
|
||||
+ free(pstr);
|
||||
return NULL;
|
||||
}
|
||||
+ free(pstr);
|
||||
|
||||
if (!strtoscancode(p + 1, &scancode)) {
|
||||
fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1);
|
||||
--
|
||||
2.13.3
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From b3acc4c6407f9553f32582a9aee6a11b5fcd1d8a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 14 Jul 2017 13:17:19 -0700
|
||||
Subject: [PATCH 2/3] contrib/test: Link mc_nextgen_test with libargp if needed
|
||||
|
||||
musl depends on external argp implementation e.g.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
contrib/test/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am
|
||||
index 4641e21..e47b948 100644
|
||||
--- a/contrib/test/Makefile.am
|
||||
+++ b/contrib/test/Makefile.am
|
||||
@@ -32,7 +32,7 @@ v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS) $(ARGP_LIBS)
|
||||
v4l2gl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la
|
||||
|
||||
mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS)
|
||||
-mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS)
|
||||
+mc_nextgen_test_LDFLAGS = $(ARGP_LIBS) $(LIBUDEV_LIBS)
|
||||
|
||||
|
||||
ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h
|
||||
--
|
||||
2.13.3
|
||||
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
From d04aa6866cbea57c4a81b033cd60586a9436ac6b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 14 Jul 2017 13:20:05 -0700
|
||||
Subject: [PATCH 3/3] v4l2-ctl: Do not use getsubopt
|
||||
|
||||
POSIX says that behavior when subopts list is empty is undefined.
|
||||
musl libs will set value to NULL which leads to crash.
|
||||
|
||||
Taken from AlpineLinux
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
utils/v4l2-ctl/v4l2-ctl-common.cpp | 19 ++++++++++---------
|
||||
1 file changed, 10 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
|
||||
index 3ea6cd3..291fb3e 100644
|
||||
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
|
||||
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
|
||||
@@ -692,16 +692,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)
|
||||
--
|
||||
2.13.3
|
||||
|
||||
|
|
@ -18,7 +18,10 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \
|
|||
file://0001-buildsystem-do-not-assume-building-in-source-tree.patch \
|
||||
file://mediactl-pkgconfig.patch \
|
||||
file://export-mediactl-headers.patch \
|
||||
"
|
||||
file://0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch \
|
||||
file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \
|
||||
file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "89e1ed6c69c94e0489dc0a638c7841aa"
|
||||
SRC_URI[sha256sum] = "5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user