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

Laurent Carlier lcarlier at archlinux.org
Thu Feb 5 19:50:29 UTC 2015


    Date: Thursday, February 5, 2015 @ 20:50:29
  Author: lcarlier
Revision: 230821

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

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

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

Copied: xf86-video-i740/repos/staging-i686/PKGBUILD (from rev 230820, xf86-video-i740/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-02-05 19:50:29 UTC (rev 230821)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-i740
+pkgver=1.3.4
+pkgrel=6
+pkgdesc="X.org Intel i740 video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
+            '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fix.diff
+}
+
+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-i740/repos/staging-i686/git-fix.diff (from rev 230820, xf86-video-i740/trunk/git-fix.diff)
===================================================================
--- staging-i686/git-fix.diff	                        (rev 0)
+++ staging-i686/git-fix.diff	2015-02-05 19:50:29 UTC (rev 230821)
@@ -0,0 +1,32 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 10 Jan 2013 03:21:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-i740/repos/staging-x86_64/PKGBUILD (from rev 230820, xf86-video-i740/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-02-05 19:50:29 UTC (rev 230821)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-i740
+pkgver=1.3.4
+pkgrel=6
+pkgdesc="X.org Intel i740 video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
+            '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fix.diff
+}
+
+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-i740/repos/staging-x86_64/git-fix.diff (from rev 230820, xf86-video-i740/trunk/git-fix.diff)
===================================================================
--- staging-x86_64/git-fix.diff	                        (rev 0)
+++ staging-x86_64/git-fix.diff	2015-02-05 19:50:29 UTC (rev 230821)
@@ -0,0 +1,32 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 10 Jan 2013 03:21:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe



More information about the arch-commits mailing list