[arch-commits] Commit in xf86-video-r128/trunk (PKGBUILD no-mibstore.patch)

[Jan de Groot]

    Date: Monday, July 29, 2013 @ 21:57:30
  Author: jgc
Revision: 191733

upgpkg: xf86-video-r128 6.9.1-4

Fix FS#36322

Added:
  xf86-video-r128/trunk/no-mibstore.patch
Modified:
  xf86-video-r128/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   16 +++++++++++-----
 no-mibstore.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-29 19:06:13 UTC (rev 191732)
+++ PKGBUILD	2013-07-29 19:57:30 UTC (rev 191733)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-r128
 pkgver=6.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,17 +14,23 @@
 optdepends=('r128-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        no-mibstore.patch)
+sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c'
+            '6e4cbce4de6ff569f6d30a99f699ca44d4cb28e530e593f61578b4f97c1de13e')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../no-mibstore.patch
+}
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"

Added: no-mibstore.patch
===================================================================
--- no-mibstore.patch	                        (rev 0)
+++ no-mibstore.patch	2013-07-29 19:57:30 UTC (rev 191733)
@@ -0,0 +1,24 @@
+From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan at gmail.com>
+Date: Wed, 19 Dec 2012 18:41:14 +0000
+Subject: Remove call to obsolete miInitializeBackingStore()
+
+Definition was deleted from Xorg during 1.14 merge window, but has been
+a no-op since 1.10 merge window.
+
+Signed-off-by: Connor Behan <connor.behan at gmail.com>
+---
+diff --git a/src/r128_driver.c b/src/r128_driver.c
+index a062a60..f47c7e3 100644
+--- a/src/r128_driver.c
++++ b/src/r128_driver.c
+@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
+     R128DGAInit(pScreen);
+ 
+ 				/* Backing store setup */
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+ 				/* Set Silken Mouse */
+--
+cgit v0.9.0.2-2-gbebe