diff options
Diffstat (limited to 'extra/xf86-video-intel')
-rw-r--r-- | extra/xf86-video-intel/PKGBUILD | 26 | ||||
-rw-r--r-- | extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch | 13 | ||||
-rw-r--r-- | extra/xf86-video-intel/xf86-video-intel.install | 11 |
3 files changed, 34 insertions, 16 deletions
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index d813d28dc..d715c218e 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,37 +1,39 @@ -# $Id: PKGBUILD 198520 2013-10-30 15:22:14Z allan $ +# $Id: PKGBUILD 203622 2014-01-13 17:13:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.15 +pkgver=2.99.907 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' 'pixman' 'xcb-util>=0.3.9') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender') +depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9' 'glamor-egl') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11' 'libxrender') replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') -conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' +conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16' 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc') +sha256sums=('d0b02255f0ff4baa863f762bef49707ce0b4094a267a26e32e4270abe141117b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ - --enable-dri \ - --with-default-accel=sna - + --enable-glamor make } +check() { + cd $pkgname-$pkgver + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch b/extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch new file mode 100644 index 000000000..714609b1e --- /dev/null +++ b/extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch @@ -0,0 +1,13 @@ +diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h +--- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21 06:15:11.000000000 -0400 ++++ xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300 -0400 +@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr + if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) + #endif + ++#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0) ++#define DamageUnregister(a, b) DamageUnregister(a) ++#endif ++ + #endif + diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install index 661387906..326a18610 100644 --- a/extra/xf86-video-intel/xf86-video-intel.install +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -6,13 +6,16 @@ post_upgrade() { post_install() { cat <<MSG ->>> This driver now uses SNA as the default acceleration method. You can - still fall 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 : +>>> This driver uses SNA as the default acceleration method. You can + fall back to UXA if you run into trouble or test experimental + Glamor acceleration. 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" + #Option "AccelMethod" "uxa" + #Option "AccelMethod" "glamor" EndSection MSG } |