[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2016-11-21 Thread Laurent Carlier 
Date: Monday, November 21, 2016 @ 14:10:31
  Author: lcarlier
Revision: 281743

upgpkg: xf86-video-s3virge 1.10.7-3

xorg-server-1.19 rebuild

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-21 14:05:25 UTC (rev 281742)
+++ PKGBUILD2016-11-21 14:10:31 UTC (rev 281743)
@@ -4,14 +4,14 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/;
+url="https://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da'
 'SKIP')

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2015-11-11 Thread Andreas Radke 
Date: Wednesday, November 11, 2015 @ 10:34:53
  Author: andyrtr
Revision: 250713

upgpkg: xf86-video-s3virge 1.10.7-2

Xorg 1.18 rebuild

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-11 09:33:44 UTC (rev 250712)
+++ PKGBUILD2015-11-11 09:34:53 UTC (rev 250713)
@@ -4,14 +4,14 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.7
-pkgrel=1
+pkgrel=2
 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=19')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 
'X-ABI-VIDEODRV_VERSION>=20')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da'
 'SKIP')

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

2015-09-28 Thread Andreas Radke 
Date: Monday, September 28, 2015 @ 17:05:45
  Author: andyrtr
Revision: 247669

upgpkg: xf86-video-s3virge 1.10.7-1

upstream update 1.10.7

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

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

Modified: PKGBUILD
===
--- PKGBUILD2015-09-28 14:59:52 UTC (rev 247668)
+++ PKGBUILD2015-09-28 15:05:45 UTC (rev 247669)
@@ -3,8 +3,8 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xf86-video-s3virge
-pkgver=1.10.6
-pkgrel=6
+pkgver=1.10.7
+pkgrel=1
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/;
@@ -12,15 +12,11 @@
 depends=('glibc')
 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')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da'
+'SKIP')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner 

 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../git-fixes.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Deleted: git-fixes.patch
===
--- git-fixes.patch 2015-09-28 14:59:52 UTC (rev 247668)
+++ git-fixes.patch 2015-09-28 15:05:45 UTC (rev 247669)
@@ -1,90 +0,0 @@
-From d74238ca2faddb2e1c0b48333664688a5079a856 Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-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 
-
-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 
-Date: Tue, 30 Sep 2014 10:26:17 -0400
-Subject: Fix build against xserver 1.17
-
-Signed-off-by: Adam Jackson 
-
-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 
-Date: Tue, 30 Sep 2014 10:27:13 -0400
-Subject: Remove call to miInitializeBackingStore
-
-Signed-off-by: Adam Jackson 
-
-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
-

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

2015-02-05 Thread 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
===
--- PKGBUILD2015-02-05 21:59:55 UTC (rev 230871)
+++ PKGBUILD2015-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-server1.16' 'X-ABI-VIDEODRV_VERSION18' 
'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-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'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 a...@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 a...@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 a...@redhat.com
+Date: Tue, 30 Sep 2014 10:26:17 -0400
+Subject: Fix build against xserver 1.17
+
+Signed-off-by: Adam Jackson a...@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 a...@redhat.com
+Date: Tue, 30 Sep 2014 10:27:13 -0400
+Subject: Remove call to miInitializeBackingStore
+
+Signed-off-by: Adam Jackson a...@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
+

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2014-07-18 Thread Laurent Carlier 
Date: Friday, July 18, 2014 @ 13:35:29
  Author: lcarlier
Revision: 217170

upgpkg: xf86-video-s3virge 1.10.6-5

xorg-server 1.16 rebuild

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-18 11:35:28 UTC (rev 217169)
+++ PKGBUILD2014-07-18 11:35:29 UTC (rev 217170)
@@ -4,14 +4,14 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=4
+pkgrel=5
 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=15')
-conflicts=('xorg-server1.15.0' 'X-ABI-VIDEODRV_VERSION15' 
'X-ABI-VIDEODRV_VERSION=16')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION18' 
'X-ABI-VIDEODRV_VERSION=19')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2013-12-28 Thread Andreas Radke 
Date: Saturday, December 28, 2013 @ 19:32:41
  Author: andyrtr
Revision: 202866

upgpkg: xf86-video-s3virge 1.10.6-4

