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

Thu Feb 5 19:48:56 UTC 2015

Date: Thursday, February 5, 2015 @ 20:48:56
  Author: lcarlier
Revision: 230819

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

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

-----------------------------+
 staging-i686/PKGBUILD       |   35 +++++++++++++++++++++++++++
 staging-i686/git-fix.diff   |   53 ++++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD     |   35 +++++++++++++++++++++++++++
 staging-x86_64/git-fix.diff |   53 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 176 insertions(+)

Copied: xf86-video-i128/repos/staging-i686/PKGBUILD (from rev 230818, xf86-video-i128/trunk/PKGBUILD)
===================================================================

--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-02-05 19:48:56 UTC (rev 230819)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer:Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-i128
+pkgver=1.3.6
+pkgrel=6
+pkgdesc="X.org Number 9 I128 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')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
+            '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
+
+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-i128/repos/staging-i686/git-fix.diff (from rev 230818, xf86-video-i128/trunk/git-fix.diff)
===================================================================
--- staging-i686/git-fix.diff	                        (rev 0)
+++ staging-i686/git-fix.diff	2015-02-05 19:48:56 UTC (rev 230819)
@@ -0,0 +1,53 @@
+From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 15 Aug 2012 17:03:11 +0000
+Subject: Don't bother to include vbe.h
+
+Just copied from xf86 boilerplate afaict.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 66fdee0..a0f08c0 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -55,7 +55,6 @@
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+--
+cgit v0.9.0.2-2-gbebe
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-i128/repos/staging-x86_64/PKGBUILD (from rev 230818, xf86-video-i128/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-02-05 19:48:56 UTC (rev 230819)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer:Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-i128
+pkgver=1.3.6
+pkgrel=6
+pkgdesc="X.org Number 9 I128 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')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
+            '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
+
+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-i128/repos/staging-x86_64/git-fix.diff (from rev 230818, xf86-video-i128/trunk/git-fix.diff)
===================================================================
--- staging-x86_64/git-fix.diff	                        (rev 0)
+++ staging-x86_64/git-fix.diff	2015-02-05 19:48:56 UTC (rev 230819)
@@ -0,0 +1,53 @@
+From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 15 Aug 2012 17:03:11 +0000
+Subject: Don't bother to include vbe.h
+
+Just copied from xf86 boilerplate afaict.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 66fdee0..a0f08c0 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -55,7 +55,6 @@
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+--
+cgit v0.9.0.2-2-gbebe
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe

