v4l-utils: update to 1.8.0.

This commit is contained in:
Juan RP 2015-09-27 09:27:35 +02:00
parent 838bc08ce0
commit 9585ae778c
2 changed files with 4 additions and 80 deletions

View File

@ -1,77 +0,0 @@
--- lib/libv4l1/v4l1compat.c
+++ lib/libv4l1/v4l1compat.c
@@ -62,7 +62,7 @@
return fd;
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
{
int fd;
@@ -94,7 +94,11 @@
return v4l1_dup(fd);
}
+#ifdef __GLIBC__
LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
+#else
+LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
+#endif
{
void *arg;
va_list ap;
@@ -117,7 +121,7 @@
return v4l1_mmap(start, length, prot, flags, fd, offset);
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
__off64_t offset)
{
--- lib/libv4l2/v4l2convert.c
+++ lib/libv4l2/v4l2convert.c
@@ -86,7 +86,7 @@
return fd;
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
{
int fd;
@@ -121,7 +121,11 @@
return v4l2_dup(fd);
}
+#ifdef __GLIBC__
LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
+#else
+LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
+#endif
{
void *arg;
va_list ap;
@@ -144,7 +148,7 @@
return v4l2_mmap(start, length, prot, flags, fd, offset);
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
__off64_t offset)
{
--- lib/libv4lconvert/libv4lsyscall-priv.h
+++ lib/libv4lconvert/libv4lsyscall-priv.h
@@ -41,7 +41,9 @@
#include <linux/ioctl.h>
/* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */
#ifdef __NR_mmap2
+#ifndef SYS_mmap2
#define SYS_mmap2 __NR_mmap2
+#endif
#define MMAP2_PAGE_SHIFT 12
#else
#define SYS_mmap2 SYS_mmap

View File

@ -1,7 +1,8 @@
# Template file for 'v4l-utils'
pkgname=v4l-utils
version=1.6.3
revision=2
version=1.8.0
revision=1
build_pie=yes
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-qv4l2 --with-udevdir=/usr/lib/udev"
hostmakedepends="libtool pkg-config"
@ -12,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://freshmeat.net/projects/libv4l"
license="GPL-2, LGPL-2.1"
distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2"
checksum=164abf5c1befcd27e8e6ef824a82d4015bdfb5d99ae82daa00e77d895ff9864c
checksum=50c7be033636d878e902dad0a207fc9f6d831bec27f1b410f1102acddaa5565e
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone"