diff options
author | obache <obache@pkgsrc.org> | 2011-01-07 15:20:45 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2011-01-07 15:20:45 +0000 |
commit | 7f268e1b7e9f749cde874e0c0de678837954bac1 (patch) | |
tree | 70e7b65ffc8f8f7b6e0b07b4cd1314c588d2ac5d | |
parent | 75a60c47e2ea23626d40fd098c2f272f9b12b6ee (diff) | |
download | pkgsrc-7f268e1b7e9f749cde874e0c0de678837954bac1.tar.gz |
better and one more fix for mode_t of va_arg.
-rw-r--r-- | graphics/libv4l/distinfo | 8 | ||||
-rw-r--r-- | graphics/libv4l/patches/patch-af | 18 | ||||
-rw-r--r-- | graphics/libv4l/patches/patch-ak | 4 | ||||
-rw-r--r-- | graphics/libv4l/patches/patch-am | 4 |
4 files changed, 23 insertions, 11 deletions
diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo index 257942d7ded..2e73ddd6070 100644 --- a/graphics/libv4l/distinfo +++ b/graphics/libv4l/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2010/12/27 04:58:10 obache Exp $ +$NetBSD: distinfo,v 1.7 2011/01/07 15:20:45 obache Exp $ SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17 @@ -8,10 +8,10 @@ SHA1 (patch-ab) = 8528622d992e977d6e28388335db0a7c29ab272f SHA1 (patch-ac) = e886846a68d20d9c3eed905f10143f5e9f9fa4a0 SHA1 (patch-ad) = e5a3acfb8c2411bf76c4c43cbe09ba86a19afe84 SHA1 (patch-ae) = afb8579ac122dc2f0958b3c3d711d3641cf3c0c0 -SHA1 (patch-af) = ce15db36e94b0e386f86b4a024a5eb6d972d0958 +SHA1 (patch-af) = 88429670ab709d398d61002bddb4b210df9def6e SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5 SHA1 (patch-aj) = 2545189ac57f97ff181645132c25b32aa51f6a47 -SHA1 (patch-ak) = 3c5e709edde178619d4232c8bcd233bc6095ad52 +SHA1 (patch-ak) = 7c9f3c4c5c080b0d7a19e9069e80e4884c737519 SHA1 (patch-al) = a6eae236be7e16e03047d09b58a6f6d8baafd193 -SHA1 (patch-am) = 477c7b372b06b98ed945772f77313773b77512e5 +SHA1 (patch-am) = 0baf169cb5177f99e0d37de5820aefaee3aa71dd diff --git a/graphics/libv4l/patches/patch-af b/graphics/libv4l/patches/patch-af index 553e93056a2..c0a5b00639c 100644 --- a/graphics/libv4l/patches/patch-af +++ b/graphics/libv4l/patches/patch-af @@ -1,7 +1,10 @@ -$NetBSD: patch-af,v 1.2 2008/09/08 19:10:20 jmcneill Exp $ +$NetBSD: patch-af,v 1.3 2011/01/07 15:20:45 obache Exp $ ---- libv4l2/v4l2convert.c.orig 2008-09-08 14:48:19.000000000 -0400 -+++ libv4l2/v4l2convert.c 2008-09-08 14:50:00.000000000 -0400 +* XXXX +* `mode_t' is promoted to `int' when passed through `...'. + +--- libv4l2/v4l2convert.c.orig 2008-08-26 12:32:39.000000000 +0000 ++++ libv4l2/v4l2convert.c @@ -24,11 +24,16 @@ #include <stdarg.h> @@ -38,3 +41,12 @@ $NetBSD: patch-af,v 1.2 2008/09/08 19:10:20 jmcneill 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 + mode_t mode; + + va_start (ap, oflag); +- mode = va_arg (ap, mode_t); ++ mode = (sizeof (mode_t) < sizeof (int) ? (mode_t)va_arg (ap, int) : va_arg (ap, mode_t)); + + fd = syscall(SYS_open, file, oflag, mode); + diff --git a/graphics/libv4l/patches/patch-ak b/graphics/libv4l/patches/patch-ak index 76483c5a6e0..1581eaf57c3 100644 --- a/graphics/libv4l/patches/patch-ak +++ b/graphics/libv4l/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.2 2010/12/27 04:58:10 obache Exp $ +$NetBSD: patch-ak,v 1.3 2011/01/07 15:20:45 obache Exp $ * XXX * 'mode_t' is promoted to `int' when passwd through `...'. @@ -46,7 +46,7 @@ $NetBSD: patch-ak,v 1.2 2010/12/27 04:58:10 obache Exp $ va_start (ap, oflag); - mode = va_arg (ap, mode_t); -+ mode = (mode_t)va_arg (ap, int); ++ mode = (sizeof (mode_t) < sizeof (int) ? (mode_t)va_arg (ap, int) : va_arg (ap, mode_t)); fd = syscall(SYS_open, file, oflag, mode); diff --git a/graphics/libv4l/patches/patch-am b/graphics/libv4l/patches/patch-am index b7cd11b1d40..39142742227 100644 --- a/graphics/libv4l/patches/patch-am +++ b/graphics/libv4l/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.2 2010/12/27 04:58:10 obache Exp $ +$NetBSD: patch-am,v 1.3 2011/01/07 15:20:45 obache Exp $ * XXXX * `mode_t' is promoted to `int' when passed through `...'. @@ -21,7 +21,7 @@ $NetBSD: patch-am,v 1.2 2010/12/27 04:58:10 obache Exp $ va_start (ap, oflag); - mode = va_arg (ap, mode_t); -+ mode = (mode_t)va_arg (ap, int); ++ mode = (sizeof (mode_t) < sizeof (int) ? (mode_t)va_arg (ap, int) : va_arg (ap, mode_t)); fd = v4l1_open(file, oflag, mode); |