2 files changed, 54 insertions, 17 deletions
diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD
index 1eaeb94..8a5e734 100644
--- a/abs/core/xf86-video-intel/PKGBUILD
+++ b/abs/core/xf86-video-intel/PKGBUILD
@@ -1,36 +1,61 @@
-# $Id: PKGBUILD 172074 2012-11-27 15:58:51Z andyrtr $
+# $Id$
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.14
+pkgver=2.99.917+364+gb24e758
 pkgrel=1
+epoch=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
+depends=('mesa-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'libx11' 'libxrender'
+             # additional deps for intel-virtual-output
+             'libxrandr' 'libxinerama' 'libxcursor' 'libxtst'
+             # additional for git snapshot
+             'git')
+optdepends=('libxrandr: for intel-virtual-output'
+            'libxinerama: for intel-virtual-output'
+            'libxcursor: for intel-virtual-output'
+            'libxtst: for intel-virtual-output')
 replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14'
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f85019afd5ddead6606bf89855d209d5369823a6e96b779fa956e0cc78d3b09b')
+#source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+source=('git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#commit=b24e758')
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --long | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --enable-dri
+  cd $pkgname
+  ./configure --prefix=/usr --libexecdir=/usr/lib
   make
 }
 
+check() {
+  cd $pkgname
+  make check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname
+
   make DESTDIR="${pkgdir}" install
+
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/abs/core/xf86-video-intel/xf86-video-intel.install b/abs/core/xf86-video-intel/xf86-video-intel.install
index d523eb6..213f7d4 100644
--- a/abs/core/xf86-video-intel/xf86-video-intel.install
+++ b/abs/core/xf86-video-intel/xf86-video-intel.install
@@ -1,8 +1,20 @@
+post_upgrade() {
+  if (( $(vercmp $2 2.21.15) < 0 )); then
+    post_install
+  fi
+}
+
 post_install() {
-  echo ">>> This driver now allows to switch"
-  echo ">>> between sna/uxa acceleration methods."
-  echo ">>> Add to the device section in /etc/X11/xorg.conf"
-  echo ">>>   Option \"AccelMethod\" \"sna\""
-  echo ">>> use uxa method if you run into trouble with sna."
+  cat <<MSG
+>>> This driver uses SNA as the default acceleration method. You can try
+    falling back to UXA if you run into trouble. To do so, save a file with
+    the following content as /etc/X11/xorg.conf.d/20-intel.conf :
+      Section "Device"
+        Identifier  "Intel Graphics"
+        Driver      "intel"
+        Option      "AccelMethod"  "uxa"
+        #Option      "AccelMethod"  "sna"
+      EndSection
+MSG
 }