PATCH: libv4l-sync-with-0.3.3-release.patch

diff -r c5084203af61 v4l2-apps/lib/libv4l/include/libv4l1.h
@@ -57,7 +57,7 @@
 int v4l1_ioctl (int fd, unsigned long int request, ...);
 ssize_t v4l1_read (int fd, void* buffer, size_t n);
 void *v4l1_mmap(void *start, size_t length, int prot, int flags, int fd,
-  off_t offset);
+  __off64_t offset);
 int v4l1_munmap(void *_start, size_t length);
 
 #ifdef __cplusplus

diff -r c5084203af61 v4l2-apps/lib/libv4l/include/libv4l2.h
@@ -58,7 +58,7 @@
 int v4l2_ioctl (int fd, unsigned long int request, ...);
 ssize_t v4l2_read (int fd, void* buffer, size_t n);
 void *v4l2_mmap(void *start, size_t length, int prot, int flags, int fd,
-  off_t offset);
+  __off64_t offset);
 int v4l2_munmap(void *_start, size_t length);
 
 

diff -r c5084203af61 v4l2-apps/lib/libv4l/libv4l1/libv4l1.c
@@ -40,9 +40,6 @@
       in turn will call v4l1_open, so therefor v4l1_open (for example) may not
       use the regular open()!
 */
-
-#define _LARGEFILE64_SOURCE 1
-
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>

@@ -642,7 +639,8 @@
 	}
 
 	if (devices[index].v4l1_frame_pointer == MAP_FAILED) {
-	  devices[index].v4l1_frame_pointer = mmap64(NULL, mbuf->size,
+	  devices[index].v4l1_frame_pointer = (void *)syscall(SYS_mmap, NULL,
+				      (size_t)mbuf->size,
 				      PROT_READ|PROT_WRITE,
 				      MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 	  if (devices[index].v4l1_frame_pointer == MAP_FAILED) {

@@ -749,7 +747,7 @@
 
 
 void *v4l1_mmap(void *start, size_t length, int prot, int flags, int fd,
-  __off_t offset)
+  __off64_t offset)
 {
   int index;
   void *result;

diff -r c5084203af61 v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
+#define _LARGEFILE64_SOURCE 1
 
 #include <stdlib.h>
 #include <stdarg.h>

@@ -46,6 +48,27 @@
     va_end(ap);
   } else
     fd = v4l1_open(file, oflag);
+
+  return fd;
+}
+
+int open64 (const char *file, int oflag, ...)
+{
+  int fd;
+
+  if (oflag & O_CREAT)
+  {
+    va_list ap;
+    mode_t mode;
+
+    va_start (ap, oflag);
+    mode = va_arg (ap, mode_t);
+
+    fd = v4l1_open(file, oflag | O_LARGEFILE, mode);
+
+    va_end(ap);
+  } else
+    fd = v4l1_open(file, oflag | O_LARGEFILE);
 
   return fd;
 }

@@ -82,6 +105,12 @@
   return v4l1_mmap(start, length, prot, flags, fd, offset);
 }
 
+void mmap64(void *start, size_t length, int prot, int flags, int fd,
+  __off64_t offset)
+{
+  return v4l1_mmap(start, length, prot, flags, fd, offset);
+}
+
 int munmap(void *start, size_t length)
 {
   return v4l1_munmap(start, length);

diff -r c5084203af61 v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h
@@ -22,6 +22,15 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <libv4lconvert.h> /* includes videodev2.h for us */
+
+/* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */
+#ifdef __NR_mmap2
+#define SYS_mmap2 __NR_mmap2
+#define MMAP2_PAGE_SHIFT 12
+#else
+#define SYS_mmap2 SYS_mmap
+#define MMAP2_PAGE_SHIFT 0
+#endif
 
 #define V4L2_MAX_DEVICES 16
 /* Warning when making this larger the frame_queued and frame_mapped members of

119 lines not on this page · raw message

diff -r c5084203af61 v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c
@@ -19,6 +19,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
+#define _LARGEFILE64_SOURCE 1
 
 #include <stdarg.h>
 #include <stdlib.h>

@@ -82,6 +84,29 @@
   return fd;
 }
 
+int open64(const char *file, int oflag, ...)
+{
+  int fd;
+
+  /* original open code */
+  if (oflag & O_CREAT)
+  {
+    va_list ap;
+    mode_t mode;
+
+    va_start (ap, oflag);
+    mode = va_arg (ap, mode_t);
+
+    fd = open(file, oflag | O_LARGEFILE, mode);
+
+    va_end(ap);
+  } else
+    fd = open(file, oflag | O_LARGEFILE);
+  /* end of original open code */
+
+  return fd;
+}
+
 int close(int fd)
 {
   return v4l2_close(fd);

@@ -115,6 +140,12 @@
   return v4l2_mmap(start, length, prot, flags, fd, offset);
 }
 
+void mmap64(void *start, size_t length, int prot, int flags, int fd,
+  __off64_t offset)
+{
+  return v4l2_mmap(start, length, prot, flags, fd, offset);
+}
+
 int munmap(void *start, size_t length)
 {
   return v4l2_munmap(start, length);

93 lines not on this page · raw message