From owner-svn-ports-all@freebsd.org Mon Jan 23 22:57:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 582B1CBE467; Mon, 23 Jan 2017 22:57:08 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32DEC1C6; Mon, 23 Jan 2017 22:57:08 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0NMv7l6070545; Mon, 23 Jan 2017 22:57:07 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0NMv6Qm070540; Mon, 23 Jan 2017 22:57:06 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701232257.v0NMv6Qm070540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 23 Jan 2017 22:57:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432304 - in head/x11-drivers/xf86-video-s3virge: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2017 22:57:08 -0000 Author: bapt Date: Mon Jan 23 22:57:06 2017 New Revision: 432304 URL: https://svnweb.freebsd.org/changeset/ports/432304 Log: mport few patches from upstream to allow building with newer xorg Note that those drivers are barely maintained and might disappear in the futur PR: 216290 Submitted by: matthew@reztek.cz Added: head/x11-drivers/xf86-video-s3virge/files/ head/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c (contents, props changed) head/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 (contents, props changed) head/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c (contents, props changed) Modified: head/x11-drivers/xf86-video-s3virge/Makefile Modified: head/x11-drivers/xf86-video-s3virge/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3virge/Makefile Mon Jan 23 22:53:53 2017 (r432303) +++ head/x11-drivers/xf86-video-s3virge/Makefile Mon Jan 23 22:57:06 2017 (r432304) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.10.7 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Added: head/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c Mon Jan 23 22:57:06 2017 (r432304) @@ -0,0 +1,26 @@ +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 + Added: head/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 Mon Jan 23 22:57:06 2017 (r432304) @@ -0,0 +1,24 @@ +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 + Added: head/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c Mon Jan 23 22:57:06 2017 (r432304) @@ -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;