v4l-utils: Fix build against musl

3 files changed, 33 insertions, 0 deletions

diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index aaf05383f8..bb9e22637e 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,8 @@
+2020-07-09 Ismael Luceno <ismael@sourcemage.org>
+	* PRE_BUILD,
+	  patches/0001-keytable-Fix-missing-inclusion-of-argp.h.patch:
+	  Fixed build against musl
+
 2020-06-11 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.20.0
 
diff --git a/video/v4l-utils/PRE_BUILD b/video/v4l-utils/PRE_BUILD
index 21f95c906c..1ee3d1a22e 100755
--- a/video/v4l-utils/PRE_BUILD
+++ b/video/v4l-utils/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
 case "$HOST" in *-musl)
   sedit '/^mc_nextgen_test_LDADD *=/s/$/ -largp/' contrib/test/Makefile.in
   ;;
diff --git a/video/v4l-utils/patches/0001-keytable-Fix-missing-inclusion-of-argp.h.patch b/video/v4l-utils/patches/0001-keytable-Fix-missing-inclusion-of-argp.h.patch
new file mode 100644
index 0000000000..a164530818
--- /dev/null
+++ b/video/v4l-utils/patches/0001-keytable-Fix-missing-inclusion-of-argp.h.patch
@@ -0,0 +1,27 @@
+From 9d42640d413262d685211bb099bbbb6e58239523 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+Date: Thu, 9 Jul 2020 19:39:12 +0200
+Subject: [PATCH] keytable: Fix missing inclusion of argp.h
+
+error_t is only defined by argp.h on non-glibc systems.
+
+Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
+---
+ utils/keytable/bpf_load.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/utils/keytable/bpf_load.c b/utils/keytable/bpf_load.c
+index 9f64cf4e91e8..7ae9af4a57be 100644
+--- a/utils/keytable/bpf_load.c
++++ b/utils/keytable/bpf_load.c
+@@ -13,6 +13,7 @@
+ #include <stdlib.h>
+ #include <linux/bpf.h>
+ #include <assert.h>
++#include <argp.h>
+ #include "keymap.h"
+ #include "bpf.h"
+ #include "bpf_load.h"
+-- 
+2.27.0
+