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

Mon Nov 21 13:25:48 UTC 2016

Date: Monday, November 21, 2016 @ 13:25:47
  Author: lcarlier
Revision: 281736

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

Added:
  xf86-video-sisusb/repos/staging-i686/
  xf86-video-sisusb/repos/staging-i686/PKGBUILD
    (from rev 281735, xf86-video-sisusb/trunk/PKGBUILD)
  xf86-video-sisusb/repos/staging-i686/git-fixes.patch
    (from rev 281735, xf86-video-sisusb/trunk/git-fixes.patch)
  xf86-video-sisusb/repos/staging-x86_64/
  xf86-video-sisusb/repos/staging-x86_64/PKGBUILD
    (from rev 281735, xf86-video-sisusb/trunk/PKGBUILD)
  xf86-video-sisusb/repos/staging-x86_64/git-fixes.patch
    (from rev 281735, xf86-video-sisusb/trunk/git-fixes.patch)

--------------------------------+
 staging-i686/PKGBUILD          |   34 +++++++++++++++++++++
 staging-i686/git-fixes.patch   |   61 +++++++++++++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD        |   34 +++++++++++++++++++++
 staging-x86_64/git-fixes.patch |   61 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 190 insertions(+)

Copied: xf86-video-sisusb/repos/staging-i686/PKGBUILD (from rev 281735, xf86-video-sisusb/trunk/PKGBUILD)
===================================================================

--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2016-11-21 13:25:47 UTC (rev 281736)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.6
+pkgrel=8
+pkgdesc="X.org SiS USB video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+            '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
+
+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-sisusb/repos/staging-i686/git-fixes.patch (from rev 281735, xf86-video-sisusb/trunk/git-fixes.patch)
===================================================================
--- staging-i686/git-fixes.patch	                        (rev 0)
+++ staging-i686/git-fixes.patch	2016-11-21 13:25:47 UTC (rev 281736)
@@ -0,0 +1,61 @@
+From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
+index 539b9f1..0fdc8e9 100644
+--- a/src/sisusb_driver.c
++++ b/src/sisusb_driver.c
+@@ -39,7 +39,6 @@
+ #include "shadowfb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ 
+ #include "sisusb_regs.h"
+ #include "sisusb_dac.h"
+@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
+     /* Initialize the accelerators */
+     SiSUSBAccelInit(pScreen);
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* NO SilkenMouse. Never. Ever. */
+--
+cgit v0.9.0.2-2-gbebe
+From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Mon, 21 Nov 2016 14:13:23 +0100
+Subject: [PATCH] Adapt BlockHandler signature for ABI 23
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.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-sisusb/repos/staging-x86_64/PKGBUILD (from rev 281735, xf86-video-sisusb/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2016-11-21 13:25:47 UTC (rev 281736)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.6
+pkgrel=8
+pkgdesc="X.org SiS USB video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+            '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
+
+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-sisusb/repos/staging-x86_64/git-fixes.patch (from rev 281735, xf86-video-sisusb/trunk/git-fixes.patch)
===================================================================
--- staging-x86_64/git-fixes.patch	                        (rev 0)
+++ staging-x86_64/git-fixes.patch	2016-11-21 13:25:47 UTC (rev 281736)
@@ -0,0 +1,61 @@
+From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
+index 539b9f1..0fdc8e9 100644
+--- a/src/sisusb_driver.c
++++ b/src/sisusb_driver.c
+@@ -39,7 +39,6 @@
+ #include "shadowfb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ 
+ #include "sisusb_regs.h"
+ #include "sisusb_dac.h"
+@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
+     /* Initialize the accelerators */
+     SiSUSBAccelInit(pScreen);
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* NO SilkenMouse. Never. Ever. */
+--
+cgit v0.9.0.2-2-gbebe
+From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Mon, 21 Nov 2016 14:13:23 +0100
+Subject: [PATCH] Adapt BlockHandler signature for ABI 23
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.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
+
+

