Date: Mon, 23 Jan 2017 00:49:05 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432182 - in head/x11-drivers/xf86-video-sis: . files Message-ID: <201701230049.v0N0n5IB019167@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jan 23 00:49:05 2017 New Revision: 432182 URL: https://svnweb.freebsd.org/changeset/ports/432182 Log: Update to 0.10.9 PR: 216294 Submitted by: matthew@reztek.cz Added: head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c (contents, props changed) head/x11-drivers/xf86-video-sis/files/patch-src_sis300__accel.c (contents, props changed) head/x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c (contents, props changed) head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c (contents, props changed) Modified: head/x11-drivers/xf86-video-sis/Makefile head/x11-drivers/xf86-video-sis/distinfo head/x11-drivers/xf86-video-sis/files/patch-src_init301.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 Mon Jan 23 00:45:17 2017 (r432181) +++ head/x11-drivers/xf86-video-sis/Makefile Mon Jan 23 00:49:05 2017 (r432182) @@ -1,17 +1,15 @@ # $FreeBSD$ PORTNAME= xf86-video-sis -PORTVERSION= 0.10.8 +PORTVERSION= 0.10.9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org sis display driver -CONFLICTS= xf86-video-sis-intel-[0-9]* - USE_GL= gl XORG_CAT= driver -USE_XORG= xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto +USE_XORG= xf86dgaproto .include <bsd.port.mk> Modified: head/x11-drivers/xf86-video-sis/distinfo ============================================================================== --- head/x11-drivers/xf86-video-sis/distinfo Mon Jan 23 00:45:17 2017 (r432181) +++ head/x11-drivers/xf86-video-sis/distinfo Mon Jan 23 00:49:05 2017 (r432182) @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-sis-0.10.8.tar.bz2) = c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe -SIZE (xorg/driver/xf86-video-sis-0.10.8.tar.bz2) = 734785 +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 Modified: head/x11-drivers/xf86-video-sis/files/patch-src_init301.c ============================================================================== --- head/x11-drivers/xf86-video-sis/files/patch-src_init301.c Mon Jan 23 00:45:17 2017 (r432181) +++ head/x11-drivers/xf86-video-sis/files/patch-src_init301.c Mon Jan 23 00:49:05 2017 (r432182) @@ -1,5 +1,8 @@ ---- src/init301.c.orig 2015-11-19 15:53:05.412011000 +0100 -+++ src/init301.c 2015-11-19 15:53:24.734403000 +0100 +# Fix an uninitialized variable +# Remove some dead code to eliminate a style warning +# +--- src/init301.c.orig 2010-03-07 19:36:10 UTC ++++ src/init301.c @@ -446,7 +446,7 @@ SiS_CR36BIOSWord23d(struct SiS_Private * void SiS_DDC2Delay(struct SiS_Private *SiS_Pr, unsigned int delaytime) @@ -9,3 +12,14 @@ for(i = 0; i < delaytime; i++) { j += SiS_GetReg(SiS_Pr->SiS_P3c4,0x05); +@@ -534,9 +534,7 @@ SiS_PanelDelay(struct SiS_Private *SiS_P + SiS_DDC2Delay(SiS_Pr, 0x4000); + } + +- } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* || +- (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) || +- (SiS_Pr->SiS_CustomT == CUT_CLEVO1400) */ ) { /* 315 series, LVDS; Special */ ++ } else if(SiS_Pr->SiS_IF_DEF_LVDS == 1) { /* 315 series, LVDS; Special */ + + if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) { + PanelID = SiS_GetReg(SiS_Pr->SiS_P3d4,0x36); Added: head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-sis/files/patch-src_initextx.c Mon Jan 23 00:49:05 2017 (r432182) @@ -0,0 +1,35 @@ +# Cast away warnings filling const strings +# +--- src/initextx.c.orig 2015-08-29 23:34:25 UTC ++++ src/initextx.c +@@ -252,8 +252,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr + + 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); + + current->status = MODE_OK; + +@@ -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 + + 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; + Added: head/x11-drivers/xf86-video-sis/files/patch-src_sis300__accel.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis300__accel.c Mon Jan 23 00:49:05 2017 (r432182) @@ -0,0 +1,85 @@ +# Fix warning about shift of signed value +# +--- src/sis300_accel.c.orig 2015-08-29 23:34:25 UTC ++++ src/sis300_accel.c +@@ -100,7 +100,7 @@ SiSSetupForScreenToScreenCopy(ScrnInfoPt + + SiSSetupDSTColorDepth(pSiS->DstColor); + SiSSetupSRCPitch(pSiS->scrnOffset) +- SiSSetupDSTRect(pSiS->scrnOffset, -1) ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U) + + if(trans_color != -1) { + SiSSetupROP(0x0A) +@@ -170,7 +170,7 @@ SiSSetupForSolidFill(ScrnInfoPtr pScrn, + } + } + SiSSetupPATFG(color) +- SiSSetupDSTRect(pSiS->scrnOffset, -1) ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U) + SiSSetupDSTColorDepth(pSiS->DstColor); + SiSSetupROP(SiSGetPatternROP(rop)) + /* SiSSetupCMDFlag(PATFG) - is zero */ +@@ -342,7 +342,7 @@ SiSSetupForSolidLine(ScrnInfoPtr pScrn, + + SiSSetupLineCount(1) + SiSSetupPATFG(color) +- SiSSetupDSTRect(pSiS->scrnOffset, -1) ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U) + SiSSetupDSTColorDepth(pSiS->DstColor); + SiSSetupROP(SiSGetPatternROP(rop)) + SiSSetupCMDFlag(PATFG | LINE) +@@ -419,7 +419,7 @@ SiSSetupForDashedLine(ScrnInfoPtr pScrn, + SISPtr pSiS = SISPTR(pScrn); + + SiSSetupLineCount(1) +- SiSSetupDSTRect(pSiS->scrnOffset, -1) ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U) + SiSSetupDSTColorDepth(pSiS->DstColor); + SiSSetupStyleLow(*pattern) + SiSSetupStyleHigh(*(pattern+4)) +@@ -475,7 +475,7 @@ SiSSetupForMonoPatternFill(ScrnInfoPtr p + { + SISPtr pSiS = SISPTR(pScrn); + +- SiSSetupDSTRect(pSiS->scrnOffset, -1) ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U) + SiSSetupDSTColorDepth(pSiS->DstColor); + SiSSetupMONOPAT(patx,paty) + SiSSetupPATFG(fg) +@@ -593,7 +593,7 @@ SiSSetupForScreenToScreenColorExpand(Scr + SISPtr pSiS = SISPTR(pScrn); + + SiSSetupDSTColorDepth(pSiS->DstColor) +- SiSSetupDSTRect(pSiS->scrnOffset, -1) ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U) + SiSSetupROP(SiSGetCopyROP(rop)) + SiSSetupSRCFG(fg) + /* SiSSetupSRCXY(0,0) */ +@@ -762,7 +762,7 @@ SiSSetupForScanlineCPUToScreenColorExpan + SiSSetupSRCXY(0,0); + SiSSetupROP(SiSGetCopyROP(rop)); + SiSSetupSRCFG(fg); +- SiSSetupDSTRect(pSiS->scrnOffset, -1); ++ SiSSetupDSTRect(pSiS->scrnOffset, -1U); + SiSSetupDSTColorDepth(pSiS->DstColor); + if(bg == -1) { + SiSSetupCMDFlag(TRANSPARENT | +@@ -925,7 +925,7 @@ SiSPrepareSolid(PixmapPtr pPixmap, int a + dstbase = (CARD32)exaGetPixmapOffset(pPixmap) + HEADOFFSET; + + SiSSetupPATFG(fg) +- SiSSetupDSTRect(exaGetPixmapPitch(pPixmap), -1) ++ SiSSetupDSTRect(exaGetPixmapPitch(pPixmap), -1U) + SiSSetupDSTColorDepth(dstcol[pPixmap->drawable.bitsPerPixel >> 4]); + SiSSetupROP(SiSGetPatternROP(alu)) + SiSSetupDSTBase(dstbase) +@@ -988,7 +988,7 @@ SiSPrepareCopy(PixmapPtr pSrcPixmap, Pix + + SiSSetupDSTColorDepth(dstcol[pDstPixmap->drawable.bitsPerPixel >> 4]); + SiSSetupSRCPitch(exaGetPixmapPitch(pSrcPixmap)) +- SiSSetupDSTRect(exaGetPixmapPitch(pDstPixmap), -1) ++ SiSSetupDSTRect(exaGetPixmapPitch(pDstPixmap), -1U) + + SiSSetupROP(SiSGetCopyROP(alu)) + Added: head/x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c Mon Jan 23 00:49:05 2017 (r432182) @@ -0,0 +1,13 @@ +# Correct type in a format string +# +--- src/sis_dri.c.orig 2015-08-29 23:34:25 UTC ++++ src/sis_dri.c +@@ -454,7 +454,7 @@ SISDRIScreenInit(ScreenPtr pScreen) + return FALSE; + } + +- xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] MMIO registers mapped to 0x%0x\n", ++ xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] MMIO registers mapped to 0x%0lx\n", + pSISDRI->regs.handle); + + /* AGP */ 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 Mon Jan 23 00:45:17 2017 (r432181) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c Mon Jan 23 00:49:05 2017 (r432182) @@ -1,11 +1,23 @@ ---- src/sis_driver.c.orig 2015-09-23 09:54:07.196489000 +0200 -+++ src/sis_driver.c 2015-09-23 09:56:45.740035000 +0200 -@@ -9390,7 +9390,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 - { - double dx = x, dy = y; -- miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); -+ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL); - x = (int)dx; - y = (int)dy; - } +# 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; Added: head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c Mon Jan 23 00:49:05 2017 (r432182) @@ -0,0 +1,13 @@ +# 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701230049.v0N0n5IB019167>