diff options
| author | prspkt <prspkt@protonmail.com> | 2019-11-22 19:19:47 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-11-23 00:25:46 +0000 |
| commit | ec3bbccdbc21766ab9de68924004d6750f63ea9f (patch) | |
| tree | 93cf6dc13dd35c9052760ebc851181177477154e /community/v4l-utils/getsubopt.patch | |
| parent | 048edcc19c3887cb4ab5673b72e1679a3a66e77c (diff) | |
| download | aports-ec3bbccdbc21766ab9de68924004d6750f63ea9f.tar.bz2 aports-ec3bbccdbc21766ab9de68924004d6750f63ea9f.tar.xz | |
community/v4l-utils: upgrade to 1.18.0
* Ensure getsubopt.patch cleanly applies.
* Fix 'unknown type name' for error_t and u_int32_t.
Diffstat (limited to 'community/v4l-utils/getsubopt.patch')
| -rw-r--r-- | community/v4l-utils/getsubopt.patch | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/community/v4l-utils/getsubopt.patch b/community/v4l-utils/getsubopt.patch index c476e5ed7e..8ac87a8c7a 100644 --- a/community/v4l-utils/getsubopt.patch +++ b/community/v4l-utils/getsubopt.patch @@ -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) +@@ -782,15 +782,17 @@ static bool parse_next_subopt(char **subs, char **value) { @@ -20,8 +18,7 @@ index 3ea6cd3..291fb3e 100644 - if (opt < 0 || *value) - return false; -- fprintf(stderr, "No value given to suboption <%s>\n", -- subopts[opt]); +- fprintf(stderr, "Missing suboption value\n"); - return true; + while (*p && *p != ',') + p++; @@ -33,4 +30,4 @@ index 3ea6cd3..291fb3e 100644 + return false; } - void common_cmd(int ch, char *optarg) + void common_cmd(const std::string &media_bus_info, int ch, char *optarg) |