[arch-commits] Commit in xf86-video-sis/repos (6 files)

[Andreas Radke]

    Date: Wednesday, November 11, 2015 @ 10:39:17
  Author: andyrtr
Revision: 250720

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-sis/repos/staging-i686/
  xf86-video-sis/repos/staging-i686/PKGBUILD
    (from rev 250719, xf86-video-sis/trunk/PKGBUILD)
  xf86-video-sis/repos/staging-i686/Xi.patch
    (from rev 250719, xf86-video-sis/trunk/Xi.patch)
  xf86-video-sis/repos/staging-x86_64/
  xf86-video-sis/repos/staging-x86_64/PKGBUILD
    (from rev 250719, xf86-video-sis/trunk/PKGBUILD)
  xf86-video-sis/repos/staging-x86_64/Xi.patch
    (from rev 250719, xf86-video-sis/trunk/Xi.patch)

-------------------------+
 staging-i686/PKGBUILD   |   38 ++++++++++++++++++++++++++++++++++++++
 staging-i686/Xi.patch   |   19 +++++++++++++++++++
 staging-x86_64/PKGBUILD |   38 ++++++++++++++++++++++++++++++++++++++
 staging-x86_64/Xi.patch |   19 +++++++++++++++++++
 4 files changed, 114 insertions(+)

Copied: xf86-video-sis/repos/staging-i686/PKGBUILD (from rev 250719, xf86-video-sis/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-11-11 09:39:17 UTC (rev 250720)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sis
+pkgver=0.10.8
+pkgrel=2
+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=20' 'xf86dgaproto')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
+optdepends=('sis-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        Xi.patch)
+sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe'
+            '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/Xi.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-sis/repos/staging-i686/Xi.patch (from rev 250719, xf86-video-sis/trunk/Xi.patch)
===================================================================
--- staging-i686/Xi.patch	                        (rev 0)
+++ staging-i686/Xi.patch	2015-11-11 09:39:17 UTC (rev 250720)
@@ -0,0 +1,19 @@
+--- xf86-video-sis-0.10.7/src/sis_driver.c	2013-03-10 13:57:50.000000000 +0100
++++ xf86-video-sis-0.10.7/src/sis_driver.c.new	2013-03-10 13:54:48.645203559 +0100
+@@ -9378,7 +9378,15 @@
+      }
+      if(doit) {
+ 	sigstate = xf86BlockSIGIO();
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
++        {
++            double dx = x, dy = y;
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy,
++                NULL, NULL);
++            x = (int)dx;
++            y = (int)dy;
++        }
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);

Copied: xf86-video-sis/repos/staging-x86_64/PKGBUILD (from rev 250719, xf86-video-sis/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-11-11 09:39:17 UTC (rev 250720)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sis
+pkgver=0.10.8
+pkgrel=2
+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=20' 'xf86dgaproto')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
+optdepends=('sis-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        Xi.patch)
+sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe'
+            '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/Xi.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-sis/repos/staging-x86_64/Xi.patch (from rev 250719, xf86-video-sis/trunk/Xi.patch)
===================================================================
--- staging-x86_64/Xi.patch	                        (rev 0)
+++ staging-x86_64/Xi.patch	2015-11-11 09:39:17 UTC (rev 250720)
@@ -0,0 +1,19 @@
+--- xf86-video-sis-0.10.7/src/sis_driver.c	2013-03-10 13:57:50.000000000 +0100
++++ xf86-video-sis-0.10.7/src/sis_driver.c.new	2013-03-10 13:54:48.645203559 +0100
+@@ -9378,7 +9378,15 @@
+      }
+      if(doit) {
+ 	sigstate = xf86BlockSIGIO();
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
++        {
++            double dx = x, dy = y;
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy,
++                NULL, NULL);
++            x = (int)dx;
++            y = (int)dy;
++        }
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);