rebuild for new Xorg-server 1.15

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-28 18:30:19 UTC (rev 202865)
+++ PKGBUILD2013-12-28 18:32:41 UTC (rev 202866)
@@ -4,26 +4,26 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=3
+pkgrel=4
 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=14' 'resourceproto' 
'scrnsaverproto')
-conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server1.15.0' 'X-ABI-VIDEODRV_VERSION15' 
'X-ABI-VIDEODRV_VERSION=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
 
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2013-03-09 Thread Andreas Radke 
Date: Saturday, March 9, 2013 @ 17:07:44
  Author: andyrtr
Revision: 179744

upgpkg: xf86-video-s3virge 1.10.6-3

rebuild for new X-ABI-VIDEODRV_VERSION=14

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 16:05:33 UTC (rev 179743)
+++ PKGBUILD2013-03-09 16:07:44 UTC (rev 179744)
@@ -4,14 +4,14 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=2
+pkgrel=3
 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=13' 'resourceproto' 
'scrnsaverproto')
-conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2012-10-06 Thread andyrtr 
Date: Saturday, October 6, 2012 @ 13:01:44
  Author: andyrtr
Revision: 168169

upgpkg: xf86-video-s3virge 1.10.6-2

rebuild for new Xorg-server; depend on the server ABI; fix makedeps; remove 
from Xorg group - this driver is no more part of the official X11 release

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-06 16:59:38 UTC (rev 168168)
+++ PKGBUILD2012-10-06 17:01:44 UTC (rev 168169)
@@ -4,16 +4,15 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel=1.12.0')
-conflicts=('xorg-server1.12.0')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
 options=(!libtool)
-groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2012-07-17 Thread andyrtr 
Date: Tuesday, July 17, 2012 @ 12:36:46
  Author: andyrtr
Revision: 163656

upgpkg: xf86-video-s3virge 1.10.6-1

upstream update 1.10.6

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-17 16:35:34 UTC (rev 163655)
+++ PKGBUILD2012-07-17 16:36:46 UTC (rev 163656)
@@ -3,7 +3,7 @@
 # Contributor: Alexander Baldeck alexan...@archlinux.org
 
 pkgname=xf86-video-s3virge
-pkgver=1.10.5
+pkgver=1.10.6
 pkgrel=1
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('583b2d2982c2dd8b3c2d8f09c3cbca901c3cb844115ac99251ae6521560fac31')
+sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
 
 
 build() {

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2012-05-13 Thread andyrtr 
Date: Sunday, May 13, 2012 @ 07:52:05
  Author: andyrtr
Revision: 158927

upgpkg: xf86-video-s3virge 1.10.5-1

upstream update 1.10.5

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-13 11:37:03 UTC (rev 158926)
+++ PKGBUILD2012-05-13 11:52:05 UTC (rev 158927)
@@ -3,8 +3,8 @@
 # Contributor: Alexander Baldeck alexan...@archlinux.org
 
 pkgname=xf86-video-s3virge
-pkgver=1.10.4
-pkgrel=8
+pkgver=1.10.5
+pkgrel=1
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -14,15 +14,15 @@
 conflicts=('xorg-server1.12.0')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git-fixes.patch)
-md5sums=('6517bbbf808c700502d51acdc44662f8'
- '2dba8e574d08c71c9f748ff341358050')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+#git-fixes.patch)
+sha1sums=('ca8aa877ae118b017d5b06951bc1c3b7690ba709')
 
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git-fixes.patch
-  autoreconf -fi
+  #patch -Np1 -i ${srcdir}/git-fixes.patch
+  #autoreconf -fi
   ./configure --prefix=/usr
   make
 }

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

2012-05-13 Thread Jan de Groot 
Date: Sunday, May 13, 2012 @ 11:00:41
  Author: jgc
Revision: 158945

Remove git-fixes, included in 1.0.5

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

-+
 PKGBUILD|5 
 git-fixes.patch | 1644 --
 2 files changed, 1 insertion(+), 1648 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 158944:158945 to see the changes.

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

2012-02-11 Thread andyrtr 
Date: Saturday, February 11, 2012 @ 06:17:14
  Author: andyrtr
Revision: 149874

