diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2014-12-16 10:27:49 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2014-12-16 10:27:49 +0000 |
| commit | ed7677e2640ee17955fdd924af1b9698cb41d9d2 (patch) | |
| tree | 01e1568c1018d09b1a1cd4dd2b385cc6da7086b3 /main/v4l-utils/fix-compliance.patch | |
| parent | 1568fac0eb51fca62637eb4221da1ab402b2f066 (diff) | |
| download | aports-ed7677e2640ee17955fdd924af1b9698cb41d9d2.tar.bz2 aports-ed7677e2640ee17955fdd924af1b9698cb41d9d2.tar.xz | |
main/v4l-utils: upgrade to 1.6.2
Diffstat (limited to 'main/v4l-utils/fix-compliance.patch')
| -rw-r--r-- | main/v4l-utils/fix-compliance.patch | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/main/v4l-utils/fix-compliance.patch b/main/v4l-utils/fix-compliance.patch index 4ce0cd7536..34b85eeb55 100644 --- a/main/v4l-utils/fix-compliance.patch +++ b/main/v4l-utils/fix-compliance.patch @@ -1,5 +1,5 @@ ---- v4l-utils-1.0.0.orig/lib/libv4l1/v4l1compat.c -+++ v4l-utils-1.0.0/lib/libv4l1/v4l1compat.c +--- a/lib/libv4l1/v4l1compat.c ++++ b/lib/libv4l1/v4l1compat.c @@ -62,7 +62,7 @@ return fd; } @@ -30,8 +30,8 @@ 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 +--- a/lib/libv4l2/v4l2convert.c ++++ b/lib/libv4l2/v4l2convert.c @@ -86,7 +86,7 @@ return fd; } @@ -62,8 +62,8 @@ 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 +--- a/lib/libv4lconvert/libv4lsyscall-priv.h ++++ b/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 */ @@ -74,13 +74,4 @@ #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> |