Wed Jul 18 00:01:34 UTC 2012

2 files changed, 25 insertions, 39 deletions

diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD
index 6ebe5c8ab..a6cfcfbf7 100644
--- a/testing/xf86-video-intel/PKGBUILD
+++ b/testing/xf86-video-intel/PKGBUILD
@@ -1,57 +1,35 @@
-# $Id: PKGBUILD 162779 2012-06-30 11:55:07Z andyrtr $
+# $Id: PKGBUILD 163603 2012-07-16 18:25:33Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=xf86-video-intel
-pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-pkgver=2.19.0
-pkgrel=5
+pkgname=xf86-video-intel
+pkgver=2.20.0
+pkgrel=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' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
 makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  mkdir build-{UXA,SNA}
-
-  pushd build-UXA
-  ../configure --prefix=/usr --enable-dri --enable-uxa
-  make
-  popd
-
-  pushd build-SNA
-  ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --enable-dri
   make
-  popd
 }
 
-package_xf86-video-intel-uxa() {
-	
-  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration"
-  provides=('xf86-video-intel')
-  replaces=('xf86-video-intel')
-  conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build-UXA
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_xf86-video-intel-sna() {
-
-  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration"
-  provides=('xf86-video-intel')
-  conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build-SNA
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/testing/xf86-video-intel/xf86-video-intel.install b/testing/xf86-video-intel/xf86-video-intel.install
new file mode 100644
index 000000000..e3ddb5522
--- /dev/null
+++ b/testing/xf86-video-intel/xf86-video-intel.install
@@ -0,0 +1,8 @@
+post_install() {
+  echo ">>> This driver now allows to switch"
+  echo ">>> between several acceleration methods."
+  echo ">>> Add to the device section in /etc/X11/xorg.conf"
+  echo ">>>   Option \"AccelMethod\" \"sna\""
+  echo ">>> use uxa/xaa method if you run into trouble with sna."
+}
+