upgpkg: xf86-video-s3virge 1.10.4-7

Xorg 1.12 rebuild; add late git fixes, patch from FC

Added:
  xf86-video-s3virge/trunk/s3virge-1.10.4-vga.patch
Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++---
 s3virge-1.10.4-vga.patch |   76 +
 2 files changed, 88 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-11 11:13:18 UTC (rev 149873)
+++ PKGBUILD2012-02-11 11:17:14 UTC (rev 149874)
@@ -4,26 +4,33 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=6
+pkgrel=7
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
-conflicts=('xorg-server1.10.99.902')
+makedepends=('pkgconfig' 'xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-copyright.patch)
+copyright.patch
+s3virge-1.10.4-vga.patch)
 md5sums=('6517bbbf808c700502d51acdc44662f8'
- 'f91fb259e3632fb9130fcbe69ecd9d6a')
+ 'f91fb259e3632fb9130fcbe69ecd9d6a'
+ '45c7d912734c9f7dfc1f42077827cb8e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/copyright.patch
+  patch -Np1 -i ${srcdir}/s3virge-1.10.4-vga.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}

Added: s3virge-1.10.4-vga.patch
===
--- s3virge-1.10.4-vga.patch(rev 0)
+++ s3virge-1.10.4-vga.patch2012-02-11 11:17:14 UTC (rev 149874)
@@ -0,0 +1,76 @@
+From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Wed, 16 Nov 2011 19:58:29 +
+Subject: Adapt to missing PIOOffset in videoabi 12
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 2ced9ac..0f754dd 100644
+--- a/src/s3v_driver.c
 b/src/s3v_driver.c
+@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   S3VPtr ps3v;
+   IOADDRESS vgaCRIndex, vgaCRReg;
+   unsigned char val;
+-  
++  unsigned int PIOOffset = 0;
++
+   PVERB5(S3VEnableMmio\n);
+   
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
++
++#if ABI_VIDEODRV_VERSION  12
++  PIOOffset = hwp-PIOOffset;
++#endif
++  
+   /*
+* enable chipset (seen on uninitialized secondary cards)
+* might not be needed once we use the VGA softbooter
+@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+* to be set correctly already and MMIO _has_ to be
+* enabled.
+*/
+-  val = inb(hwp-PIOOffset + 0x3C3);   /*@@@EE*/
+-  outb(hwp-PIOOffset + 0x3C3, val | 0x01);
++  val = inb(PIOOffset + 0x3C3);   /*@@@EE*/
++  outb(PIOOffset + 0x3C3, val | 0x01);
+   /*
+* set CR registers to color mode
+* in mono mode extended CR registers
+* are not accessible. (EE 05/04/99)
+*/
+-  val = inb(hwp-PIOOffset + VGA_MISC_OUT_R);  /*@@@EE*/
+-  outb(hwp-PIOOffset + VGA_MISC_OUT_W, val | 0x01);
++  val = inb(PIOOffset + VGA_MISC_OUT_R);  /*@@@EE*/
++  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
+   vgaHWGetIOBase(hwp);/* Get VGA I/O base */
+-  vgaCRIndex = hwp-PIOOffset + hwp-IOBase + 4;
++  vgaCRIndex = PIOOffset + hwp-IOBase + 4;
+   vgaCRReg = vgaCRIndex + 1;
+ #if 1
+   /*
+@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   /* Enable new MMIO, if TRIO mmio is already */
+   /* enabled, then it stays enabled. */
+   outb(vgaCRReg, ps3v-EnableMmioCR53 | 0x08);
+-  outb(hwp-PIOOffset + VGA_MISC_OUT_W, val);
++  outb(PIOOffset + VGA_MISC_OUT_W, val);
+   if (S3_TRIO_3D_SERIES(ps3v-Chipset)) {
+ outb(vgaCRIndex, 0x40);
+ val = inb(vgaCRReg);
+@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
+ 
+-  vgaCRIndex = hwp-PIOOffset + hwp-IOBase + 4;
++  vgaCRIndex = hwp-IOBase + 4;
++#if ABI_VIDEODRV_VERSION  12
++  vgaCRIndex += hwp-PIOOffset;
++#endif
+   vgaCRReg = vgaCRIndex + 1;
+   outb(vgaCRIndex, 0x53);
+   /* Restore register's original state */
+--
+cgit v0.9.0.2-2-gbebe

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2011-03-17 Thread andyrtr 
Date: Thursday, March 17, 2011 @ 14:10:25
  Author: andyrtr
Revision: 115362

upgpkg: xf86-video-s3virge 1.10.4-5
rebuilt against new Xorg-server

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-17 18:09:40 UTC (rev 115361)
+++ PKGBUILD2011-03-17 18:10:25 UTC (rev 115362)
@@ -4,14 +4,14 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
 makedepends=('pkgconfig' 'xorg-server-devel')
-conflicts=('xorg-server1.9.0')
+conflicts=('xorg-server1.10.0')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2011-03-14 Thread Jan de Groot 
Date: Monday, March 14, 2011 @ 05:19:18
  Author: jgc
Revision: 114509

upgpkg: xf86-video-s3virge 1.10.4-4
Change groups

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-14 09:17:25 UTC (rev 114508)
+++ PKGBUILD2011-03-14 09:19:18 UTC (rev 114509)
@@ -1,9 +1,10 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 # Contributor: Alexander Baldeck alexan...@archlinux.org
+
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=3
+pkgrel=4
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -12,7 +13,7 @@
 makedepends=('pkgconfig' 'xorg-server-devel')
 conflicts=('xorg-server1.9.0')
 options=(!libtool)
-groups=('xorg-video-drivers')
+groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 LICENSE)
 md5sums=('6517bbbf808c700502d51acdc44662f8' 'c0a38dfcd6288eff39322f7c584b8d1e')

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2010-08-24 Thread Jan de Groot 
Date: Tuesday, August 24, 2010 @ 08:56:04
  Author: jgc
