[arch-commits] Commit in xf86-video-s3/trunk (PKGBUILD build-fix.diff)

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 17:05:10
  Author: andyrtr
Revision: 179742

upgpkg: xf86-video-s3 0.6.5-3

rebuild for new X-ABI-VIDEODRV_VERSION=14; add a build fix

Added:
  xf86-video-s3/trunk/build-fix.diff
Modified:
  xf86-video-s3/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 +++++++-----
 build-fix.diff |   10 ++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 15:55:24 UTC (rev 179741)
+++ PKGBUILD	2013-03-09 16:05:10 UTC (rev 179742)
@@ -3,20 +3,22 @@
 
 pkgname=xf86-video-s3
 pkgver=0.6.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+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')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
+            'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }

Added: build-fix.diff
===================================================================
--- build-fix.diff	                        (rev 0)
+++ build-fix.diff	2013-03-09 16:05:10 UTC (rev 179742)
@@ -0,0 +1,10 @@
+--- xf86-video-s3-0.6.5/src/s3_driver.c	2012-07-17 06:50:05.000000000 +0200
++++ xf86-video-s3-0.6.5/src/s3_driver.c.new	2013-03-09 17:01:39.639220318 +0100
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"