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

[Laurent Carlier]

    Date: Thursday, February 5, 2015 @ 23:03:25
  Author: lcarlier
Revision: 230872

upgpkg: xf86-video-s3virge 1.10.6-6

xorg-server 1.17 rebuild

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

-----------------+
 PKGBUILD        |   15 ++++++---
 git-fixes.patch |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 21:59:55 UTC (rev 230871)
+++ PKGBUILD	2015-02-05 22:03:25 UTC (rev 230872)
@@ -4,17 +4,22 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org S3 Virge 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')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
+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 git-fixes.patch)
+sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e'
+            '8215be38309ad51d262c72775f8d0aff02c67a351e4ed17395faa6fb42dbf518')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
 
 build() {
   cd ${pkgname}-${pkgver}

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2015-02-05 22:03:25 UTC (rev 230872)
@@ -0,0 +1,90 @@
+From d74238ca2faddb2e1c0b48333664688a5079a856 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 21 May 2014 14:10:11 -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/s3v_driver.c b/src/s3v_driver.c
+index 654884c..937717e 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3760,6 +3760,12 @@ S3Vddc1Read(ScrnInfoPtr pScrn)
+     return ((unsigned int) (tmp & 0x08));
+ }
+ 
++static void
++S3Vddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++    vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ S3Vddc1(ScrnInfoPtr pScrn)
+ {
+@@ -3773,7 +3779,7 @@ S3Vddc1(ScrnInfoPtr pScrn)
+     OUTREG(DDC_REG,(tmp | 0x12));
+     
+     if ((pMon = xf86PrintEDID(
+-		xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),
++		xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), S3Vddc1SetSpeed,
+ 	                S3Vddc1Read))) != NULL)
+ 	success = TRUE;
+     xf86SetDDCproperties(pScrn,pMon);
+-- 
+cgit v0.10.2
+From 69b9adea709922e53ba422dd7f00aa4ac90d232e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 30 Sep 2014 10:26:17 -0400
+Subject: Fix build against xserver 1.17
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 937717e..e81ab72 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3515,7 +3515,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+ {
+   vgaHWPtr hwp;
+   S3VPtr ps3v;
+-  IOADDRESS vgaCRIndex, vgaCRReg;
++  unsigned int vgaCRIndex, vgaCRReg;
+   unsigned char val;
+   unsigned int PIOOffset = 0;
+ 
+@@ -3584,7 +3584,7 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
+ {
+   vgaHWPtr hwp;
+   S3VPtr ps3v;
+-  IOADDRESS vgaCRIndex, vgaCRReg;
++  unsigned int vgaCRIndex, vgaCRReg;
+   
+   PVERB5("	S3VDisableMmio\n");
+   
+-- 
+cgit v0.10.2
+From 211e2831dcf13c6e5847f6caf894f559d9104c3d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 30 Sep 2014 10:27:13 -0400
+Subject: Remove call to miInitializeBackingStore
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index e81ab72..d519dc8 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -2420,7 +2420,6 @@ S3VScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+   }
+ 	
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+   						/* hardware cursor needs to wrap this layer */
+-- 
+cgit v0.10.2
+