[arch-commits] Commit in xf86-video-openchrome/trunk (PKGBUILD git-fixes.patch)

[Laurent Carlier]

    Date: Monday, February 9, 2015 @ 19:43:49
  Author: lcarlier
Revision: 231186

upgpkg: xf86-video-openchrome 0.3.3-5

xorg-server 1.17 rebuild

Added:
  xf86-video-openchrome/trunk/git-fixes.patch
Modified:
  xf86-video-openchrome/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   16 +++++++++++-----
 git-fixes.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-09 16:18:39 UTC (rev 231185)
+++ PKGBUILD	2015-02-09 18:43:49 UTC (rev 231186)
@@ -5,7 +5,7 @@
 
 pkgname=xf86-video-openchrome
 pkgver=0.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
@@ -12,15 +12,21 @@
 url="http://www.freedesktop.org/wiki/Openchrome/"
 depends=('libdrm' 'libxvmc' 'systemd')
 optdepends=('unichrome-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19'
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20'
            'xf86-video-via' 'xf86-video-unichrome' 'openchrome')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers' 'xorg')
 options=('!emptydirs' '!makeflags')
-source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295')
+source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295'
+          '048a756f0d051df740279f98be9e2aa3e5c75415')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2015-02-09 18:43:49 UTC (rev 231186)
@@ -0,0 +1,25 @@
+From 319fcdad57ebf4f1ef828c3344058ff8f6197432 Mon Sep 17 00:00:00 2001
+From: Xavier Bachelot <xavier at bachelot.org>
+Date: Tue, 13 Jan 2015 18:34:53 +0100
+Subject: [PATCH] Add missing header inclusion. Fixes
+ https://bugs.freedesktop.org/show_bug.cgi?id=88334
+
+---
+ src/via_3d.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/via_3d.h b/src/via_3d.h
+index c33228e..15be0be 100644
+--- a/src/via_3d.h
++++ b/src/via_3d.h
+@@ -24,6 +24,7 @@
+ #ifndef VIA_3D_H
+ #define VIA_3D_H
+ 
++#include "xorg-server.h"
+ #include "xf86.h"
+ #include "via_dmabuffer.h"
+ 
+-- 
+2.3.0
+