Fixes for SunOS 64-bit where open/mmap are redefined to *64 versions.

3 files changed, 69 insertions, 7 deletions

diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo
index 7130a58d5ee..e6ebc7e9931 100644
--- a/graphics/libv4l/distinfo
+++ b/graphics/libv4l/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/04/18 21:16:43 hans Exp $
+$NetBSD: distinfo,v 1.11 2013/06/24 15:57:21 jperkin Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
@@ -8,10 +8,10 @@ SHA1 (patch-ab) = 5ade487d6d64d280f3fdae8afad99fbd0b6e5eda
 SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f
 SHA1 (patch-ad) = 1d2568e49182efcbde47c14911b6a04e088b2578
 SHA1 (patch-ae) = 1bdefe4897c6edbe4049c52d963f1769bd916750
-SHA1 (patch-af) = 5eba7f447789b2cfd42b1f73bde4dd3c1985a6b2
+SHA1 (patch-af) = b536fba33678e9b44ed22846344e523f92cd23ce
 SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc
 SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
 SHA1 (patch-aj) = 521abdfba83a34716ce0909f75d784fe0b6ecc8a
 SHA1 (patch-ak) = 0465c3cc368609a3108f8d1aafcacf0ab3c61858
 SHA1 (patch-al) = 8d020ef01f9956b37f718a529306e5f13aaa03a3
-SHA1 (patch-am) = 0baf169cb5177f99e0d37de5820aefaee3aa71dd
+SHA1 (patch-am) = 23d75eb7e9d1959d2be87dd9aa961e55cfc58c52
diff --git a/graphics/libv4l/patches/patch-af b/graphics/libv4l/patches/patch-af
index 2473aff1c96..d149e2da54d 100644
--- a/graphics/libv4l/patches/patch-af
+++ b/graphics/libv4l/patches/patch-af
@@ -1,7 +1,8 @@
-$NetBSD: patch-af,v 1.4 2012/04/18 17:47:22 hans Exp $
+$NetBSD: patch-af,v 1.5 2013/06/24 15:57:21 jperkin Exp $
 
 * XXXX
 * `mode_t' is promoted to `int' when passed through `...'.
+* Fix SunOS 64-bit.
 
 --- libv4l2/v4l2convert.c.orig	2008-08-26 12:32:39.000000000 +0000
 +++ libv4l2/v4l2convert.c
@@ -45,7 +46,7 @@ $NetBSD: patch-af,v 1.4 2012/04/18 17:47:22 hans Exp $
  /* Check that open/read/mmap is not a define */
  #if defined open || defined read || defined mmap
  #error open/read/mmap is a prepocessor macro !!
-@@ -61,7 +76,7 @@ LIBV4L_PUBLIC int open (const char *file
+@@ -61,7 +80,7 @@ LIBV4L_PUBLIC int open (const char *file
      mode_t mode;
  
      va_start (ap, oflag);
@@ -54,3 +55,33 @@ $NetBSD: patch-af,v 1.4 2012/04/18 17:47:22 hans Exp $
  
      fd = syscall(SYS_open, file, oflag, mode);
  
+@@ -92,6 +111,7 @@ LIBV4L_PUBLIC int open (const char *file
+   return fd;
+ }
+ 
++#if !(defined(__sun) && defined(_LP64))
+ LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
+ {
+   int fd;
+@@ -114,6 +134,7 @@ LIBV4L_PUBLIC int open64(const char *fil
+ 
+   return fd;
+ }
++#endif
+ 
+ LIBV4L_PUBLIC int close(int fd)
+ {
+@@ -148,11 +169,13 @@ LIBV4L_PUBLIC void *mmap(void *start, si
+   return v4l2_mmap(start, length, prot, flags, fd, offset);
+ }
+ 
++#if !(defined(__sun) && defined(_LP64))
+ LIBV4L_PUBLIC 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);
+ }
++#endif
+ 
+ LIBV4L_PUBLIC int munmap(void *start, size_t length)
+ {
diff --git a/graphics/libv4l/patches/patch-am b/graphics/libv4l/patches/patch-am
index 39142742227..af1b672e906 100644
--- a/graphics/libv4l/patches/patch-am
+++ b/graphics/libv4l/patches/patch-am
@@ -1,7 +1,8 @@
-$NetBSD: patch-am,v 1.3 2011/01/07 15:20:45 obache Exp $
+$NetBSD: patch-am,v 1.4 2013/06/24 15:57:21 jperkin Exp $
 
 * XXXX
 * `mode_t' is promoted to `int' when passed through `...'.
+* Fix SunOS 64-bit
 
 --- libv4l1/v4l1compat.c.orig	2008-08-26 12:32:39.000000000 +0000
 +++ libv4l1/v4l1compat.c
@@ -25,7 +26,15 @@ $NetBSD: patch-am,v 1.3 2011/01/07 15:20:45 obache Exp $
  
      fd = v4l1_open(file, oflag, mode);
  
-@@ -71,7 +75,7 @@ LIBV4L_PUBLIC int open64 (const char *fi
+@@ -61,6 +65,7 @@ LIBV4L_PUBLIC int open (const char *file
+   return fd;
+ }
+ 
++#if !(defined(__sun) && defined(_LP64))
+ LIBV4L_PUBLIC int open64 (const char *file, int oflag, ...)
+ {
+   int fd;
+@@ -71,7 +76,7 @@ LIBV4L_PUBLIC int open64 (const char *fi
      mode_t mode;
  
      va_start (ap, oflag);
@@ -34,3 +43,25 @@ $NetBSD: patch-am,v 1.3 2011/01/07 15:20:45 obache Exp $
  
      fd = v4l1_open(file, oflag | O_LARGEFILE, mode);
  
+@@ -81,6 +86,7 @@ LIBV4L_PUBLIC int open64 (const char *fi
+ 
+   return fd;
+ }
++#endif
+ 
+ LIBV4L_PUBLIC int close(int fd) {
+   return v4l1_close(fd);
+@@ -114,11 +120,13 @@ LIBV4L_PUBLIC void *mmap(void *start, si
+   return v4l1_mmap(start, length, prot, flags, fd, offset);
+ }
+ 
++#if !(defined(__sun) && defined(_LP64))
+ LIBV4L_PUBLIC 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);
+ }
++#endif
+ 
+ LIBV4L_PUBLIC int munmap(void *start, size_t length)
+ {