Date: Thursday, February 5, 2015 @ 22:47:55 Author: lcarlier Revision: 230866
upgpkg: xf86-video-sis 0.10.7-7 xorg-server 1.17 rebuild Modified: xf86-video-sis/trunk/PKGBUILD xf86-video-sis/trunk/git-fixes.patch -----------------+ PKGBUILD | 8 - git-fixes.patch | 241 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-05 21:43:05 UTC (rev 230865) +++ PKGBUILD 2015-02-05 21:47:55 UTC (rev 230866) @@ -3,14 +3,14 @@ pkgname=xf86-video-sis pkgver=0.10.7 -pkgrel=6 +pkgrel=7 pkgdesc="X.org SiS video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'xf86dgaproto') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') optdepends=('sis-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 @@ -19,7 +19,7 @@ Xi.patch) sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0' '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b' - '7c56b4becd4334a6bdd600ea073226bdb3e0768e4c6b81aaf98b36f1e02f5217' + 'a340653dbe1bbd0fff1b881b1245793149d46a397baf51264ce9a42e1a254eab' '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672') prepare() { Modified: git-fixes.patch =================================================================== --- git-fixes.patch 2015-02-05 21:43:05 UTC (rev 230865) +++ git-fixes.patch 2015-02-05 21:47:55 UTC (rev 230866) @@ -146,3 +146,244 @@ */ -- cgit v0.9.0.2-2-gbebe +From 0a4336efaafac4c34d4287b5df586bbb418f7f76 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat, 26 Oct 2013 14:27:17 -0700 +Subject: Fix HDisplay/VDisplay typos + +Found by gcc -Wlogicalops: + +sis_driver.c: In function 'SiS_CheckModeCRT2': +sis_driver.c:13754:5: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] +sis_driver.c:13755:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] +sis_driver.c:13756:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] +sis_driver.c:13758:5: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] +sis_driver.c:13759:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] + +Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> +Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index cefe503..80b8d51 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -13751,12 +13751,12 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, DisplayModePtr mode, unsigned int VBFlags, + if( ((mode->HDisplay <= pSiS->LCDwidth) && + (mode->VDisplay <= pSiS->LCDheight)) || + ((pSiS->SiS_Pr->SiS_CustomT == CUT_PANEL848) && +- (((mode->HDisplay == 1360) && (mode->HDisplay == 768)) || +- ((mode->HDisplay == 1024) && (mode->HDisplay == 768)) || +- ((mode->HDisplay == 800) && (mode->HDisplay == 600)))) || ++ (((mode->HDisplay == 1360) && (mode->VDisplay == 768)) || ++ ((mode->HDisplay == 1024) && (mode->VDisplay == 768)) || ++ ((mode->HDisplay == 800) && (mode->VDisplay == 600)))) || + ((pSiS->SiS_Pr->SiS_CustomT == CUT_PANEL856) && +- (((mode->HDisplay == 1024) && (mode->HDisplay == 768)) || +- ((mode->HDisplay == 800) && (mode->HDisplay == 600)))) ) { ++ (((mode->HDisplay == 1024) && (mode->VDisplay == 768)) || ++ ((mode->HDisplay == 800) && (mode->VDisplay == 600)))) ) { + + ModeIndex = SiS_GetModeID_LCD(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, i, + pSiS->FSTN, pSiS->SiS_Pr->SiS_CustomT, pSiS->LCDwidth, pSiS->LCDheight, +-- +cgit v0.10.2 +From 49796d6a3274adc0250ee07faa6bc63e41c98740 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri, 22 Nov 2013 08:21:18 +1000 +Subject: Fix format-security warnings + +sis_driver.c: In function 'SISErrorLog': +sis_driver.c:432:5: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); + ^ +sis_driver.c:439:5: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); + ^ +sis_driver.c: In function 'SiSUpdateXineramaScreenInfo': +sis_driver.c:1917:4: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); + ^ +sis_driver.c:1924:8: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); + +Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> +Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 80b8d51..bd9c4e1 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -429,14 +429,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...) + static const char *str = "**************************************************\n"; + + va_start(ap, format); +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + " ERROR:\n"); + xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); + va_end(ap); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + " END OF MESSAGE\n"); +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); + } + + static void +@@ -1914,14 +1914,14 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1) + if(infochanged && !usenonrect) { + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, + "Virtual screen size does not match maximum display modes...\n"); +- xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); ++ xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine); + + } + } else if(infochanged && usenonrect) { + usenonrect = FALSE; + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, + "Only clone modes available for this virtual screen size...\n"); +- xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); ++ xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine); + } + + if(pSiS->maxCRT1_X1) { /* Means we have at least one non-clone mode */ +-- +cgit v0.10.2 +From d0550de19cacab3e591641ba358a72fbc798b231 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airl...@redhat.com> +Date: Mon, 22 Sep 2014 12:45:02 +1000 +Subject: sis: fix build against latest xserver + + +diff --git a/src/sis.h b/src/sis.h +index 20e6134..385b784 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -1004,7 +1004,9 @@ typedef struct { + ScrnInfoPtr pScrn; + pciVideoPtr PciInfo; + int PciBus, PciDevice, PciFunc; ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + EntityInfoPtr pEnt; + int Chipset; + unsigned char ChipType; +diff --git a/src/vstruct.h b/src/vstruct.h +index 88f7eb6..5d7a98d 100644 +--- a/src/vstruct.h ++++ b/src/vstruct.h +@@ -237,8 +237,10 @@ struct SiS_Private + unsigned char ChipType; + unsigned char ChipRevision; + #ifdef SIS_XORG_XF86 ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; + #endif ++#endif + #ifdef SIS_LINUX_KERNEL + void *ivideo; + #endif +-- +cgit v0.10.2 +From d2597696ba81862d80ec17b978d8370c58572e27 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airl...@redhat.com> +Date: Wed, 12 Nov 2014 08:04:21 +1000 +Subject: sis: more build fixes against master X server. + + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index bd9c4e1..125eee7 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -3279,9 +3279,11 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo); /*SIS_PCI_DEVICE(pSiS->PciInfo);*/ + pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo); /*SIS_PCI_FUNC(pSiS->PciInfo);*/ + ++#ifndef XSERVER_LIBPCIACCESS + pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo), + PCI_DEV_DEV(pSiS->PciInfo), + PCI_DEV_FUNC(pSiS->PciInfo)); ++#endif + + #ifdef SIS_NEED_MAP_IOP + /********************************************/ +@@ -3905,7 +3907,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + if(pSiSEnt) pSiSEnt->SiS_Pr = pSiS->SiS_Pr; + #endif + memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private)); ++#ifndef XSERVER_LIBPCIACCESS + pSiS->SiS_Pr->PciTag = pSiS->PciTag; ++#endif + pSiS->SiS_Pr->ChipType = pSiS->ChipType; + pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev; + pSiS->SiS_Pr->SiS_Backup70xx = 0xff; +@@ -7134,7 +7138,9 @@ static Bool + SISMapMem(ScrnInfoPtr pScrn) + { + SISPtr pSiS = SISPTR(pScrn); ++#ifndef XSERVER_LIBPCIACCESS + int mmioFlags = VIDMEM_MMIO; ++#endif + #ifdef SISDUALHEAD + SISEntPtr pSiSEnt = pSiS->entityPrivate; + #endif +@@ -7144,9 +7150,11 @@ SISMapMem(ScrnInfoPtr pScrn) + * (For Alpha, we need to map SPARSE memory, since we need + * byte/short access.) + */ ++#ifndef XSERVER_LIBPCIACCESS + #if defined(__alpha__) + mmioFlags |= VIDMEM_SPARSE; + #endif ++#endif + + #ifdef SISDUALHEAD + if(pSiS->DualHeadMode) { +@@ -14017,6 +14025,7 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort offset, UChar value) + break; + } + ++#ifndef XSERVER_LIBPCIACCESS + #ifdef SIS_USE_BIOS_SCRATCH + if(SISPTR(pScrn)->Primary) { + base = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO, 0, 0x2000); +@@ -14035,6 +14044,7 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort offset, UChar value) + xf86UnMapVidMem(pScrn->scrnIndex, base, 0x2000); + } + #endif ++#endif + return ret; + } + +-- +cgit v0.10.2 +From 0f50f8c3db2b9f1c9d4ecab8ad278e9db6418a92 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airl...@redhat.com> +Date: Wed, 12 Nov 2014 09:27:33 +1000 +Subject: sis: force build, who uses this crazy code anyways + + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 125eee7..854cb54 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -9385,6 +9385,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + } + } + if(doit) { ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 /* screw it */ + sigstate = xf86BlockSIGIO(); + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 + { +@@ -9402,6 +9403,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + miPointerAbsoluteCursor(x, y, currentTime.milliseconds); + #endif + xf86UnblockSIGIO(sigstate); ++#endif + return; + } + } +-- +cgit v0.10.2 +
