[arch-commits] Commit in xf86-video-sisusb/trunk (PKGBUILD git-fixes.patch)

Andreas Radke andyrtr at archlinux.org
Tue Sep 5 18:06:23 UTC 2017


    Date: Tuesday, September 5, 2017 @ 18:06:23
  Author: andyrtr
Revision: 304703

upgpkg: xf86-video-sisusb 0.9.7-1

upstream update 0.9.7

Modified:
  xf86-video-sisusb/trunk/PKGBUILD
Deleted:
  xf86-video-sisusb/trunk/git-fixes.patch

-----------------+
 PKGBUILD        |   14 +++---------
 git-fixes.patch |   61 ------------------------------------------------------
 2 files changed, 4 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-05 18:01:55 UTC (rev 304702)
+++ PKGBUILD	2017-09-05 18:06:23 UTC (rev 304703)
@@ -2,8 +2,8 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-sisusb
-pkgver=0.9.6
-pkgrel=9
+pkgver=0.9.7
+pkgrel=1
 pkgdesc="X.org SiS USB video driver"
 arch=(i686 x86_64)
 url="https://xorg.freedesktop.org/"
@@ -11,15 +11,9 @@
 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')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('f4400416b920cd1136d60d36b99d33f245cdeaf2ad6c1340936c7c0987761424')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git-fixes.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 

Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch	2017-09-05 18:01:55 UTC (rev 304702)
+++ git-fixes.patch	2017-09-05 18:06:23 UTC (rev 304703)
@@ -1,61 +0,0 @@
-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
-
-



More information about the arch-commits mailing list