From e92222d11496d74d7e349ad370ded854d27ee587 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 25 Jan 2017 23:00:21 +0000 Subject: [PATCH] qv4l2: update to 1.12.2. --- srcpkgs/qv4l2/patches/musl.patch | 27 +++++++++++++++++++++++++++ srcpkgs/qv4l2/template | 12 +++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/qv4l2/patches/musl.patch diff --git a/srcpkgs/qv4l2/patches/musl.patch b/srcpkgs/qv4l2/patches/musl.patch new file mode 100644 index 00000000000..a346f4f1813 --- /dev/null +++ b/srcpkgs/qv4l2/patches/musl.patch @@ -0,0 +1,27 @@ +--- utils/ir-ctl/ir-ctl.c.orig 2017-01-25 17:27:44.373665101 +0000 ++++ utils/ir-ctl/ir-ctl.c 2017-01-25 17:27:51.052665445 +0000 +@@ -44,6 +44,24 @@ + + # define N_(string) string + ++#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 ++ ++#ifndef strndupa ++#define strndupa(s, n) \ ++ (__extension__ ({const char *__in = (s); \ ++ size_t __len = strnlen (__in, (n)) + 1; \ ++ char *__out = (char *) alloca (__len); \ ++ __out[__len-1] = '\0'; \ ++ (char *) memcpy (__out, __in, __len-1);})) ++#endif ++ + + /* See drivers/media/rc/ir-lirc-codec.c line 23 */ + #define LIRCBUF_SIZE 512 diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index 98be5b5499d..ec15167f5eb 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -1,11 +1,11 @@ # Template file for 'qv4l2' pkgname=qv4l2 -version=1.10.1 -revision=2 +version=1.12.2 +revision=1 wrksrc="v4l-utils-${version}" build_style=gnu-configure configure_args="--enable-qv4l2 --with-udevdir=/usr/lib/udev" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config perl" makedepends="libjpeg-turbo-devel libsysfs-devel alsa-lib-devel qt5-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Qt v4l2 control panel application" @@ -13,11 +13,13 @@ maintainer="Juan RP " homepage="https://linuxtv.org/" license="GPL-2, LGPL-2.1" distfiles="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2" -checksum=6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0 +checksum=ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d + +CFLAGS="-Wno-error=unused-function" case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" - CFLAGS="-D__off_t=off_t -D__off64_t=off_t" + CFLAGS+=" -D__off_t=off_t -D__off64_t=off_t" LDFLAGS="-largp" ;; esac