[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Assume that __GNUC__ implies that it ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c99926de91a7
branches:  trunk
changeset: 651773:c99926de91a7
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon May 11 21:33:58 2015 +0000

description:
Assume that __GNUC__ implies that it has __builtin_ffsll as a last
ditch resort in case ffsll(3) is found to be not available.

diffstat:

 graphics/MesaLib/distinfo                                           |   4 +-
 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h |  18 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r bd04fdf03839 -r c99926de91a7 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Mon May 11 15:09:34 2015 +0000
+++ b/graphics/MesaLib/distinfo Mon May 11 21:33:58 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2015/04/29 14:12:54 sevan Exp $
+$NetBSD: distinfo,v 1.92 2015/05/11 21:33:58 tnn Exp $
 
 SHA1 (mesa-10.5.3.tar.xz) = 16ae80abe85b29fa118e1910a224c883964ae6c0
 RMD160 (mesa-10.5.3.tar.xz) = 017492351cb3956d3b36eb7c22ad99846b77f7a2
@@ -6,7 +6,7 @@
 SHA1 (patch-configure) = 3fc150370e36fc49382b491d907608f00cf99a72
 SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
 SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
-SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = a48959f10f09decfaf66180bd69c84ac518cd9d9
+SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = b126390d4a8ee495edfb4c3b1dfdab981445969e
 SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = 283f505af780071dc9fd7914f8065e3fb7d8a4fd
 SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677
 SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc
diff -r bd04fdf03839 -r c99926de91a7 graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h       Mon May 11 15:09:34 2015 +0000
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h       Mon May 11 21:33:58 2015 +0000
@@ -1,20 +1,22 @@
-$NetBSD: patch-src_gallium_auxiliary_util_u__math.h,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_gallium_auxiliary_util_u__math.h,v 1.2 2015/05/11 21:33:58 tnn Exp $
 
 The C99 "restrict" keyword is not valid in C++, but most compilers will
 understand __restrict.
 
---- src/gallium/auxiliary/util/u_math.h.orig   2015-03-28 18:20:39.000000000 +0000
+--- src/gallium/auxiliary/util/u_math.h.orig   2015-03-28 18:20:39.000000000 +0000
 +++ src/gallium/auxiliary/util/u_math.h
-@@ -531,6 +531,9 @@ unsigned ffs( unsigned u )
- #elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
- #define ffs __builtin_ffs
- #define ffsll __builtin_ffsll
+@@ -528,7 +528,10 @@ unsigned ffs( unsigned u )
+ 
+    return i;
+ }
+-#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
 +#elif defined(__NetBSD__)
 +#include <sys/bitops.h>
 +#define ffsll ffs64
++#elif defined(__GNUC__)
+ #define ffs __builtin_ffs
+ #define ffsll __builtin_ffsll
  #endif
- 
- #endif /* FFS_DEFINED */
 @@ -821,6 +824,11 @@ util_bswap16(uint16_t n)
            (n << 8);
  }