Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Aug 2019 14:45:06 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r509212 - in head/x11-drivers/xf86-video-sis: . files
Message-ID:  <201908181445.x7IEj6lA018157@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Sun Aug 18 14:45:06 2019
New Revision: 509212
URL: https://svnweb.freebsd.org/changeset/ports/509212

Log:
  x11-drivers/xf86-video-sis: Update to 0.11.0
  
  Update x11-drivers/xf86-video-sis to 0.11.0
  Remove dependency on mesa and libGL, it is not used
  Add license information
  This is a maintenance release
  This has not been tested with actual hardware.
  
  Changelog:
  https://lists.x.org/archives/xorg-announce/2019-July/003016.html
  
  Obtained from:	FreeBSD Graphics Team development repo
  		https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xorglibs

Deleted:
  head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c
Modified:
  head/x11-drivers/xf86-video-sis/Makefile
  head/x11-drivers/xf86-video-sis/distinfo
  head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c
  head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c

Modified: head/x11-drivers/xf86-video-sis/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-sis/Makefile	Sun Aug 18 14:41:20 2019	(r509211)
+++ head/x11-drivers/xf86-video-sis/Makefile	Sun Aug 18 14:45:06 2019	(r509212)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.9
-PORTREVISION=	3
+PORTVERSION=	0.11.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org sis display driver
 
-USE_GL=		gl
+LICENSE=	BSD3CLAUSE MIT
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 XORG_CAT=	driver
 

Modified: head/x11-drivers/xf86-video-sis/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-sis/distinfo	Sun Aug 18 14:41:20 2019	(r509211)
+++ head/x11-drivers/xf86-video-sis/distinfo	Sun Aug 18 14:45:06 2019	(r509212)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484715280
-SHA256 (xorg/driver/xf86-video-sis-0.10.9.tar.bz2) = 5226b7407c601afa32d6cbf155f9182da95d92cdc89c1f83471e1927e552c10d
-SIZE (xorg/driver/xf86-video-sis-0.10.9.tar.bz2) = 736272
+TIMESTAMP = 1566064121
+SHA256 (xorg/driver/xf86-video-sis-0.11.0.tar.bz2) = 2177901a21a980552f8be429f063388e4c5d5f2e24e8b0ce72d65bd93ccc3b6b
+SIZE (xorg/driver/xf86-video-sis-0.11.0.tar.bz2) = 735940

Modified: head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c
==============================================================================
--- head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c	Sun Aug 18 14:41:20 2019	(r509211)
+++ head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c	Sun Aug 18 14:45:06 2019	(r509212)
@@ -1,20 +1,18 @@
 # Cast away warnings filling const strings
 #
---- src/initextx.c.orig	2015-08-29 23:34:25 UTC
+--- src/initextx.c.orig	2019-07-26 23:38:52 UTC
 +++ src/initextx.c
-@@ -252,8 +252,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+@@ -252,7 +252,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc
  
        current = new;
  
--      sprintf(current->name, "%dx%d", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
--				      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
-+      sprintf((char *)current->name, "%dx%d", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
-+					      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
+-      sprintf(current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
++      sprintf((char *)current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
+ 				      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
  
        current->status = MODE_OK;
+@@ -402,7 +402,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc
  
-@@ -402,7 +402,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
- 
  		  pSiS->AddedPlasmaModes = TRUE;
  
 -		  strcpy(current->name, SiS_PlasmaMode[l].name);
@@ -22,7 +20,7 @@
  
  		  current->status = MODE_OK;
  
-@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc
  
  	    current = new;
  

Modified: head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
==============================================================================
--- head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c	Sun Aug 18 14:41:20 2019	(r509211)
+++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c	Sun Aug 18 14:45:06 2019	(r509212)
@@ -3,15 +3,6 @@
 #
 --- src/sis_driver.c.orig	2017-01-17 22:45:12 UTC
 +++ src/sis_driver.c
-@@ -1305,7 +1305,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, Disp
-  * (Code base taken from mga driver)
-  */
- static DisplayModePtr
--SiSGetModeFromName(char* str, DisplayModePtr i)
-+SiSGetModeFromName(const char* str, DisplayModePtr i)
- {
-     DisplayModePtr c = i;
-     if(!i) return NULL;
 @@ -6065,7 +6065,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
  	        free(newm);
  		break;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908181445.x7IEj6lA018157>