From de5b6982e42f4a1e8b0537cfbc1b676e2a81f195 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 19 Mar 2012 00:01:09 +0000
Subject: Mon Mar 19 00:01:09 UTC 2012

---
 extra/xf86-video-sisimedia/PKGBUILD | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'extra/xf86-video-sisimedia/PKGBUILD')

diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index b1d9e01d6..02febf216 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 142261 2011-11-07 13:08:57Z jgc $
+# $Id: PKGBUILD 153653 2012-03-17 10:02:45Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 license=('custom')
-depends=('glibc' 'sis-dri')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.0')
+depends=('libdrm')
+makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto' 'xf86driproto' 'glproto')
+conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
@@ -28,6 +28,12 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-
         0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
         0005-Correct-bounds-check-of-blitClip-array-access.patch
         xserver19.patch
+        xserver112.patch
+        pciTag-removal-workaround.patch
+        Untangle-XF86DRI.patch
+        swap-func-rename.patch
+        xf86MapDomainMemory-pci_device_map_legacy.patch
+        sync-with-freedesktop.patch
         fix-xv-crash.patch
         COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
@@ -46,6 +52,12 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '5e288526bfa2c534f1feabdb571da16da8a1c7a6'
           'e86d702cb0b5e9bf43ff732696229965e176db7c'
           'b5f260bed7e705808ec05620316e503ed5d52ee5'
+          'ca25df590590284161cd68440fc4f0cfeb8618b2'
+          'ce60625b915e8bd82a6ab2c78e52eb589f27a083'
+          '963ef59ecd0ca478434623efb68fce9ee832501d'
+          '5f686c54383c6677b043c6ca0b565b023c1907f9'
+          '4ea8d76b3e74172109e7013a2931e571d3a2f4e1'
+          '1d29504466840d2fbe1fc355d78666c1a9cd9b76'
           '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d'
           'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
@@ -66,6 +78,12 @@ build() {
   patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch"
   patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch"
   patch -Np1 -i "${srcdir}/xserver19.patch"
+  patch -Np1 -i "${srcdir}/xserver112.patch"
+  patch -Np1 -i "${srcdir}/pciTag-removal-workaround.patch"
+  patch -Np1 -i "${srcdir}/Untangle-XF86DRI.patch"
+  patch -Np1 -i "${srcdir}/swap-func-rename.patch"
+  patch -Np1 -i "${srcdir}/xf86MapDomainMemory-pci_device_map_legacy.patch"
+  patch -Np1 -i "${srcdir}/sync-with-freedesktop.patch"
   patch -Np0 -i "${srcdir}/fix-xv-crash.patch"
 
   sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
@@ -74,7 +92,7 @@ build() {
 
   autoreconf -fi
 
-  ./configure --prefix=/usr --enable-dri
+  ./configure --prefix=/usr --disable-dri
   make
   make DESTDIR="${pkgdir}" install
 
-- 
cgit v1.2.3-54-g00ecf