From owner-svn-ports-all@freebsd.org Mon Jan 23 22:53:55 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 A051BCBE389; Mon, 23 Jan 2017 22:53:55 +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 61ACA1F8C; Mon, 23 Jan 2017 22:53:55 +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 v0NMrs3E070237; Mon, 23 Jan 2017 22:53:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0NMrrcK070231; Mon, 23 Jan 2017 22:53:53 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701232253.v0NMrrcK070231@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:53:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432303 - in head/x11-drivers/xf86-video-s3: . 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:53:55 -0000 Author: bapt Date: Mon Jan 23 22:53:53 2017 New Revision: 432303 URL: https://svnweb.freebsd.org/changeset/ports/432303 Log: Import few patches from upstream to allow building with newer xorg Note that those drivers are barely maintained and might disappear in the futur PR: 216289 Submitted by: matthew@reztek.cz Added: head/x11-drivers/xf86-video-s3/files/patch-git_01_92d10d5 (contents, props changed) head/x11-drivers/xf86-video-s3/files/patch-git_02_ed0fbfd (contents, props changed) head/x11-drivers/xf86-video-s3/files/patch-git_03_7b45358 (contents, props changed) head/x11-drivers/xf86-video-s3/files/patch-git_04_82bd67a (contents, props changed) Modified: head/x11-drivers/xf86-video-s3/Makefile head/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c Modified: head/x11-drivers/xf86-video-s3/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3/Makefile Mon Jan 23 22:47:24 2017 (r432302) +++ head/x11-drivers/xf86-video-s3/Makefile Mon Jan 23 22:53:53 2017 (r432303) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Added: head/x11-drivers/xf86-video-s3/files/patch-git_01_92d10d5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3/files/patch-git_01_92d10d5 Mon Jan 23 22:53:53 2017 (r432303) @@ -0,0 +1,29 @@ +From 92d10d5d6882c3db6695a8fff83c88fbaaa27a33 Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" +Date: Thu, 23 Aug 2012 12:46:03 -0400 +Subject: Fix malformed list syntax. + +TP without a body shouldn't really be used for an item list. Fixing this +makes structural translation to DocBook possible. + +Signed-off-by: Eric S. Raymond + +diff --git a/man/s3.man b/man/s3.man +index 9109c2a..732e4f3 100644 +--- man/s3.man ++++ man/s3.man +@@ -50,9 +50,9 @@ driver supports PCI video cards based on the following S3 chips: + + .PP + Also driver supports the following RAMDACs: +-.TP 12 ++.IP 12 + .B IBM 524, IBM 524A, IBM 526, IBM 526DB +-.TP 12 ++.IP 12 + .B TI ViewPoint 3025 + + .SH DESCRIPTION +-- +cgit v0.10.2 + Added: head/x11-drivers/xf86-video-s3/files/patch-git_02_ed0fbfd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3/files/patch-git_02_ed0fbfd Mon Jan 23 22:53:53 2017 (r432303) @@ -0,0 +1,33 @@ +From ed0fbfd27609e897c42d7ab316481a9504746233 Mon Sep 17 00:00:00 2001 +From: Gaetan Nadon +Date: Tue, 7 Jan 2014 16:28:58 -0500 +Subject: Remove mibstore.h + +As it was done in numerous other drivers. Fixes compile error. + +Tested-by: Trevor Woerner +Signed-off-by: Gaetan Nadon + +diff --git a/src/s3_driver.c b/src/s3_driver.c +index 61242ad..85763ba 100644 +--- src/s3_driver.c ++++ src/s3_driver.c +@@ -52,7 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "inputstr.h" + #include "shadowfb.h" +@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARGS_DECL) + fbPictureInit (pScreen, 0, 0); + S3DGAInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* framebuffer manager setup */ +-- +cgit v0.10.2 + Added: head/x11-drivers/xf86-video-s3/files/patch-git_03_7b45358 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3/files/patch-git_03_7b45358 Mon Jan 23 22:53:53 2017 (r432303) @@ -0,0 +1,35 @@ +From 7b454358082fc07985878fc92b902d7534144cae Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 12 Mar 2016 10:54:22 -0800 +Subject: When checking malloc for success, it helps to use == NULL, instead of + = + +Fixes gcc 5.3 compiler warning: +s3_bios.c: In function 'find_bios_string': +s3_bios.c:49:2: warning: suggest parentheses around assignment used as + truth value [-Wparentheses] + if (bios = NULL) + ^ + +[Tested by compiling only, as I have no S3 hardware, but clearly no one + else has tested this code since commit c41a1188ce53 in 2009, as it would + be segfaulting if run.] + +Signed-off-by: Alan Coopersmith + +diff --git a/src/s3_bios.c b/src/s3_bios.c +index 323e2ce..1c7c5fe 100644 +--- src/s3_bios.c ++++ src/s3_bios.c +@@ -46,7 +46,7 @@ static unsigned char *find_bios_string(ScrnInfoPtr pScrn, int BIOSbase, + S3Ptr pS3 = S3PTR(pScrn); + + bios = malloc(BIOS_BSIZE); +- if (bios = NULL) ++ if (bios == NULL) + return NULL; + + if (!init) { +-- +cgit v0.10.2 + Added: head/x11-drivers/xf86-video-s3/files/patch-git_04_82bd67a ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-s3/files/patch-git_04_82bd67a Mon Jan 23 22:53:53 2017 (r432303) @@ -0,0 +1,92 @@ +From 82bd67a255fb45847d8a10811641bc0b203ba864 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Thu, 17 Mar 2016 10:27:51 -0700 +Subject: s3_bios.c: Simplify code for choosing between 16000 & 16000 for + RefClock + +Signed-off-by: Alan Coopersmith + +diff --git a/src/s3_bios.c b/src/s3_bios.c +index 1c7c5fe..262d40a 100644 +--- src/s3_bios.c ++++ src/s3_bios.c +@@ -29,75 +29,9 @@ + #include "config.h" + #endif + +-#include "xf86.h" +-#include "xf86_OSproc.h" +-#include "compiler.h" +- + #include "s3.h" + +- +-static unsigned char *find_bios_string(ScrnInfoPtr pScrn, int BIOSbase, +- char *match1, char *match2) +-{ +- static unsigned char *bios; +- static int init=0; +- int i, j, l1, l2, ret; +- +- S3Ptr pS3 = S3PTR(pScrn); +- +- bios = malloc(BIOS_BSIZE); +- if (bios == NULL) +- return NULL; +- +- if (!init) { +- init = 1; +-#ifndef XSERVER_LIBPCIACCESS +- if (xf86ReadDomainMemory(pS3->PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE) +- goto error; +-#else +- ret = pci_device_read_rom(pS3->PciInfo, bios); +- if (ret) { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "libpciaccess failed to read video BIOS: %s\n", +- strerror(-ret)); +- goto error; +- } +-#endif +- if ((bios[0] != 0x55) || (bios[1] != 0xaa)) +- goto error; +- } +- if (match1 == NULL) +- goto error; +- +- l1 = strlen(match1); +- if (match2 != NULL) +- l2 = strlen(match2); +- else +- l2 = 0; +- +- for (i=0; i