aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch37
-rw-r--r--community/v4l-utils/APKBUILD10
-rw-r--r--community/v4l-utils/fix-libdvbv5.patch19
3 files changed, 24 insertions, 42 deletions
diff --git a/community/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch b/community/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch
deleted file mode 100644
index 5391d815b5..0000000000
--- a/community/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c
-index bc58cee..1a44011 100644
---- a/utils/ir-ctl/ir-ctl.c
-+++ b/utils/ir-ctl/ir-ctl.c
-@@ -42,6 +42,16 @@
- # define _(string) string
- #endif
-
-+/* taken from glibc unistd.h */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+ (__extension__ \
-+ ({ long int __result; \
-+ do __result = (long int) (expression); \
-+ while (__result == -1L && errno == EINTR); \
-+ __result; }))
-+#endif
-+
- # define N_(string) string
-
-
-@@ -344,12 +354,14 @@ static struct file *read_scancode(const char *name)
- return NULL;
- }
-
-- pstr = strndupa(name, p - name);
-+ pstr = strndup(name, p - name);
-
- if (!protocol_match(pstr, &proto)) {
- fprintf(stderr, _("error: protocol '%s' not found\n"), pstr);
-+ free(pstr);
- return NULL;
- }
-+ free(pstr);
-
- if (!strtoscancode(p + 1, &scancode)) {
- fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1);
diff --git a/community/v4l-utils/APKBUILD b/community/v4l-utils/APKBUILD
index cff94a44ba..8797236e0f 100644
--- a/community/v4l-utils/APKBUILD
+++ b/community/v4l-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=v4l-utils
-pkgver=1.12.6
-pkgrel=1
+pkgver=1.14.2
+pkgrel=0
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
url="http://freshmeat.net/projects/libv4l"
arch="all"
@@ -13,7 +13,7 @@ subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-dvbv5 $pkgname-libs ir_key
source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
qv4l2.svg
qv4l2.desktop
- 0001-ir-ctl-fixes-for-musl-compile.patch
+ fix-libdvbv5.patch
getsubopt.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -89,8 +89,8 @@ ir_keytable() {
"$subpkgdir"/etc
}
-sha512sums="1f6e7ba9513ea836d6536eaf2f148588e9a2beaab62c49fb295e60aae41382781f76d536e854bbe6fc601f00034e3239b551874dc99a1f6afa788ee94976b332 v4l-utils-1.12.6.tar.bz2
+sha512sums="5c469479deb7065768e0254d1c80d9096caf05e445ceeabc7649f7158f02fb2d11ff2ad8c82debc1dbe6bbd7776cc5aa2febb52d5da0328d2b60b54af67c7a27 v4l-utils-1.14.2.tar.bz2
bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg
6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop
-f93d18b282d52c6cccbedc489e201a19b59f44b5e0aeb74b96537c3f5797c0b3c3f1499cd6ae822715c712e92b5ec5749749394f004ae1887a8bae3bac117c5b 0001-ir-ctl-fixes-for-musl-compile.patch
+f1a38bc66ec5b3ab3824b3a448bf0f388f162a82f723841f88481783ef3482e7473725447a293ab65740c1d0f5ae8206ccb3151530c9a846ec65e7b9b5fe26e1 fix-libdvbv5.patch
9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29 getsubopt.patch"
diff --git a/community/v4l-utils/fix-libdvbv5.patch b/community/v4l-utils/fix-libdvbv5.patch
new file mode 100644
index 0000000000..72e169adb4
--- /dev/null
+++ b/community/v4l-utils/fix-libdvbv5.patch
@@ -0,0 +1,19 @@
+--- a/lib/libdvbv5/dvb-dev-local.c
++++ b/lib/libdvbv5/dvb-dev-local.c
+@@ -44,6 +44,15 @@
+ # define _(string) string
+ #endif
+
++/* taken from glibc unistd.h */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
++ __result; })
++#endif
++
+ struct dvb_dev_local_priv {
+ dvb_dev_change_t notify_dev_change;
+
+