64-bit fixes for libv4l2, properly pass rpath for libv4lconvert, and

pass the correct number of args to mmap in at least one case.

3 files changed, 63 insertions, 5 deletions

diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo
index 8aa56b32b83..db9e02c6550 100644
--- a/graphics/libv4l/distinfo
+++ b/graphics/libv4l/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
+$NetBSD: distinfo,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
@@ -6,7 +6,8 @@ Size (libv4l-0.4.3.tar.gz) = 83022 bytes
 SHA1 (patch-aa) = d3b528e877cce85ae8ac5478e6873daf3573d7ac
 SHA1 (patch-ab) = 8528622d992e977d6e28388335db0a7c29ab272f
 SHA1 (patch-ac) = ba6d3502793f380a6f448c42c84a500147b041bb
-SHA1 (patch-ad) = 95d3b9f9c2d0fcce728288e88c7b3d156c1f3661
+SHA1 (patch-ad) = 053ec7cea81c916d172df6f6f450fec23638d38f
 SHA1 (patch-ae) = d1cadfdf41f7b46311e828600352bfac6c3d6c22
 SHA1 (patch-af) = ce15db36e94b0e386f86b4a024a5eb6d972d0958
 SHA1 (patch-ag) = 540fec30c0c506f80763df81a07711ce0b3cbf27
+SHA1 (patch-ah) = 08d7facfc9d67c2b4b9850750da8645f6efcb052
diff --git a/graphics/libv4l/patches/patch-ad b/graphics/libv4l/patches/patch-ad
index 157bc7d70c4..62d5fb4ff38 100644
--- a/graphics/libv4l/patches/patch-ad
+++ b/graphics/libv4l/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
+$NetBSD: patch-ad,v 1.3 2008/09/13 17:59:27 jmcneill Exp $
 
---- libv4l2/libv4l2.c.orig	2008-09-08 14:41:10.000000000 -0400
-+++ libv4l2/libv4l2.c	2008-09-08 14:42:04.000000000 -0400
+--- libv4l2/libv4l2.c.orig	2008-09-03 06:23:46.000000000 -0400
++++ libv4l2/libv4l2.c	2008-09-13 13:50:47.000000000 -0400
 @@ -59,7 +59,11 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -25,3 +25,39 @@ $NetBSD: patch-ad,v 1.2 2008/09/08 19:10:20 jmcneill Exp $
  /* Note these flags are stored together with the flags passed to v4l2_fd_open()
     in v4l2_dev_info's flags member, so care should be taken that the do not
     use the same bits! */
+@@ -154,7 +162,7 @@
+       break;
+     }
+ 
+-    devices[index].frame_pointers[i] = (void *)syscall(SYS_mmap2, NULL,
++    devices[index].frame_pointers[i] = mmap(NULL,
+       (size_t)buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, devices[index].fd,
+       (__off_t)(buf.m.offset >> MMAP2_PAGE_SHIFT));
+     if (devices[index].frame_pointers[i] == MAP_FAILED) {
+@@ -871,7 +879,7 @@
+ 	   but we need the buffer _now_ to write our converted data
+ 	   to it! */
+ 	if (devices[index].convert_mmap_buf == MAP_FAILED) {
+-	  devices[index].convert_mmap_buf = (void *)syscall(SYS_mmap2,
++	  devices[index].convert_mmap_buf = mmap(NULL,
+ 						   (size_t)(
+ 						     devices[index].no_frames *
+ 						     V4L2_FRAME_BUF_SIZE),
+@@ -995,7 +1003,7 @@
+       return MAP_FAILED;
+     }
+ 
+-    return (void *)syscall(SYS_mmap2, start, length, prot, flags, fd,
++    return mmap(start, length, prot, flags, fd,
+ 			   (__off_t)(offset >> MMAP2_PAGE_SHIFT));
+   }
+ 
+@@ -1012,7 +1020,7 @@
+   }
+ 
+   if (devices[index].convert_mmap_buf == MAP_FAILED) {
+-    devices[index].convert_mmap_buf = (void *)syscall(SYS_mmap2, NULL,
++    devices[index].convert_mmap_buf = mmap(NULL,
+ 					     (size_t)(
+ 					       devices[index].no_frames *
+ 					       V4L2_FRAME_BUF_SIZE),
diff --git a/graphics/libv4l/patches/patch-ah b/graphics/libv4l/patches/patch-ah
new file mode 100644
index 00000000000..703feefe0d7
--- /dev/null
+++ b/graphics/libv4l/patches/patch-ah
@@ -0,0 +1,21 @@
+$NetBSD: patch-ah,v 1.1 2008/09/13 17:59:27 jmcneill Exp $
+
+--- libv4l2/Makefile.orig	2008-09-13 13:39:08.000000000 -0400
++++ libv4l2/Makefile	2008-09-13 13:40:07.000000000 -0400
+@@ -3,6 +3,7 @@
+ CFLAGS := -g -O1
+ CFLAGS += -Wall -Wno-unused -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
+ 
++LDFLAGS = -Wl,-R$(LIBDIR)
+ LIBS = -lpthread
+ 
+ V4L2_OBJS     = libv4l2.o log.o
+@@ -46,7 +47,7 @@
+ 	@echo 'Description: v4l2 device access library' >> libv4l2.pc
+ 	@echo 'Version: '$(V4L2_LIB_VERSION) >> libv4l2.pc
+ 	@echo 'Requires: libv4lconvert' >> libv4l2.pc
+-	@echo 'Libs: -L$${libdir} -lv4l2' >> libv4l2.pc
++	@echo 'Libs: -L$${libdir} -Wl,-R$${libdir} -lv4l2' >> libv4l2.pc
+ 	@echo 'Libs.private: -lpthread' >> libv4l2.pc
+ 	@echo 'Cflags: -I$${prefix}/include' >> libv4l2.pc
+