Index: head/x11-drivers/xf86-video-sis/Makefile =================================================================== --- head/x11-drivers/xf86-video-sis/Makefile (revision 509211) +++ head/x11-drivers/xf86-video-sis/Makefile (revision 509212) @@ -1,15 +1,16 @@ # $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 .include Index: head/x11-drivers/xf86-video-sis/distinfo =================================================================== --- head/x11-drivers/xf86-video-sis/distinfo (revision 509211) +++ head/x11-drivers/xf86-video-sis/distinfo (revision 509212) @@ -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 Index: head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c =================================================================== --- head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c (revision 509211) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c (nonexistent) @@ -1,13 +0,0 @@ -# Correct a string that should be const -# ---- src/sis_utility.c.orig 2015-08-29 23:34:25 UTC -+++ src/sis_utility.c -@@ -850,7 +850,7 @@ SISGetMergedModeDetails(ScrnInfoPtr pScr - ***********************************/ - - static void --sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, char *mystring) -+sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, const char *mystring) - { - int slen = 0; - sdcbuf->sdc_buffer[0] = 0; Property changes on: head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c =================================================================== --- head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c (revision 509211) +++ head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c (revision 509212) @@ -1,35 +1,33 @@ # 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); + strcpy((char *)current->name, SiS_PlasmaMode[l].name); current->status = MODE_OK; -@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr +@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc current = new; - sprintf(current->name, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i], - pSiS->SiS_Pr->CP_VDisplay[i]); + sprintf((char *)current->name, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i], + pSiS->SiS_Pr->CP_VDisplay[i]); current->status = MODE_OK; Index: head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c =================================================================== --- head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c (revision 509211) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c (revision 509212) @@ -1,23 +1,14 @@ # Correct a string that should be const # Cast away a warning filling a const string # --- 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; } - strcpy(newm->name, tempm->name); + strcpy((char *)newm->name, tempm->name); if(!pSiS->CRT2pScrn->monitor->Modes) pSiS->CRT2pScrn->monitor->Modes = newm; if(currentm) { currentm->next = newm;