[arch-commits] Commit in xf86-video-r128/repos (6 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Jul 29 19:57:37 UTC 2013
Date: Monday, July 29, 2013 @ 21:57:36
Author: jgc
Revision: 191734
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-r128/repos/extra-i686/PKGBUILD
(from rev 191733, xf86-video-r128/trunk/PKGBUILD)
xf86-video-r128/repos/extra-i686/no-mibstore.patch
(from rev 191733, xf86-video-r128/trunk/no-mibstore.patch)
xf86-video-r128/repos/extra-x86_64/PKGBUILD
(from rev 191733, xf86-video-r128/trunk/PKGBUILD)
xf86-video-r128/repos/extra-x86_64/no-mibstore.patch
(from rev 191733, xf86-video-r128/trunk/no-mibstore.patch)
Deleted:
xf86-video-r128/repos/extra-i686/PKGBUILD
xf86-video-r128/repos/extra-x86_64/PKGBUILD
--------------------------------+
/PKGBUILD | 76 +++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 32 ----------------
extra-i686/no-mibstore.patch | 24 ++++++++++++
extra-x86_64/PKGBUILD | 32 ----------------
extra-x86_64/no-mibstore.patch | 24 ++++++++++++
5 files changed, 124 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-07-29 19:57:30 UTC (rev 191733)
+++ extra-i686/PKGBUILD 2013-07-29 19:57:36 UTC (rev 191734)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-r128
-pkgver=6.9.1
-pkgrel=3
-pkgdesc="X.org ati Rage128 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')
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${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-r128/repos/extra-i686/PKGBUILD (from rev 191733, xf86-video-r128/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-07-29 19:57:36 UTC (rev 191734)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-r128
+pkgver=6.9.1
+pkgrel=4
+pkgdesc="X.org ati Rage128 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')
+optdepends=('r128-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+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 ${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-r128/repos/extra-i686/no-mibstore.patch (from rev 191733, xf86-video-r128/trunk/no-mibstore.patch)
===================================================================
--- extra-i686/no-mibstore.patch (rev 0)
+++ extra-i686/no-mibstore.patch 2013-07-29 19:57:36 UTC (rev 191734)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-07-29 19:57:30 UTC (rev 191733)
+++ extra-x86_64/PKGBUILD 2013-07-29 19:57:36 UTC (rev 191734)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-r128
-pkgver=6.9.1
-pkgrel=3
-pkgdesc="X.org ati Rage128 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')
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${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-r128/repos/extra-x86_64/PKGBUILD (from rev 191733, xf86-video-r128/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-07-29 19:57:36 UTC (rev 191734)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-r128
+pkgver=6.9.1
+pkgrel=4
+pkgdesc="X.org ati Rage128 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')
+optdepends=('r128-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+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 ${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-r128/repos/extra-x86_64/no-mibstore.patch (from rev 191733, xf86-video-r128/trunk/no-mibstore.patch)
===================================================================
--- extra-x86_64/no-mibstore.patch (rev 0)
+++ extra-x86_64/no-mibstore.patch 2013-07-29 19:57:36 UTC (rev 191734)
@@ -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
More information about the arch-commits
mailing list