aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2019-11-22 19:19:47 +0200
committerRasmus Thomsen <oss@cogitri.dev>2019-11-23 00:25:46 +0000
commitec3bbccdbc21766ab9de68924004d6750f63ea9f (patch)
tree93cf6dc13dd35c9052760ebc851181177477154e
parent048edcc19c3887cb4ab5673b72e1679a3a66e77c (diff)
downloadaports-ec3bbccdbc21766ab9de68924004d6750f63ea9f.tar.gz
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.
-rw-r--r--community/v4l-utils/APKBUILD13
-rw-r--r--community/v4l-utils/getsubopt.patch9
-rw-r--r--community/v4l-utils/types.patch26
3 files changed, 36 insertions, 12 deletions
diff --git a/community/v4l-utils/APKBUILD b/community/v4l-utils/APKBUILD
index 7b4cbb65f7..f5380e65de 100644
--- a/community/v4l-utils/APKBUILD
+++ b/community/v4l-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=v4l-utils
-pkgver=1.16.7
+pkgver=1.18.0
pkgrel=0
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
url="http://freshmeat.net/projects/libv4l"
@@ -10,12 +10,12 @@ license="LGPL-2.0-or-later"
makedepends="qt5-qtbase-dev libjpeg-turbo-dev argp-standalone linux-headers
eudev-dev alsa-lib-dev"
subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-dvbv5 $pkgname-libs ir_keytable"
-source="https://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
+source="https://linuxtv.org/downloads/v4l-utils/v4l-utils-$pkgver.tar.bz2
getsubopt.patch
+ types.patch
"
-
build() {
- [ "$CLIBC" = "musl" ] && export CFLAGS="$CFLAGS -D__off_t=off_t"
+ export CFLAGS="$CFLAGS -D__off_t=off_t"
export LIBS="-largp -lintl"
./configure \
--build=$CBUILD \
@@ -82,5 +82,6 @@ ir_keytable() {
"$subpkgdir"/etc
}
-sha512sums="898b41cef7284f5796ec89c55ef08ecb3ec3fa3c5bf572ef30478be056fe9027b422b2d2513b906549e747e6a490e3211c6d2f8f1cade340b18185cc18b0684d v4l-utils-1.16.7.tar.bz2
-9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29 getsubopt.patch"
+sha512sums="749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49 v4l-utils-1.18.0.tar.bz2
+3e51af7a77a8f06e1278022362347808b233cf021a277ce9cd66a9553e754bf91b3923c32ab17a86b11f4ef2555a5f1d544d0fc22e82a2997e34060dd561f760 getsubopt.patch
+358611fbae8348f17bf49c08820b4641deb1f7282ce2c1e20b8fdf0a85cd73ca4b46f6668c2a7328b5261e401c12f471170a9a1f3fc2982b6897ff11386c06c6 types.patch"
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)
diff --git a/community/v4l-utils/types.patch b/community/v4l-utils/types.patch
new file mode 100644
index 0000000000..340bb81c02
--- /dev/null
+++ b/community/v4l-utils/types.patch
@@ -0,0 +1,26 @@
+--- a/utils/keytable/keymap.h
++++ b/utils/keytable/keymap.h
+@@ -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;
+--- a/utils/ir-ctl/keymap.h
++++ b/utils/ir-ctl/keymap.h
+@@ -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;