main/xf86-video-s3virge: upgrade to 1.10.7

2 files changed, 5 insertions, 100 deletions

diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
index 07d201b44..9451bf8fa 100644
--- a/main/xf86-video-s3virge/APKBUILD
+++ b/main/xf86-video-s3virge/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3virge
-pkgver=1.10.6
-pkgrel=5
+pkgver=1.10.7
+pkgrel=0
 pkgdesc="S3 ViRGE video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -12,12 +12,10 @@ makedepends="xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
 source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	git-fixes.patch
 	"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -40,9 +38,6 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="70956a12113b72e4f6d770e32b2ac4b9  xf86-video-s3virge-1.10.6.tar.bz2
-07b8f81c373dbe3545268f0b8457db4a  git-fixes.patch"
-sha256sums="85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e  xf86-video-s3virge-1.10.6.tar.bz2
-8215be38309ad51d262c72775f8d0aff02c67a351e4ed17395faa6fb42dbf518  git-fixes.patch"
-sha512sums="3de4806c42ec07767459e5ea703fd6106e4c8a90f67636f2d58d3a5745ae4beeafb51e1c8e09a74694dc246db4c7dd1c119c91d92b101be4db7b9c59d7f9e0ab  xf86-video-s3virge-1.10.6.tar.bz2
-fa2917a000e7d6c39fadb804cc5f617d57b5d1b3ca46eefe4415d214fada025630b9674df3a3b6fabfebb3370e2c2cd8eb46048483fc3d4964852122a3105697  git-fixes.patch"
+md5sums="9d4dd8060544d95a1ce7d0ce0853cbe6  xf86-video-s3virge-1.10.7.tar.bz2"
+sha256sums="5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da  xf86-video-s3virge-1.10.7.tar.bz2"
+sha512sums="bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57  xf86-video-s3virge-1.10.7.tar.bz2"
diff --git a/main/xf86-video-s3virge/git-fixes.patch b/main/xf86-video-s3virge/git-fixes.patch
deleted file mode 100644
index f093d1cc9..000000000
--- a/main/xf86-video-s3virge/git-fixes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d74238ca2faddb2e1c0b48333664688a5079a856 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@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@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@redhat.com>
-Date: Tue, 30 Sep 2014 10:26:17 -0400
-Subject: Fix build against xserver 1.17
-
-Signed-off-by: Adam Jackson <ajax@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@redhat.com>
-Date: Tue, 30 Sep 2014 10:27:13 -0400
-Subject: Remove call to miInitializeBackingStore
-
-Signed-off-by: Adam Jackson <ajax@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
-