diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
commit | 8a3d4ee5105eefa2136eb7ae83e69d01f29864c3 (patch) | |
tree | 8be9a06d3b2d8cade4b5dba48e040c632bd33850 /extra/xf86-video-intel | |
parent | 404b7ff94ece6bb2ce0e9df042ac1fe798137c83 (diff) | |
parent | d1d87d2ac643e3dabc251f3cec7d3b00e29b282c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/zathura/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/libdvdread/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/postgresql/PKGBUILD
Diffstat (limited to 'extra/xf86-video-intel')
-rw-r--r-- | extra/xf86-video-intel/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 9be6210d3..003d6ddf6 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 143035 2011-11-21 15:50:17Z jgc $ +# $Id: PKGBUILD 144437 2011-12-05 19:49:35Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel pkgver=2.17.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') -depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev) -makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev') +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') |