summaryrefslogtreecommitdiff
path: root/extra/xf86-video-r128
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-07-30 01:43:30 -0700
committerroot <root@rshg054.dnsready.net>2013-07-30 01:43:30 -0700
commit4afc07385539524e7f85fe0d977b90bc6d124cfd (patch)
tree242ae1ee640f2f3a6a00f787b4b39fb658d0da5c /extra/xf86-video-r128
parenta1444f1dc2bd37f6980a4d1c341303aeb0684920 (diff)
Tue Jul 30 01:43:07 PDT 2013
Diffstat (limited to 'extra/xf86-video-r128')
-rw-r--r--extra/xf86-video-r128/PKGBUILD18
-rw-r--r--extra/xf86-video-r128/no-mibstore.patch24
2 files changed, 36 insertions, 6 deletions
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 2553045d2..882e858d0 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180209 2013-03-18 16:09:16Z andyrtr $
+# $Id: PKGBUILD 191734 2013-07-29 19:57:36Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
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 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
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}"
diff --git a/extra/xf86-video-r128/no-mibstore.patch b/extra/xf86-video-r128/no-mibstore.patch
new file mode 100644
index 000000000..b6f18031e
--- /dev/null
+++ b/extra/xf86-video-r128/no-mibstore.patch
@@ -0,0 +1,24 @@
+From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001
+From: Connor Behan <connor.behan@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@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