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

Laurent Carlier lcarlier at archlinux.org
Mon Nov 21 13:46:59 UTC 2016


    Date: Monday, November 21, 2016 @ 13:46:59
  Author: lcarlier
Revision: 281738

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 281737, xf86-video-sis/trunk/PKGBUILD)
  xf86-video-sis/repos/staging-i686/Xi.patch
    (from rev 281737, xf86-video-sis/trunk/Xi.patch)
  xf86-video-sis/repos/staging-i686/git-fixes.patch
    (from rev 281737, xf86-video-sis/trunk/git-fixes.patch)
  xf86-video-sis/repos/staging-x86_64/
  xf86-video-sis/repos/staging-x86_64/PKGBUILD
    (from rev 281737, xf86-video-sis/trunk/PKGBUILD)
  xf86-video-sis/repos/staging-x86_64/Xi.patch
    (from rev 281737, xf86-video-sis/trunk/Xi.patch)
  xf86-video-sis/repos/staging-x86_64/git-fixes.patch
    (from rev 281737, xf86-video-sis/trunk/git-fixes.patch)

--------------------------------+
 staging-i686/PKGBUILD          |   38 +++++++++++++++++++++++
 staging-i686/Xi.patch          |   19 +++++++++++
 staging-i686/git-fixes.patch   |   62 +++++++++++++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD        |   38 +++++++++++++++++++++++
 staging-x86_64/Xi.patch        |   19 +++++++++++
 staging-x86_64/git-fixes.patch |   62 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 238 insertions(+)

Copied: xf86-video-sis/repos/staging-i686/PKGBUILD (from rev 281737, xf86-video-sis/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2016-11-21 13:46:59 UTC (rev 281738)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sis
+pkgver=0.10.8
+pkgrel=3
+pkgdesc="X.org SiS video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+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')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe'
+            'b3cbb937a94c5e0ea21e05005238b247ee146ba8640eda7bfbe8b382b25dde7b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.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 281737, xf86-video-sis/trunk/Xi.patch)
===================================================================
--- staging-i686/Xi.patch	                        (rev 0)
+++ staging-i686/Xi.patch	2016-11-21 13:46:59 UTC (rev 281738)
@@ -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-i686/git-fixes.patch (from rev 281737, xf86-video-sis/trunk/git-fixes.patch)
===================================================================
--- staging-i686/git-fixes.patch	                        (rev 0)
+++ staging-i686/git-fixes.patch	2016-11-21 13:46:59 UTC (rev 281738)
@@ -0,0 +1,62 @@
+From 328073e46f9b9fcc09e637c94496c90273a0a4f6 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz at NetBSD.org>
+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 <connor.behan at gmail.com>
+---
+ 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 <ajax at redhat.com>
+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 <ajax at redhat.com>
+---
+ 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
+

Copied: xf86-video-sis/repos/staging-x86_64/PKGBUILD (from rev 281737, xf86-video-sis/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2016-11-21 13:46:59 UTC (rev 281738)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sis
+pkgver=0.10.8
+pkgrel=3
+pkgdesc="X.org SiS video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+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')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe'
+            'b3cbb937a94c5e0ea21e05005238b247ee146ba8640eda7bfbe8b382b25dde7b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.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 281737, xf86-video-sis/trunk/Xi.patch)
===================================================================
--- staging-x86_64/Xi.patch	                        (rev 0)
+++ staging-x86_64/Xi.patch	2016-11-21 13:46:59 UTC (rev 281738)
@@ -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/git-fixes.patch (from rev 281737, xf86-video-sis/trunk/git-fixes.patch)
===================================================================
--- staging-x86_64/git-fixes.patch	                        (rev 0)
+++ staging-x86_64/git-fixes.patch	2016-11-21 13:46:59 UTC (rev 281738)
@@ -0,0 +1,62 @@
+From 328073e46f9b9fcc09e637c94496c90273a0a4f6 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz at NetBSD.org>
+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 <connor.behan at gmail.com>
+---
+ 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 <ajax at redhat.com>
+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 <ajax at redhat.com>
+---
+ 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
+



More information about the arch-commits mailing list