diff options
author | wiz <wiz@pkgsrc.org> | 2015-09-29 08:19:22 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-09-29 08:19:22 +0000 |
commit | ad51d119ad3399c95d880943505162eb3356aca1 (patch) | |
tree | ce94de04e6d0466ed50e712d40238902c453c51a /x11 | |
parent | 52bfcddeeca50d2fe69127cac22a411370228e03 (diff) | |
download | pkgsrc-ad51d119ad3399c95d880943505162eb3356aca1.tar.gz |
Update to 1.10.7:
Adam Jackson (3):
Use own thunk function instead of vgaHW*Weak
Fix build against xserver 1.17
Remove call to miInitializeBackingStore
Matt Turner (1):
xf86-video-s3virge 0.10.7
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xf86-video-s3virge/Makefile | 6 | ||||
-rw-r--r-- | x11/xf86-video-s3virge/distinfo | 9 | ||||
-rw-r--r-- | x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c | 75 |
3 files changed, 6 insertions, 84 deletions
diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile index b05d86c5daa..3d926e34765 100644 --- a/x11/xf86-video-s3virge/Makefile +++ b/x11/xf86-video-s3virge/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2015/04/25 14:25:23 tnn Exp $ -# +# $NetBSD: Makefile,v 1.17 2015/09/29 08:19:22 wiz Exp $ -DISTNAME= xf86-video-s3virge-1.10.6 -PKGREVISION= 3 +DISTNAME= xf86-video-s3virge-1.10.7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-video-s3virge/distinfo b/x11/xf86-video-s3virge/distinfo index 08627f6b80d..4ede228514e 100644 --- a/x11/xf86-video-s3virge/distinfo +++ b/x11/xf86-video-s3virge/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2015/04/02 22:16:47 tnn Exp $ +$NetBSD: distinfo,v 1.8 2015/09/29 08:19:22 wiz Exp $ -SHA1 (xf86-video-s3virge-1.10.6.tar.bz2) = c99ee4bd6253890a5be3cf246d535be4579c1b80 -RMD160 (xf86-video-s3virge-1.10.6.tar.bz2) = c0ca1f685c84182290391b2bff9a7634d54c311c -Size (xf86-video-s3virge-1.10.6.tar.bz2) = 349790 bytes -SHA1 (patch-src_s3v__driver.c) = b19bd7d299c2fe0f672d8000e581fde3c715ace9 +SHA1 (xf86-video-s3virge-1.10.7.tar.bz2) = d670f02ec4372e4a4ed299d7f29b5bd6e2fa9e83 +RMD160 (xf86-video-s3virge-1.10.7.tar.bz2) = c2adf8f566d61724a57b7b807cfa9602c2a221eb +Size (xf86-video-s3virge-1.10.7.tar.bz2) = 374129 bytes diff --git a/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c b/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c deleted file mode 100644 index 807d509e30a..00000000000 --- a/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-src_s3v__driver.c,v 1.1 2015/04/02 22:16:48 tnn Exp $ - -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> - -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> - -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> - ---- src/s3v_driver.c.orig 2015-04-02 19:28:57.000000000 +0000 -+++ 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 */ -@@ -3515,7 +3514,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - { - vgaHWPtr hwp; - S3VPtr ps3v; -- IOADDRESS vgaCRIndex, vgaCRReg; -+ unsigned int vgaCRIndex, vgaCRReg; - unsigned char val; - unsigned int PIOOffset = 0; - -@@ -3584,7 +3583,7 @@ S3VDisableMmio(ScrnInfoPtr pScrn) - { - vgaHWPtr hwp; - S3VPtr ps3v; -- IOADDRESS vgaCRIndex, vgaCRReg; -+ unsigned int vgaCRIndex, vgaCRReg; - - PVERB5(" S3VDisableMmio\n"); - -@@ -3760,6 +3759,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 +3778,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); |