Make xf86-video-* drivers build against xorg-server-1.17 in addition to the

old 1.12 server. Mostly from FDO git. (xf86-video-ati6 was manually ported)

6 files changed, 214 insertions, 1 deletions

diff --git a/x11/xf86-video-r128/distinfo b/x11/xf86-video-r128/distinfo
index b77b13d28dd..c31524fed95 100644
--- a/x11/xf86-video-r128/distinfo
+++ b/x11/xf86-video-r128/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.4 2013/10/03 08:31:23 wiz Exp $
+$NetBSD: distinfo,v 1.5 2015/04/02 22:16:47 tnn Exp $
 
 SHA1 (xf86-video-r128-6.9.2.tar.bz2) = ba8b695caaecd94e266c480a644eae4c706b77d8
 RMD160 (xf86-video-r128-6.9.2.tar.bz2) = 7e7e50560b770b1f70dd22c184ab13038a68402d
 Size (xf86-video-r128-6.9.2.tar.bz2) = 462266 bytes
+SHA1 (patch-src_r128.h) = 7fbfa7bea412a55c8c8e6b075cea179e8a1da756
+SHA1 (patch-src_r128__dri.c) = 1d2d451d2a63c13f02e054c2ce6a7a1aea0d4fea
+SHA1 (patch-src_r128__driver.c) = eca52b2d8e678263256e73cc6fa71bf3ecf3f7f3
+SHA1 (patch-src_r128__probe.c) = 9a6ef4f3e3eb302639a629ee52408c0f70181032
+SHA1 (patch-src_r128__probe.h) = b397d1566f08d35f82ac8aad4615aa8ca805d622
diff --git a/x11/xf86-video-r128/patches/patch-src_r128.h b/x11/xf86-video-r128/patches/patch-src_r128.h
new file mode 100644
index 00000000000..71f7927b2c2
--- /dev/null
+++ b/x11/xf86-video-r128/patches/patch-src_r128.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_r128.h,v 1.1 2015/04/02 22:16:47 tnn Exp $
+
+From 9eb693640136bc8bcbe706d642519b4eb23286d4 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@gmail.com>
+Date: Wed, 27 Nov 2013 18:14:43 -0800
+Subject: Only declare PCITAG if we need it
+
+If libpciaccess is available, we do not need to declare the deprecated
+PciTag member because it will not be used.
+
+Signed-off-by: Connor Behan <connor.behan@gmail.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/r128.h b/src/r128.h
+index 90071b4..ee0b1d4 100644
+--- src/r128.h.orig	2013-10-02 18:30:05.000000000 +0000
++++ src/r128.h
+@@ -301,7 +301,9 @@ struct r128_2d_state {
+ typedef struct {
+     EntityInfoPtr     pEnt;
+     pciVideoPtr       PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+     PCITAG            PciTag;
++#endif
+     int               Chipset;
+     Bool              Primary;
+ 
diff --git a/x11/xf86-video-r128/patches/patch-src_r128__dri.c b/x11/xf86-video-r128/patches/patch-src_r128__dri.c
new file mode 100644
index 00000000000..3448ae705d7
--- /dev/null
+++ b/x11/xf86-video-r128/patches/patch-src_r128__dri.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_r128__dri.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
+
+From d757fe10b9ce9493ef3cf854bc03088366aa7256 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@gmail.com>
+Date: Fri, 22 Nov 2013 22:55:59 -0800
+Subject: Drop dependence on xf86PciInfo.h
+
+It is about time we stop using this deprecated file and include pciids
+locally.
+
+Signed-off-by: Connor Behan <connor.behan@gmail.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/r128_dri.c b/src/r128_dri.c
+index 67e8d1d..ff7bbc2 100644
+--- src/r128_dri.c.orig	2013-10-02 18:30:05.000000000 +0000
++++ src/r128_dri.c
+@@ -53,7 +53,6 @@
+ 
+ 				/* X and server generic header files */
+ #include "xf86.h"
+-#include "xf86PciInfo.h"
+ #include "windowstr.h"
+ 
+ #include "shadowfb.h"
diff --git a/x11/xf86-video-r128/patches/patch-src_r128__driver.c b/x11/xf86-video-r128/patches/patch-src_r128__driver.c
new file mode 100644
index 00000000000..c9be8c8427c
--- /dev/null
+++ b/x11/xf86-video-r128/patches/patch-src_r128__driver.c
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_r128__driver.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
+
+From 9eb693640136bc8bcbe706d642519b4eb23286d4 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@gmail.com>
+Date: Wed, 27 Nov 2013 18:14:43 -0800
+Subject: Only declare PCITAG if we need it
+
+If libpciaccess is available, we do not need to declare the deprecated
+PciTag member because it will not be used.
+
+Signed-off-by: Connor Behan <connor.behan@gmail.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+From d757fe10b9ce9493ef3cf854bc03088366aa7256 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@gmail.com>
+Date: Fri, 22 Nov 2013 22:55:59 -0800
+Subject: Drop dependence on xf86PciInfo.h
+
+It is about time we stop using this deprecated file and include pciids
+locally.
+
+Signed-off-by: Connor Behan <connor.behan@gmail.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/r128_driver.c b/src/r128_driver.c
+index 6acdf2d..04a4537 100644
+--- src/r128_driver.c.orig	2013-10-02 18:30:05.000000000 +0000
++++ src/r128_driver.c
+@@ -84,7 +84,6 @@
+ 				/* X and server generic header files */
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86RAC.h"
+ #include "xf86Resources.h"
+@@ -1955,9 +1954,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int 
+     }
+ 
+     info->PciInfo      = xf86GetPciInfoForEntity(info->pEnt->index);
+-    info->PciTag       = pciTag(PCI_DEV_BUS(info->PciInfo),
+-				PCI_DEV_DEV(info->PciInfo),
+-				PCI_DEV_FUNC(info->PciInfo));
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 	       "PCI bus %d card %d func %d\n",
+@@ -1966,6 +1962,9 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int 
+ 	       PCI_DEV_FUNC(info->PciInfo));
+ 
+ #ifndef XSERVER_LIBPCIACCESS
++    info->PciTag       = pciTag(PCI_DEV_BUS(info->PciInfo),
++				PCI_DEV_DEV(info->PciInfo),
++				PCI_DEV_FUNC(info->PciInfo));
+     if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail;
+     if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail;
+ 
diff --git a/x11/xf86-video-r128/patches/patch-src_r128__probe.c b/x11/xf86-video-r128/patches/patch-src_r128__probe.c
new file mode 100644
index 00000000000..36ed2a3bcaf
--- /dev/null
+++ b/x11/xf86-video-r128/patches/patch-src_r128__probe.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_r128__probe.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
+
+From d757fe10b9ce9493ef3cf854bc03088366aa7256 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@gmail.com>
+Date: Fri, 22 Nov 2013 22:55:59 -0800
+Subject: Drop dependence on xf86PciInfo.h
+
+It is about time we stop using this deprecated file and include pciids
+locally.
+
+Signed-off-by: Connor Behan <connor.behan@gmail.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/r128_probe.c b/src/r128_probe.c
+index 7f1fbda..12e0c1c 100644
+--- src/r128_probe.c.orig	2013-10-02 18:30:05.000000000 +0000
++++ src/r128_probe.c
+@@ -43,8 +43,6 @@
+ #include "atipcirename.h"
+ 
+ #include "xf86.h"
+-#include "xf86PciInfo.h"
+-
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
diff --git a/x11/xf86-video-r128/patches/patch-src_r128__probe.h b/x11/xf86-video-r128/patches/patch-src_r128__probe.h
new file mode 100644
index 00000000000..37fc019087f
--- /dev/null
+++ b/x11/xf86-video-r128/patches/patch-src_r128__probe.h
@@ -0,0 +1,74 @@
+$NetBSD: patch-src_r128__probe.h,v 1.1 2015/04/02 22:16:47 tnn Exp $
+
+From d757fe10b9ce9493ef3cf854bc03088366aa7256 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@gmail.com>
+Date: Fri, 22 Nov 2013 22:55:59 -0800
+Subject: Drop dependence on xf86PciInfo.h
+
+It is about time we stop using this deprecated file and include pciids
+locally.
+
+Signed-off-by: Connor Behan <connor.behan@gmail.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/r128_probe.h b/src/r128_probe.h
+index 41fc0e4..7b55e71 100644
+--- src/r128_probe.h.orig	2013-10-02 18:30:05.000000000 +0000
++++ src/r128_probe.h
+@@ -38,6 +38,56 @@
+ 
+ #include "xf86str.h"
+ 
++/* Chip definitions */
++#define PCI_VENDOR_ATI			0x1002
++#define PCI_CHIP_RAGE128LE		0x4C45
++#define PCI_CHIP_RAGE128LF		0x4C46
++#define PCI_CHIP_RAGE128MF		0x4D46
++#define PCI_CHIP_RAGE128ML		0x4D4C
++#define PCI_CHIP_RAGE128PA		0x5041
++#define PCI_CHIP_RAGE128PB		0x5042
++#define PCI_CHIP_RAGE128PC		0x5043
++#define PCI_CHIP_RAGE128PD		0x5044
++#define PCI_CHIP_RAGE128PE		0x5045
++#define PCI_CHIP_RAGE128PF		0x5046
++#define PCI_CHIP_RAGE128PG		0x5047
++#define PCI_CHIP_RAGE128PH		0x5048
++#define PCI_CHIP_RAGE128PI		0x5049
++#define PCI_CHIP_RAGE128PJ		0x504A
++#define PCI_CHIP_RAGE128PK		0x504B
++#define PCI_CHIP_RAGE128PL		0x504C
++#define PCI_CHIP_RAGE128PM		0x504D
++#define PCI_CHIP_RAGE128PN		0x504E
++#define PCI_CHIP_RAGE128PO		0x504F
++#define PCI_CHIP_RAGE128PP		0x5050
++#define PCI_CHIP_RAGE128PQ		0x5051
++#define PCI_CHIP_RAGE128PR		0x5052
++#define PCI_CHIP_RAGE128PS		0x5053
++#define PCI_CHIP_RAGE128PT		0x5054
++#define PCI_CHIP_RAGE128PU		0x5055
++#define PCI_CHIP_RAGE128PV		0x5056
++#define PCI_CHIP_RAGE128PW		0x5057
++#define PCI_CHIP_RAGE128PX		0x5058
++#define PCI_CHIP_RAGE128RE		0x5245
++#define PCI_CHIP_RAGE128RF		0x5246
++#define PCI_CHIP_RAGE128RG		0x5247
++#define PCI_CHIP_RAGE128RK		0x524B
++#define PCI_CHIP_RAGE128RL		0x524C
++#define PCI_CHIP_RAGE128SE		0x5345
++#define PCI_CHIP_RAGE128SF		0x5346
++#define PCI_CHIP_RAGE128SG		0x5347
++#define PCI_CHIP_RAGE128SH		0x5348
++#define PCI_CHIP_RAGE128SK		0x534B
++#define PCI_CHIP_RAGE128SL		0x534C
++#define PCI_CHIP_RAGE128SM		0x534D
++#define PCI_CHIP_RAGE128SN		0x534E
++#define PCI_CHIP_RAGE128TF		0x5446
++#define PCI_CHIP_RAGE128TL		0x544C
++#define PCI_CHIP_RAGE128TR		0x5452
++#define PCI_CHIP_RAGE128TS		0x5453
++#define PCI_CHIP_RAGE128TT		0x5454
++#define PCI_CHIP_RAGE128TU		0x5455
++
+ extern DriverRec R128;
+ 
+ typedef struct