diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index ce677eff1939..c857bf3cc110 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-s3virge -PORTVERSION= 1.10.7 -PORTREVISION= 4 +PORTVERSION= 1.11.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo index 1f9a71dec061..339040f3f63c 100644 --- a/x11-drivers/xf86-video-s3virge/distinfo +++ b/x11-drivers/xf86-video-s3virge/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da -SIZE (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 374129 +TIMESTAMP = 1550524793 +SHA256 (xorg/driver/xf86-video-s3virge-1.11.0.tar.bz2) = 04c9ddff2d86f8ffea348697843db02f033075089f89d051f000b87e74d9a119 +SIZE (xorg/driver/xf86-video-s3virge-1.11.0.tar.bz2) = 380321 diff --git a/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c b/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c deleted file mode 100644 index 446da1f4fb25..000000000000 --- a/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c +++ /dev/null @@ -1,26 +0,0 @@ -From 9c8a08c9c7a0f7ec591042abd5b4a0fb50c028f1 Mon Sep 17 00:00:00 2001 -From: Nick Hudson -Date: Mon, 28 Sep 2015 22:49:21 +0200 -Subject: Increase BIOS_BSIZE. - -libpciaccess expects a much bigger buffer when reading ROM. -Bump it to the (normal) IO space size. - -Signed-off-by: Thomas Klausner - -diff --git a/src/s3v_driver.c b/src/s3v_driver.c -index d519dc8..e5dd2e4 100644 ---- src/s3v_driver.c -+++ src/s3v_driver.c -@@ -316,7 +316,7 @@ s3virgeSetup(pointer module, pointer opts, int *errmaj, int *errmin) - - static unsigned char *find_bios_string(S3VPtr ps3v, int BIOSbase, char *match1, char *match2) - { --#define BIOS_BSIZE 1024 -+#define BIOS_BSIZE 0x10000 - #define BIOS_BASE 0xc0000 - - static unsigned char bios[BIOS_BSIZE]; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 b/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 deleted file mode 100644 index 1ad3f233bb85..000000000000 --- a/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 +++ /dev/null @@ -1,24 +0,0 @@ -From 47f43694645f3e6347b536d5e3fb2fee56e715ab Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Mon, 28 Sep 2015 22:49:22 +0200 -Subject: Add cast to remove a warning on 32-bit machines. - -PCI_REGION_BASE returns a 64-bit value, which needs to be converted -down to 32-bit before it can be put into a 32-bit pointer. - -diff --git a/src/s3v_dga.c b/src/s3v_dga.c -index 0e603cf..0ab374d 100644 ---- src/s3v_dga.c -+++ src/s3v_dga.c -@@ -337,7 +337,7 @@ S3V_OpenFramebuffer( - S3VPtr ps3v = S3VPTR(pScrn); - - *name = NULL; /* no special device */ -- *mem = (unsigned char*)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM); -+ *mem = (unsigned char*)(uintptr_t)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM); - *size = ps3v->videoRambytes; - *offset = 0; - *flags = DGA_NEED_ROOT; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c b/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c index aa2fb098be90..d601d716cf96 100644 --- a/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c +++ b/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c @@ -1,18 +1,8 @@ -# Correct a string that should be const # Remove extra parenthesis to clear a style warning # ---- src/s3v_driver.c.orig 2016-11-25 14:37:44 UTC -+++ src/s3v_driver.c -@@ -480,7 +480,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags) - ClockRangePtr clockRanges; - char *mod = NULL; - const char *reqSym = NULL; -- char *s; -+ const char *s; - - unsigned char config1, config2, m, n, n1, n2, cr66 = 0; - int mclk; -@@ -2850,7 +2850,7 @@ S3VModeInit(ScrnInfoPtr pScrn, DisplayMo +--- src/s3v_driver.c.orig 2019-02-19 03:28:50.953742000 +0000 ++++ src/s3v_driver.c 2019-02-19 03:29:09.119821000 +0000 +@@ -2848,7 +2848,7 @@ else new->CR67 = 0x50 | 0x4; /* 16bpp */ }