CVS commit: pkgsrc/x11/xf86-video-ati6

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jan 27 11:54:57 UTC 2019

Modified Files:
        pkgsrc/x11/xf86-video-ati6: distinfo
        pkgsrc/x11/xf86-video-ati6/patches: patch-configure.ac
Added Files:
        pkgsrc/x11/xf86-video-ati6/patches: patch-src_compat-api.h

Log Message:
xf86-video-ati: fix bitrot, make it build again


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-video-ati6/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/xf86-video-ati6/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-ati6/patches/patch-src_compat-api.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-ati6/distinfo
diff -u pkgsrc/x11/xf86-video-ati6/distinfo:1.9 pkgsrc/x11/xf86-video-ati6/distinfo:1.10
--- pkgsrc/x11/xf86-video-ati6/distinfo:1.9     Mon Sep  5 12:08:53 2016
+++ pkgsrc/x11/xf86-video-ati6/distinfo Sun Jan 27 11:54:57 2019
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.9 2016/09/05 12:08:53 richard Exp $
+$NetBSD: distinfo,v 1.10 2019/01/27 11:54:57 tnn Exp $
 
 SHA1 (xf86-video-ati-6.14.6.tar.bz2) = b30383c7e5487c1df403a3af19fce8626d617a8d
 RMD160 (xf86-video-ati-6.14.6.tar.bz2) = e285bff97a23f6e6f8553f1c010c840e6df882a8
 SHA512 (xf86-video-ati-6.14.6.tar.bz2) = 7ed64bb3596703f7c575aec37a6918bac251819fe638acc66a29aab7648d8a81dedd8d416f970faa1f757fa8e9e3ccdc43e4499d06271cc2751288040d1d957e
 Size (xf86-video-ati-6.14.6.tar.bz2) = 1139495 bytes
-SHA1 (patch-configure.ac) = a7a99e75acc2f6f962fe7cfed084c7451a89c45c
+SHA1 (patch-configure.ac) = 4558ecd87af3ed7c8c13c66340ccb6c4de835140
 SHA1 (patch-src_AtomBios_CD__Operations.c) = bf368936c44dd3f8daf0d79348783268ad9701e0
 SHA1 (patch-src_atombios__crtc.c) = e6ec24fdc63e3744db9442ab5e12ffe6949eef19
 SHA1 (patch-src_atombios__output.c) = ce3720c1d1cfd1f65023cea2745259af30a59add
+SHA1 (patch-src_compat-api.h) = e01560f8421254acf5fb150872827de7ed0dc08f
 SHA1 (patch-src_legacy__crtc.c) = 6be802fa29797265efeceaadec9607de334dbfc8
 SHA1 (patch-src_r600__exa.c) = 009ff3a42b95c1b1c825c54825316ab31e4fe43c
 SHA1 (patch-src_r600__textured__videofuncs.c) = ec8eca51e27d4f3899d9a5e040f313b92c87d1d0

Index: pkgsrc/x11/xf86-video-ati6/patches/patch-configure.ac
diff -u pkgsrc/x11/xf86-video-ati6/patches/patch-configure.ac:1.1 pkgsrc/x11/xf86-video-ati6/patches/patch-configure.ac:1.2
--- pkgsrc/x11/xf86-video-ati6/patches/patch-configure.ac:1.1   Thu Apr  2 22:16:46 2015
+++ pkgsrc/x11/xf86-video-ati6/patches/patch-configure.ac       Sun Jan 27 11:54:57 2019
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/04/02 22:16:46 tnn Exp $
+$NetBSD: patch-configure.ac,v 1.2 2019/01/27 11:54:57 tnn Exp $
+
+Remove duplicate bswap definitions, like x11/xf86-video-ati
 
 --- configure.ac.orig  2012-06-29 13:46:11.000000000 +0000
 +++ configure.ac
@@ -31,3 +33,16 @@ $NetBSD: patch-configure.ac,v 1.1 2015/0
  
  # Properly handle EXA.
  AC_MSG_CHECKING([whether to enable EXA support])
+@@ -309,12 +329,6 @@ b = bswap16(a);
+       if test "$USE_SYS_ENDIAN_H" = "yes" ; then
+           AC_DEFINE([USE_SYS_ENDIAN_H], 1, 
+               [Define to use byteswap macros from <sys/endian.h>])
+-          AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, 
+-                      [Define to 16-bit byteswap macro])
+-          AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, 
+-                      [Define to 32-bit byteswap macro])
+-          AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, 
+-                      [Define to 64-bit byteswap macro])
+       fi
+ fi
+ 

Added files:

Index: pkgsrc/x11/xf86-video-ati6/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-ati6/patches/patch-src_compat-api.h:1.1
--- /dev/null   Sun Jan 27 11:54:57 2019
+++ pkgsrc/x11/xf86-video-ati6/patches/patch-src_compat-api.h   Sun Jan 27 11:54:57 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2019/01/27 11:54:57 tnn Exp $
+
+Adapt to current server API
+
+--- src/compat-api.h.orig      2012-06-15 13:26:20.000000000 +0000
++++ src/compat-api.h
+@@ -73,8 +73,8 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
+-#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+-#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen