[arch-commits] Commit in xf86-video-savage/trunk (PKGBUILD git-fixes.patch)

[Laurent Carlier]

    Date: Thursday, February 5, 2015 @ 22:59:49
  Author: lcarlier
Revision: 230870

upgpkg: xf86-video-savage 2.3.7-4

xorg-server 1.17 rebuild

Added:
  xf86-video-savage/trunk/git-fixes.patch
Modified:
  xf86-video-savage/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   16 ++++++----
 git-fixes.patch |   85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 21:54:04 UTC (rev 230869)
+++ PKGBUILD	2015-02-05 21:59:49 UTC (rev 230870)
@@ -3,19 +3,25 @@
 
 pkgname=xf86-video-savage
 pkgver=2.3.7
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org savage 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')
 optdepends=('savage-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44'
+            '06c113851952d21fac93f448337a446634ed644400009d0646421a6425c75d45')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2015-02-05 21:59:49 UTC (rev 230870)
@@ -0,0 +1,85 @@
+From 2e9217bb88b76cebfcd2b65b76c8733f80da77ea Mon Sep 17 00:00:00 2001
+From: Jeremy White <jwhite at codeweavers.com>
+Date: Thu, 21 Mar 2013 10:59:13 -0500
+Subject: Include xf86Modes.h to use functions from
+ hw/xfree86/modes/xf86Modes.c.
+
+Signed-off-by: Jeremy White <jwhite at codeweavers.com>
+Reviewed-by: Robert Morell <rmorell at nvidia.com>
+
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index ec4b1ea..de042af 100644
+--- a/src/savage_driver.h
++++ b/src/savage_driver.h
+@@ -54,6 +54,7 @@
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+ #endif
++#include "xf86Modes.h"
+ #include "xf86Pci.h"
+ #include "xf86_OSproc.h"
+ #include "xf86Cursor.h"
+-- 
+cgit v0.10.2
+From 16a672d1ba183601d513c4cdca32b47e926a6d1e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 21 May 2014 14:11:46 -0400
+Subject: Use own thunk function instead of vgaHW*Weak
+
+I plan to remove the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index bca2c60..e82794f 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
+     return ((unsigned int) (tmp & 0x08));
+ }
+ 
++static void
++SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++    vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ SavageDDC1(ScrnInfoPtr pScrn)
+ {
+@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
+     InI2CREG(byte,psav->I2CPort);
+     OutI2CREG(byte | 0x12,psav->I2CPort);
+ 
+-    pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
++    pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
++			   SavageDDC1Read);
+     if (!pMon)
+         return FALSE;
+     
+-- 
+cgit v0.10.2
+From d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 29 Jul 2014 09:15:26 -0400
+Subject: dri: Stop (uselessly) initializing the ValidateTree hooks
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/savage_dri.c b/src/savage_dri.c
+index bdb78e4..0842821 100644
+--- a/src/savage_dri.c
++++ b/src/savage_dri.c
+@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
+    psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
+    pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
+ 
+-   pDRIInfo->wrap.ValidateTree = NULL;
+-   pDRIInfo->wrap.PostValidateTree = NULL;
+-
+    pDRIInfo->createDummyCtx = TRUE;
+    pDRIInfo->createDummyCtxPriv = FALSE;
+ 
+-- 
+cgit v0.10.2
+