[arch-commits] Commit in xf86-video-fbdev/repos (6 files)

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 13:08:16
  Author: andyrtr
Revision: 179709

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-fbdev/repos/staging-i686/
  xf86-video-fbdev/repos/staging-i686/PKGBUILD
    (from rev 179708, xf86-video-fbdev/trunk/PKGBUILD)
  xf86-video-fbdev/repos/staging-i686/git-fix.diff
    (from rev 179708, xf86-video-fbdev/trunk/git-fix.diff)
  xf86-video-fbdev/repos/staging-x86_64/
  xf86-video-fbdev/repos/staging-x86_64/PKGBUILD
    (from rev 179708, xf86-video-fbdev/trunk/PKGBUILD)
  xf86-video-fbdev/repos/staging-x86_64/git-fix.diff
    (from rev 179708, xf86-video-fbdev/trunk/git-fix.diff)

-----------------------------+
 staging-i686/PKGBUILD       |   32 ++++++++++++++++++++++++++++++++
 staging-i686/git-fix.diff   |   29 +++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD     |   32 ++++++++++++++++++++++++++++++++
 staging-x86_64/git-fix.diff |   29 +++++++++++++++++++++++++++++
 4 files changed, 122 insertions(+)

Copied: xf86-video-fbdev/repos/staging-i686/PKGBUILD (from rev 179708, xf86-video-fbdev/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-03-09 12:08:16 UTC (rev 179709)
@@ -0,0 +1,32 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-fbdev
+pkgver=0.4.3
+pkgrel=3
+pkgdesc="X.org framebuffer video driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+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')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831'
+            '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
+  ./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-fbdev/repos/staging-i686/git-fix.diff (from rev 179708, xf86-video-fbdev/trunk/git-fix.diff)
===================================================================
--- staging-i686/git-fix.diff	                        (rev 0)
+++ staging-i686/git-fix.diff	2013-03-09 12:08:16 UTC (rev 179709)
@@ -0,0 +1,29 @@
+From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:37 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/fbdev.c b/src/fbdev.c
+index cd7ebc5..f5a7378 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* software cursor */
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-fbdev/repos/staging-x86_64/PKGBUILD (from rev 179708, xf86-video-fbdev/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-03-09 12:08:16 UTC (rev 179709)
@@ -0,0 +1,32 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-fbdev
+pkgver=0.4.3
+pkgrel=3
+pkgdesc="X.org framebuffer video driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+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')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831'
+            '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
+  ./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-fbdev/repos/staging-x86_64/git-fix.diff (from rev 179708, xf86-video-fbdev/trunk/git-fix.diff)
===================================================================
--- staging-x86_64/git-fix.diff	                        (rev 0)
+++ staging-x86_64/git-fix.diff	2013-03-09 12:08:16 UTC (rev 179709)
@@ -0,0 +1,29 @@
+From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:37 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/fbdev.c b/src/fbdev.c
+index cd7ebc5..f5a7378 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* software cursor */
+--
+cgit v0.9.0.2-2-gbebe