cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

libv4l: Update to 1.16.6. Fix missing includes patch

Browse Source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
(cherry picked from commit 67b8da50c1)
This commit is contained in:
Ted Hess
2019-08-20 15:03:30 -04:00
committed by Josef Schlehofer
parent d9e221d6c9
commit e0deb2c5f9
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libv4l/patches/020-add-missing-includes.patch
+6 -9
View File
@@ -20,11 +20,10 @@
#include <linux/cec-funcs.h>
--- a/utils/common/media-info.cpp
+++ b/utils/common/media-info.cpp
@@ -20,7 +20,7 @@
@@ -21,6 +21,7 @@
#include <linux/media.h>
-#include <fstream>
#include <fstream>
+#include <iostream>
#include <media-info.h>
@@ -42,22 +41,20 @@
#include <map>
--- a/utils/v4l2-compliance/media-info.cpp
+++ b/utils/v4l2-compliance/media-info.cpp
@@ -20,7 +20,7 @@
@@ -21,6 +21,7 @@
#include <linux/media.h>
-#include <fstream>
#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
@@ -20,7 +20,7 @@
@@ -21,6 +21,7 @@
#include <linux/media.h>
-#include <fstream>
#include <fstream>
+#include <iostream>
#include <media-info.h>
libs/libv4l/patches/030-getsubopt.patch
+1 -3
View File
@@ -3,11 +3,9 @@ musl libs will set value to NULL which leads to crash.
Simply avoid getsubopt, since we cannot rely on it.
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)
@@ -679,16 +679,17 @@ static bool parse_subset(char *optarg)
static bool parse_next_subopt(char **subs, char **value)
{