diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-07 13:06:37 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-07 13:07:16 +0000 |
| commit | 06757d02c022295864e516fd2ba2ae2de4a1d0cd (patch) | |
| tree | 207bc07b159bfc5406806d656bcb9b13b9c33442 /main/v4l-utils/fix-compliance.patch | |
| parent | 26a7a165a792aa8548039d19339dd4a1b639f175 (diff) | |
| download | aports-06757d02c022295864e516fd2ba2ae2de4a1d0cd.tar.bz2 aports-06757d02c022295864e516fd2ba2ae2de4a1d0cd.tar.xz | |
main/v4l-utils: upgrade to 1.0.0 and fix musl build
Diffstat (limited to 'main/v4l-utils/fix-compliance.patch')
| -rw-r--r-- | main/v4l-utils/fix-compliance.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/main/v4l-utils/fix-compliance.patch b/main/v4l-utils/fix-compliance.patch new file mode 100644 index 0000000000..4ce0cd7536 --- /dev/null +++ b/main/v4l-utils/fix-compliance.patch @@ -0,0 +1,86 @@ +--- v4l-utils-1.0.0.orig/lib/libv4l1/v4l1compat.c ++++ v4l-utils-1.0.0/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) + { +--- v4l-utils-1.0.0.orig/lib/libv4l2/v4l2convert.c ++++ v4l-utils-1.0.0/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) + { +--- v4l-utils-1.0.0.orig/lib/libv4lconvert/libv4lsyscall-priv.h ++++ v4l-utils-1.0.0/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 +--- v4l-utils-1.0.0.orig/utils/qv4l2/v4l2-api.h ++++ v4l-utils-1.0.0/utils/qv4l2/v4l2-api.h +@@ -21,6 +21,7 @@ + #define V4L2_API_H + + #include <QString> ++#include <stdint.h> + #include <linux/videodev2.h> + #include <libv4lconvert.h> + |