[pkgsrc/trunk]: pkgsrc/x11/xf86-video-r128 xf86-video-r128: fix build with mo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4532d8bdc3e
branches:  trunk
changeset: 380697:a4532d8bdc3e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun May 20 07:19:18 2018 +0000

description:
xf86-video-r128: fix build with modular-xorg-server-1.20

diffstat:

 x11/xf86-video-r128/distinfo                        |   4 ++-
 x11/xf86-video-r128/patches/patch-configure         |  27 +++++++++++++++++++++
 x11/xf86-video-r128/patches/patch-src_r128__probe.c |  14 ++++++++++
 3 files changed, 44 insertions(+), 1 deletions(-)

diffs (62 lines):

diff -r df53b63107a4 -r a4532d8bdc3e x11/xf86-video-r128/distinfo
--- a/x11/xf86-video-r128/distinfo      Sun May 20 07:15:21 2018 +0000
+++ b/x11/xf86-video-r128/distinfo      Sun May 20 07:19:18 2018 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/01/18 20:22:39 wiz Exp $
+$NetBSD: distinfo,v 1.11 2018/05/20 07:19:18 wiz Exp $
 
 SHA1 (xf86-video-r128-6.10.2.tar.bz2) = ea3c739efda6ce785b057ac9c39f9247ae9ede8e
 RMD160 (xf86-video-r128-6.10.2.tar.bz2) = 1a277f08a3ab63a07b35a9fda239cce70109973c
 SHA512 (xf86-video-r128-6.10.2.tar.bz2) = 564b65454ee538c1b9dc5d22a52a57bdff0c1f94e1832719a8310699cee7167c1ca8fcd26243dfc4089832b1fcbab9efafb69c9061b328532f689d02a0acac23
 Size (xf86-video-r128-6.10.2.tar.bz2) = 504031 bytes
+SHA1 (patch-configure) = b8aec279d402f4bd31693f34e0ccab4155159cd4
+SHA1 (patch-src_r128__probe.c) = 3a0e00262f8b996392b2a9c1a5b887a1016f6203
diff -r df53b63107a4 -r a4532d8bdc3e x11/xf86-video-r128/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-r128/patches/patch-configure       Sun May 20 07:19:18 2018 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-configure,v 1.1 2018/05/20 07:19:18 wiz Exp $
+
+Avoid redefinition of bswap macros.
+
+--- configure.orig     2017-01-17 22:43:33.000000000 +0000
++++ configure
+@@ -19447,20 +19447,6 @@ $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
+ $as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
+ 
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_16 ${BSWAP}16
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_32 ${BSWAP}32
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define bswap_64 ${BSWAP}64
+-_ACEOF
+-
+       fi
+ fi
+ 
diff -r df53b63107a4 -r a4532d8bdc3e x11/xf86-video-r128/patches/patch-src_r128__probe.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-r128/patches/patch-src_r128__probe.c       Sun May 20 07:19:18 2018 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_r128__probe.c,v 1.3 2018/05/20 07:19:18 wiz Exp $
+
+Provide uint32_t.
+
+--- src/r128_probe.c.orig      2017-01-17 22:42:44.000000000 +0000
++++ src/r128_probe.c
+@@ -32,6 +32,7 @@
+ #endif
+ 
+ #include <string.h>
++#include <sys/types.h>
+ 
+ /*
+  * Authors: