[arch-commits] Commit in xf86-video-intel/repos (testing-i686 testing-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 31, 2008 @ 11:33:56
  Author: jgc
Revision: 11436

Merged revisions 10759-11435 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-intel/trunk

........
  r11435 | jgc | 2008-08-31 17:33:44 +0200 (Sun, 31 Aug 2008) | 2 lines
  
  upgpkg: xf86-video-intel 2.4.2-1
      Replace i810 driver, it does not build anymore
........

Modified:
  xf86-video-intel/repos/testing-i686/	(properties)
  xf86-video-intel/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


Property changes on: xf86-video-intel/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-intel/trunk:1-10758
   + /xf86-video-intel/trunk:1-11435

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-08-31 15:33:44 UTC (rev 11435)
+++ testing-i686/PKGBUILD	2008-08-31 15:33:56 UTC (rev 11436)
@@ -4,12 +4,13 @@
 pkgname=xf86-video-intel
 pkgver=2.4.2
 pkgrel=1
-pkgdesc="X.org Intel i810/i830/i915 video drivers"
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('intel-dri>=7.1-2' 'libpciaccess>=0.10.3' 'libdrm>=2.3.1')
 makedepends=('pkgconfig' 'xorg-server>=1.4.99.906-2' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.1')
-conflicts=('xorg-server<1.4.99.906')
+conflicts=('xorg-server<1.4.99.906' 'xf86-video-i810')
+replaces=('xf86-video-i810')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
@@ -21,6 +22,4 @@
               --enable-dri || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${startdir}/pkg/usr/lib/xorg/modules/drivers/i810_drv.so
-  rm -f ${startdir}/pkg/usr/share/man/man4/i810.4*
 }