[pkgsrc/trunk]: pkgsrc/x11/xf86-video-ati xf86-video-ati: Fix build with modu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92cd97d316a8
branches:  trunk
changeset: 380695:92cd97d316a8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun May 20 07:11:10 2018 +0000

description:
xf86-video-ati: Fix build with modular-xorg-server-1.20

diffstat:

 x11/xf86-video-ati/distinfo                |   3 ++-
 x11/xf86-video-ati/patches/patch-configure |  27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r dc6fafd16940 -r 92cd97d316a8 x11/xf86-video-ati/distinfo
--- a/x11/xf86-video-ati/distinfo       Sun May 20 06:33:40 2018 +0000
+++ b/x11/xf86-video-ati/distinfo       Sun May 20 07:11:10 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.33 2018/03/15 23:45:25 wiz Exp $
+$NetBSD: distinfo,v 1.34 2018/05/20 07:11:10 wiz Exp $
 
 SHA1 (xf86-video-ati-18.0.1.tar.bz2) = b5a0b6a2fa839d668a3fb90280fede95f0bc130d
 RMD160 (xf86-video-ati-18.0.1.tar.bz2) = 5a60d8a4c06a7d57f4c3f9e7e7ee29a1f0fe3ea7
 SHA512 (xf86-video-ati-18.0.1.tar.bz2) = b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14
 Size (xf86-video-ati-18.0.1.tar.bz2) = 881457 bytes
+SHA1 (patch-configure) = bdd1014b215af69c2bb837d36829e12e86eb5764
diff -r dc6fafd16940 -r 92cd97d316a8 x11/xf86-video-ati/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati/patches/patch-configure        Sun May 20 07:11:10 2018 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-configure,v 1.1 2018/05/20 07:11:10 wiz Exp $
+
+Remove duplicate definitions - src/radeon.h defines these as well.
+
+--- configure.orig     2018-03-15 16:21:20.000000000 +0000
++++ configure
+@@ -19933,20 +19933,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
+