[arch-commits] Commit in xf86-video-chips/trunk (PKGBUILD git-fix.diff)

[Laurent Carlier]

    Date: Thursday, February 5, 2015 @ 21:36:39
  Author: lcarlier
Revision: 230850

upgpkg: xf86-video-chips 1.2.5-6

xorg-server 1.17 rebuild

Modified:
  xf86-video-chips/trunk/PKGBUILD
  xf86-video-chips/trunk/git-fix.diff

--------------+
 PKGBUILD     |    8 ++--
 git-fix.diff |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 20:27:38 UTC (rev 230849)
+++ PKGBUILD	2015-02-05 20:36:39 UTC (rev 230850)
@@ -4,18 +4,18 @@
 
 pkgname=xf86-video-chips
 pkgver=1.2.5
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff)
 sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
             'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670'
-            '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804')
+            '7c3f454b866ae479b5ab5d7cde4cb1e226b6f4fc070f77c6025864c2a1441ce1')
 
 prepare() {
   cd ${pkgname}-${pkgver}

Modified: git-fix.diff
===================================================================
--- git-fix.diff	2015-02-05 20:27:38 UTC (rev 230849)
+++ git-fix.diff	2015-02-05 20:36:39 UTC (rev 230850)
@@ -37,3 +37,100 @@
  	xf86SetSilkenMouse(pScreen);
 --
 cgit v0.9.0.2-2-gbebe
+From bb03c06322f875e905dec956e06a99b9674e57aa Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at 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 at redhat.com>
+
+diff --git a/src/ct_ddc.c b/src/ct_ddc.c
+index 5e2346a..677d840 100644
+--- a/src/ct_ddc.c
++++ b/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 */
+-- 
+cgit v0.10.2
+From 9187d76bd4f8d500fc3403b6d4a7bef55508bf2b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Fri, 17 Oct 2014 09:49:26 -0400
+Subject: Update for xserver 1.17
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index effbc60..378a23c 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -2098,13 +2098,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+     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");
+ 
+@@ -2807,13 +2801,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
+ 
+     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);
+@@ -3500,14 +3488,8 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
+ 
+     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);
+-- 
+cgit v0.10.2