[arch-commits] Commit in xf86-video-intel/repos (2 files)

[Pierre Schmitz]

    Date: Monday, September 1, 2008 @ 12:44:48
  Author: pierre
Revision: 11636

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

........
  r10758 | jgc | 2008-08-31 12:43:52 +0000 (So, 31 Aug 2008) | 1 line
  
  upgpkg: xf86-video-intel 2.4.2-1
........
  r11435 | jgc | 2008-08-31 15:33:44 +0000 (So, 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-x86_64/	(properties)
  xf86-video-intel/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)


Property changes on: xf86-video-intel/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-intel/trunk:1-8826
   + /xf86-video-intel/trunk:1-11635

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-09-01 16:43:35 UTC (rev 11635)
+++ testing-x86_64/PKGBUILD	2008-09-01 16:44:48 UTC (rev 11636)
@@ -2,27 +2,24 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-intel
-pkgver=2.4.1
+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.1rc4' 'libpciaccess>=0.10.3' 'libdrm>=2.4.0')
-makedepends=('pkgconfig' 'xorg-server>=1.4.99.906' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.1rc4')
-conflicts=('xorg-server<1.4.99.906')
+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' 'xf86-video-i810')
+replaces=('xf86-video-i810')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3c752260ad4db0572a3175d6e8740aa3')
+md5sums=('5cd6b3ed57c7e78ab51e9d9266e73fb6')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  # libdrm 2.4.0 does not contain TTM
-  sed -i -e 's/2.4.0/2.5.0/g' configure || return 1
   ./configure --prefix=/usr \
               --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*
 }