diff --git a/srcpkgs/v4l-utils/patches/musl.patch b/srcpkgs/v4l-utils/patches/musl.patch index a346f4f181..4f3829b8ed 100644 --- a/srcpkgs/v4l-utils/patches/musl.patch +++ b/srcpkgs/v4l-utils/patches/musl.patch @@ -25,3 +25,22 @@ /* See drivers/media/rc/ir-lirc-codec.c line 23 */ #define LIRCBUF_SIZE 512 +--- lib/libdvbv5/dvb-dev-local.c ++++ lib/libdvbv5/dvb-dev-local.c +@@ -60,6 +60,16 @@ struct dvb_dev_local_priv { + void *user_priv; + }; + ++/* taken from glibc unistd.h and fixes musl */ ++#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 ++ + static int handle_device_change(struct dvb_device_priv *dvb, + struct udev_device *dev, + const char *syspath, diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index a84de2b02c..0a58e1354e 100644 --- a/srcpkgs/v4l-utils/template +++ b/srcpkgs/v4l-utils/template @@ -1,6 +1,6 @@ # Template file for 'v4l-utils' pkgname=v4l-utils -version=1.12.5 +version=1.14.2 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-qv4l2 --with-udevdir=/usr/lib/udev" @@ -10,9 +10,9 @@ conf_files="/etc/rc_maps.cfg" short_desc="Userspace tools and libraries for Video 4 Linux" maintainer="Juan RP " homepage="http://freshmeat.net/projects/libv4l" -license="GPL-2, LGPL-2.1" +license="GPL-2.0-or-later, LGPL-2.1-or-later" distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2" -checksum=0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d +checksum=e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone"