[arch-commits] Commit in xf86-video-siliconmotion/trunk (2 files)

[Andreas Radke]

    Date: Saturday, December 28, 2013 @ 19:48:01
  Author: andyrtr
Revision: 202870

upgpkg: xf86-video-siliconmotion 1.7.7-4

rebuild for new Xorg-server 1.15

Added:
  xf86-video-siliconmotion/trunk/0001-Remove-miInitializeBackingStore.patch
Modified:
  xf86-video-siliconmotion/trunk/PKGBUILD

--------------------------------------------+
 0001-Remove-miInitializeBackingStore.patch |   27 +++++++++++++++++++++++++++
 PKGBUILD                                   |   17 ++++++++++-------
 2 files changed, 37 insertions(+), 7 deletions(-)

Added: 0001-Remove-miInitializeBackingStore.patch
===================================================================
--- 0001-Remove-miInitializeBackingStore.patch	                        (rev 0)
+++ 0001-Remove-miInitializeBackingStore.patch	2013-12-28 18:48:01 UTC (rev 202870)
@@ -0,0 +1,27 @@
+From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 9 Jan 2013 22:59:39 -0500
+Subject: [PATCH] Remove miInitializeBackingStore()
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+ src/smi_driver.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index 4794571..134db79 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   "Done writing mode.  Register dump:\n");
+     SMI_PrintRegs(pScrn);
+ 
+-    miInitializeBackingStore(pScreen);
+-
+ #ifdef HAVE_XMODES
+     xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
+ #endif
+-- 
+1.8.0.2
+
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-28 18:35:06 UTC (rev 202869)
+++ PKGBUILD	2013-12-28 18:48:01 UTC (rev 202870)
@@ -4,26 +4,29 @@
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.7
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org siliconmotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        0001-Remove-miInitializeBackingStore.patch)
+sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa'
+            '257cc6ccf2ed565daaacaf87cb2f1195b4c2f6bb95fefe5e89766f88393e6647')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/0001-Remove-miInitializeBackingStore.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"