From 02b420798a2c21b2f9dcf0bac010bb3fdb07aa68 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 5 Oct 2019 03:49:16 +0000
Subject: user/v4l-utils: bump to 1.18.0

---
 user/v4l-utils/APKBUILD        |  8 +++++---
 user/v4l-utils/getsubopt.patch |  7 +++----
 user/v4l-utils/types.patch     | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 user/v4l-utils/types.patch

(limited to 'user/v4l-utils')

diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD
index 1dbff373e..fa9acbd21 100644
--- a/user/v4l-utils/APKBUILD
+++ b/user/v4l-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: 
 pkgname=v4l-utils
-pkgver=1.16.6
+pkgver=1.18.0
 pkgrel=0
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="https://www.linuxtv.org/wiki/index.php/V4l-utils"
@@ -14,6 +14,7 @@ source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
 	qv4l2.svg
 	qv4l2.desktop
 	getsubopt.patch
+	types.patch
 	"
 
 build() {
@@ -73,7 +74,8 @@ ir_keytable() {
 		"$subpkgdir"/etc
 }
 
-sha512sums="f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58  v4l-utils-1.16.6.tar.bz2
+sha512sums="749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49  v4l-utils-1.18.0.tar.bz2
 bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682  qv4l2.svg
 6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315  qv4l2.desktop
-9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29  getsubopt.patch"
+a09554deebd7597355c688e52180e0f4030842ccb26a144d1ac8a426836374237725d7b6b555027ca72e10c11e37bd596c7d69d87ee2f6b6d951daf4e50137f8  getsubopt.patch
+ee1228cc06e399923953e5121a683347a7fe881c80c55faae0adf6ed836251da1b2c4d1561454daa6f42220c1171f827ca3e2b72cdac31b379495f23ff6c56bb  types.patch"
diff --git a/user/v4l-utils/getsubopt.patch b/user/v4l-utils/getsubopt.patch
index c476e5ed7..6ad142ae0 100644
--- a/user/v4l-utils/getsubopt.patch
+++ b/user/v4l-utils/getsubopt.patch
@@ -7,7 +7,7 @@ diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common
 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_subset(char *optarg)
  
  static bool parse_next_subopt(char **subs, char **value)
  {
@@ -20,8 +20,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 +32,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)
diff --git a/user/v4l-utils/types.patch b/user/v4l-utils/types.patch
new file mode 100644
index 000000000..56eb991a3
--- /dev/null
+++ b/user/v4l-utils/types.patch
@@ -0,0 +1,26 @@
+--- v4l-utils-1.18.0/utils/keytable/keymap.h.old	2019-09-22 09:22:54.000000000 +0000
++++ v4l-utils-1.18.0/utils/keytable/keymap.h	2019-10-05 03:45:16.795852895 +0000
+@@ -2,6 +2,10 @@
+ #ifndef __KEYMAP_H
+ #define __KEYMAP_H
+ 
++#include <stdint.h>
++typedef uint32_t u_int32_t;
++typedef int error_t;
++
+ struct keymap {
+ 	struct keymap *next;
+ 	char *name;
+--- v4l-utils-1.18.0/utils/ir-ctl/keymap.h.old	2019-09-22 09:22:54.000000000 +0000
++++ v4l-utils-1.18.0/utils/ir-ctl/keymap.h	2019-10-05 03:44:27.651163483 +0000
+@@ -2,6 +2,10 @@
+ #ifndef __KEYMAP_H
+ #define __KEYMAP_H
+ 
++#include <stdint.h>
++typedef uint32_t u_int32_t;
++typedef int error_t;
++
+ struct keymap {
+ 	struct keymap *next;
+ 	char *name;
-- 
cgit v1.2.3-60-g2f50