[Midnightbsd-cvs] mports [23980] trunk/x11-drivers/xf86-video-s3virge: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 28 08:48:32 EDT 2018
Revision: 23980
http://svnweb.midnightbsd.org/mports/?rev=23980
Author: laffer1
Date: 2018-08-28 08:48:31 -0400 (Tue, 28 Aug 2018)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/x11-drivers/xf86-video-s3virge/Makefile
trunk/x11-drivers/xf86-video-s3virge/distinfo
trunk/x11-drivers/xf86-video-s3virge/pkg-descr
Added Paths:
-----------
trunk/x11-drivers/xf86-video-s3virge/files/
trunk/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c
trunk/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369
trunk/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c
Modified: trunk/x11-drivers/xf86-video-s3virge/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/Makefile 2018-08-28 12:47:51 UTC (rev 23979)
+++ trunk/x11-drivers/xf86-video-s3virge/Makefile 2018-08-28 12:48:31 UTC (rev 23980)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= xf86-video-s3virge
-PORTVERSION= 1.10.6
-PORTREVISION= 1
+PORTVERSION= 1.10.7
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
Modified: trunk/x11-drivers/xf86-video-s3virge/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/distinfo 2018-08-28 12:47:51 UTC (rev 23979)
+++ trunk/x11-drivers/xf86-video-s3virge/distinfo 2018-08-28 12:48:31 UTC (rev 23980)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
-SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da
+SIZE (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 374129
Added: trunk/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c (rev 0)
+++ trunk/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c 2018-08-28 12:48:31 UTC (rev 23980)
@@ -0,0 +1,26 @@
+From 9c8a08c9c7a0f7ec591042abd5b4a0fb50c028f1 Mon Sep 17 00:00:00 2001
+From: Nick Hudson <skrll at NetBSD.org>
+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 <wiz at NetBSD.org>
+
+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
+
Property changes on: trunk/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 (rev 0)
+++ trunk/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 2018-08-28 12:48:31 UTC (rev 23980)
@@ -0,0 +1,24 @@
+From 47f43694645f3e6347b536d5e3fb2fee56e715ab Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz at NetBSD.org>
+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
+
Property changes on: trunk/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c (rev 0)
+++ trunk/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c 2018-08-28 12:48:31 UTC (rev 23980)
@@ -0,0 +1,23 @@
+# 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
+ else
+ new->CR67 = 0x50 | 0x4; /* 16bpp */
+ }
+- else if ((pScrn->bitsPerPixel == 24) ) {
++ else if (pScrn->bitsPerPixel == 24) {
+ new->CR67 = 0x74; /* 24bpp, STREAMS */
+ /* Flag STREAMS proc. required */
+ ps3v->NeedSTREAMS = TRUE;
Property changes on: trunk/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-s3virge/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/pkg-descr 2018-08-28 12:47:51 UTC (rev 23979)
+++ trunk/x11-drivers/xf86-video-s3virge/pkg-descr 2018-08-28 12:48:31 UTC (rev 23980)
@@ -1,3 +1,3 @@
This package contains the X.Org xf86-video-s3virge driver.
-WWW: http://www.x.org
+WWW: https://www.x.org/
More information about the Midnightbsd-cvs
mailing list