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

[Laurent Carlier]

    Date: Friday, July 18, 2014 @ 13:52:42
  Author: lcarlier
Revision: 217395

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

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

Copied: xf86-video-sisusb/repos/staging-i686/PKGBUILD (from rev 217393, xf86-video-sisusb/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-07-18 11:52:42 UTC (rev 217395)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.6
+pkgrel=5
+pkgdesc="X.org SiS USB video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+            '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
+
+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 217393, xf86-video-sisusb/trunk/git-fixes.patch)
===================================================================
--- staging-i686/git-fixes.patch	                        (rev 0)
+++ staging-i686/git-fixes.patch	2014-07-18 11:52:42 UTC (rev 217395)
@@ -0,0 +1,29 @@
+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

Copied: xf86-video-sisusb/repos/staging-x86_64/PKGBUILD (from rev 217393, xf86-video-sisusb/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-07-18 11:52:42 UTC (rev 217395)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.6
+pkgrel=5
+pkgdesc="X.org SiS USB video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+            '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
+
+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 217393, xf86-video-sisusb/trunk/git-fixes.patch)
===================================================================
--- staging-x86_64/git-fixes.patch	                        (rev 0)
+++ staging-x86_64/git-fixes.patch	2014-07-18 11:52:42 UTC (rev 217395)
@@ -0,0 +1,29 @@
+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