[arch-commits] Commit in xf86-video-sis/trunk (PKGBUILD git-fixes.patch)
Date: Monday, November 21, 2016 @ 13:46:51
Author: lcarlier
Revision: 281737
upgpkg: xf86-video-sis 0.10.8-3
xorg-server-1.19 rebuild
Added:
xf86-video-sis/trunk/git-fixes.patch
Modified:
xf86-video-sis/trunk/PKGBUILD
-+
PKGBUILD| 16 ++---
git-fixes.patch | 62 ++
2 files changed, 70 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-21 13:25:47 UTC (rev 281736)
+++ PKGBUILD2016-11-21 13:46:51 UTC (rev 281737)
@@ -3,24 +3,24 @@
pkgname=xf86-video-sis
pkgver=0.10.8
-pkgrel=2
+pkgrel=3
pkgdesc="X.org SiS video driver"
arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
+url="https://xorg.freedesktop.org/";
license=('custom')
depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20' 'xf86dgaproto')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20'
'X-ABI-VIDEODRV_VERSION>=21')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23'
'X-ABI-VIDEODRV_VERSION>=24')
optdepends=('sis-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
+groups=('xorg-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-Xi.patch)
+git-fixes.patch)
sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe'
-'7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
+'b3cbb937a94c5e0ea21e05005238b247ee146ba8640eda7bfbe8b382b25dde7b')
prepare() {
cd ${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/Xi.patch
+ patch -Np1 -i ${srcdir}/git-fixes.patch
}
build() {
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2016-11-21 13:46:51 UTC (rev 281737)
@@ -0,0 +1,62 @@
+From 328073e46f9b9fcc09e637c94496c90273a0a4f6 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner
+Date: Sun, 13 Sep 2015 23:28:53 +0200
+Subject: [PATCH 1/2] Fix arguments for miSetPointerPosition.
+
+For the call for the API between versions 5 and 15.
+
+Reviewed-by: Connor Behan
+---
+ src/sis_driver.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 854cb54..8f06164 100644
+--- a/src/sis_driver.c
b/src/sis_driver.c
+@@ -9395,9 +9395,9 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
+ y = (int)dy;
+ }
+ #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
+- miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
++ miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y);
+ #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+- miPointerSetPosition(inputInfo.pointer, x, y);
++ miPointerSetPosition(inputInfo.pointer, &x, &y);
+ #else
+ UpdateCurrentTime();
+ miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
+--
+2.10.2
+
+From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 Mon Sep 17 00:00:00 2001
+From: Adam Jackson
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: [PATCH 2/2] Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson
+---
+ src/compat-api.h | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
b/src/compat-api.h
+@@ -75,8 +75,13 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+--
+2.10.2
+
[arch-commits] Commit in xf86-video-sis/trunk (PKGBUILD git-fixes.patch)
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
===
--- PKGBUILD2015-02-05 21:43:05 UTC (rev 230865)
+++ PKGBUILD2015-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
+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
+Reviewed-by: Gaetan Nadon
+
+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
+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->
[arch-commits] Commit in xf86-video-sis/trunk (PKGBUILD git-fixes.patch)
Date: Saturday, March 9, 2013 @ 18:31:35
Author: andyrtr
Revision: 179754
prepare Xorg 1.14 compatibility - needs further fixing
Added:
xf86-video-sis/trunk/git-fixes.patch
Modified:
xf86-video-sis/trunk/PKGBUILD
-+
PKGBUILD| 15 +++--
git-fixes.patch | 148 ++
2 files changed, 157 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 17:23:03 UTC (rev 179753)
+++ PKGBUILD2013-03-09 17:31:35 UTC (rev 179754)
@@ -3,25 +3,28 @@
pkgname=xf86-video-sis
pkgver=0.10.7
-pkgrel=3
+pkgrel=4
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=13' 'xf86dgaproto'
'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13'
'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto'
'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14'
'X-ABI-VIDEODRV_VERSION>=15')
optdepends=('sis-dri: DRI1 support from community repo')
-options=('!libtool')
+options=('!libtool' '!makeflags')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- 0001-Disable-UploadToScreen-and-DownloadFromScreen.patch)
+ 0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
+ git-fixes.patch)
sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
-'3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b')
+'3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b'
+'7c56b4becd4334a6bdd600ea073226bdb3e0768e4c6b81aaf98b36f1e02f5217')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i
"${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
+ patch -Np1 -i ${srcdir}/git-fixes.patch
./configure --prefix=/usr
make
}
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2013-03-09 17:31:35 UTC (rev 179754)
@@ -0,0 +1,148 @@
+From 339fb3bc032b9f35b07b90480ae82a0fd352e078 Mon Sep 17 00:00:00 2001
+From: Jan Lindemann
+Date: Thu, 30 Aug 2012 18:09:10 +
+Subject: Replace xf86UnMapVidMem with pci_device_unmap_range
+
+Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well.
+
+X.Org bug#18028
+
+Bug found by Bryan Henderson
+
+Signed-off-by: Julien Cristau
+---
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 61e8075..4c9b9cb 100644
+--- a/src/sis_driver.c
b/src/sis_driver.c
+@@ -7344,7 +7344,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ if(pSiSEnt->MapCountIOBase) {
+ pSiSEnt->MapCountIOBase--;
+ if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase,
(pSiS->mmioSize * 1024));
++#else
++ pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase,
(pSiS->mmioSize * 1024));
++#endif
+ pSiSEnt->IOBase = NULL;
+ pSiSEnt->MapCountIOBase = 0;
+ pSiSEnt->forceUnmapIOBase = FALSE;
+@@ -7355,7 +7359,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ if(pSiSEnt->MapCountIOBaseDense) {
+ pSiSEnt->MapCountIOBaseDense--;
+ if((pSiSEnt->MapCountIOBaseDense == 0) ||
(pSiSEnt->forceUnmapIOBaseDense)) {
++#ifndef XSERVER_LIBPCIACCESS
+ xf86UnMapVidMem(pScrn->scrnIndex,
(pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
++ pci_device_unmap_range(pSiS->PciInfo,
(pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ pSiSEnt->IOBaseDense = NULL;
+ pSiSEnt->MapCountIOBaseDense = 0;
+ pSiSEnt->forceUnmapIOBaseDense = FALSE;
+@@ -7366,7 +7374,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ if(pSiSEnt->MapCountFbBase) {
+ pSiSEnt->MapCountFbBase--;
+ if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase,
pSiS->FbMapSize);
++#else
++ pci_device_unmap_range(pSiS->PciInfo,
(pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#endif
+ pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
+ pSiSEnt->MapCountFbBase = 0;
+ pSiSEnt->forceUnmapFbBase = FALSE;
+@@ -7376,13 +7388,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ }
+ } else {
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase,
(pSiS->mmioSize * 1024));
++#else
+
