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)

4 files changed, 134 insertions, 4 deletions

diff --git a/x11/xf86-video-chips/distinfo b/x11/xf86-video-chips/distinfo
index 60609bab1ba..798512f9b81 100644
--- a/x11/xf86-video-chips/distinfo
+++ b/x11/xf86-video-chips/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2013/05/19 07:09:51 obache Exp $
+$NetBSD: distinfo,v 1.7 2015/04/02 22:16:46 tnn Exp $
 
 SHA1 (xf86-video-chips-1.2.5.tar.bz2) = 5642e1d1bf3a05d24a0b8db48ca3b522c1962b00
 RMD160 (xf86-video-chips-1.2.5.tar.bz2) = 11a23a67a96db8e40465b262853084495ef8a7b5
 Size (xf86-video-chips-1.2.5.tar.bz2) = 398804 bytes
-SHA1 (patch-configure) = 90201f2e21de2a82e56918a30beee654df641cc0
+SHA1 (patch-configure) = 2a7d72260b5f1650e2aa6dc8c90cfc896f36ddb2
+SHA1 (patch-src_ct__ddc.c) = 7193bbaee8599e802a214c372a8280d9a6148281
+SHA1 (patch-src_ct__driver.c) = 7f43ef04e24013d0a201477c0dc753264e577f65
 SHA1 (patch-util_Makefile.am) = 450f13ea360f0631db3ee8f7bedc76e4b70efbab
diff --git a/x11/xf86-video-chips/patches/patch-configure b/x11/xf86-video-chips/patches/patch-configure
index 6d99629c500..0485609f28f 100644
--- a/x11/xf86-video-chips/patches/patch-configure
+++ b/x11/xf86-video-chips/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2013/05/19 07:09:51 obache Exp $
+$NetBSD: patch-configure,v 1.2 2015/04/02 22:16:46 tnn Exp $
 
 * use the header file really used in util.
 
---- configure.orig	2013-05-19 04:32:55.000000000 +0000
+--- configure.orig	2012-07-17 06:18:46.000000000 +0000
 +++ configure
 @@ -18182,7 +18182,7 @@ $as_echo_n "checking for inb... " >&6; }
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/x11/xf86-video-chips/patches/patch-src_ct__ddc.c b/x11/xf86-video-chips/patches/patch-src_ct__ddc.c
new file mode 100644
index 00000000000..e3ee946fa2f
--- /dev/null
+++ b/x11/xf86-video-chips/patches/patch-src_ct__ddc.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_ct__ddc.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
+
+From bb03c06322f875e905dec956e06a99b9674e57aa Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 21 May 2014 09:38:35 -0400
+Subject: ddc: Use own thunk function instead of vgaHWddc1SetSpeedWeak
+
+I plan to remove the Weak functions from future servers.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/ct_ddc.c b/src/ct_ddc.c
+index 5e2346a..677d840 100644
+--- src/ct_ddc.c.orig	2012-06-05 18:08:22.000000000 +0000
++++ src/ct_ddc.c
+@@ -33,6 +33,12 @@ chips_ddc1Read(ScrnInfoPtr pScrn)
+     return (tmp & ddc_mask);
+ }
+ 
++static void
++chips_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++    vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ void
+ chips_ddc1(ScrnInfoPtr pScrn)
+ {
+@@ -93,7 +99,7 @@ chips_ddc1(ScrnInfoPtr pScrn)
+ 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "DDC1 found\n");	
+     else return;
+ 
+-    xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), vgaHWddc1SetSpeedWeak(),
++    xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), chips_ddc1SetSpeed,
+ 				  chips_ddc1Read));
+ 
+     /* restore */
diff --git a/x11/xf86-video-chips/patches/patch-src_ct__driver.c b/x11/xf86-video-chips/patches/patch-src_ct__driver.c
new file mode 100644
index 00000000000..7664c3ba600
--- /dev/null
+++ b/x11/xf86-video-chips/patches/patch-src_ct__driver.c
@@ -0,0 +1,91 @@
+$NetBSD: patch-src_ct__driver.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
+
+From 9187d76bd4f8d500fc3403b6d4a7bef55508bf2b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 17 Oct 2014 09:49:26 -0400
+Subject: Update for xserver 1.17
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 08:54:34 -0400
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+--- src/ct_driver.c.orig	2015-04-02 18:04:37.000000000 +0000
++++ src/ct_driver.c
+@@ -96,9 +96,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi banking wrapper need this */
+ #ifdef HAVE_ISA
+ #include "mibank.h"
+@@ -2101,13 +2098,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int 
+     pScrn->progClock = TRUE;
+     cPtr->ClockType = HiQV_STYLE | TYPE_PROGRAMMABLE;
+ 
+-    if (cPtr->pEnt->device->textClockFreq > 0) {
+-	SaveClk->Clock = cPtr->pEnt->device->textClockFreq;
+-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Using textclock freq: %7.3f.\n",
+-		   SaveClk->Clock/1000.0);
+-    } else
+-	SaveClk->Clock = 0;
++    SaveClk->Clock = 0;
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n");
+ 
+@@ -2810,13 +2801,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, i
+ 
+     if (cPtr->ClockType & TYPE_PROGRAMMABLE) {
+ 	pScrn->numClocks = NoClocks;
+-	if(cPtr->pEnt->device->textClockFreq > 0) {
+-	    SaveClk->Clock = cPtr->pEnt->device->textClockFreq;
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		       "Using textclock freq: %7.3f.\n",
+-		       SaveClk->Clock/1000.0);
+-	} else
+-	   SaveClk->Clock = CRT_TEXT_CLK_FREQ;
++	SaveClk->Clock = CRT_TEXT_CLK_FREQ;
+ 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n");
+     } else {  /* TYPE_PROGRAMMABLE */
+ 	SaveClk->Clock = chipsGetHWClock(pScrn);
+@@ -3503,14 +3488,8 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int
+ 
+     if (cPtr->ClockType & TYPE_PROGRAMMABLE) {
+ 	pScrn->numClocks = NoClocks;
+-	if (cPtr->pEnt->device->textClockFreq > 0) {
+-	    SaveClk->Clock = cPtr->pEnt->device->textClockFreq;
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		       "Using textclock freq: %7.3f.\n",
+-		       SaveClk->Clock/1000.0);
+-	} else
+-	   SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? 
+-				 LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ);
++        SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? 
++			  LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ);
+ 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n");
+     } else {  /* TYPE_PROGRAMMABLE */
+ 	SaveClk->Clock = chipsGetHWClock(pScrn);
+@@ -4145,7 +4124,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Initialise cursor functions */
+@@ -4296,7 +4274,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    }
+ 	}
+ 	
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ #ifdef ENABLE_SILKEN_MOUSE
+ 	xf86SetSilkenMouse(pScreen);