Revision: 88664

upgpkg: xf86-video-s3virge 1.10.4-3
Rebuild for xserver 1.9

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-24 12:48:10 UTC (rev 88663)
+++ PKGBUILD2010-08-24 12:56:04 UTC (rev 88664)
@@ -3,14 +3,14 @@
 # Contributor: Alexander Baldeck alexan...@archlinux.org
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=1.8.0')
-conflicts=('xorg-server1.8.0')
+makedepends=('pkgconfig' 'xorg-server-devel')
+conflicts=('xorg-server1.9.0')
 options=(!libtool)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
@@ -19,8 +19,10 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ${srcdir}/LICENSE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
 }

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2010-04-04 Thread Jan de Groot 
Date: Sunday, April 4, 2010 @ 15:17:15
  Author: jgc
Revision: 75895

upgpkg: xf86-video-s3virge 1.10.4-2
Rebuild for xorg-server-1.8

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-04 19:10:38 UTC (rev 75894)
+++ PKGBUILD2010-04-04 19:17:15 UTC (rev 75895)
@@ -1,16 +1,16 @@
 # $Id$
-# Maintainer: Alexander Baldeck alexan...@archlinux.org
-# Contributor: Jan de Groot j...@archlinux.org
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=1.6.0')
-conflicts=('xorg-server1.6.0')
+makedepends=('pkgconfig' 'xorg-server=1.8.0')
+conflicts=('xorg-server1.8.0')
 options=(!libtool)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

[arch-commits] Commit in xf86-video-s3virge/trunk (PKGBUILD)

2010-02-17 Thread Daniel Griffiths 
Date: Wednesday, February 17, 2010 @ 19:43:24
  Author: dgriffiths
Revision: 69148

Modified:
  xf86-video-s3virge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-18 00:38:05 UTC (rev 69147)
+++ PKGBUILD2010-02-18 00:43:24 UTC (rev 69148)
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Baldeck alexan...@archlinux.org
 # Contributor: Jan de Groot j...@archlinux.org
 pkgname=xf86-video-s3virge
-pkgver=1.10.3
+pkgver=1.10.4
 pkgrel=1
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 LICENSE)
-md5sums=('e59625871ac71bc2555bd784b539ef88' 'c0a38dfcd6288eff39322f7c584b8d1e')
+md5sums=('6517bbbf808c700502d51acdc44662f8' 'c0a38dfcd6288eff39322f7c584b8d1e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}