Date: Saturday, December 28, 2013 @ 15:04:51 Author: andyrtr Revision: 202838
upgpkg: xf86-video-intel 2.21.15-2 rebuild for new Xorg-server 1.15 Added: xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch Modified: xf86-video-intel/trunk/PKGBUILD -----------------------------------------+ PKGBUILD | 21 ++++++++++++--------- intel-2.21.15-xserver-1.15-compat.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-28 13:56:01 UTC (rev 202837) +++ PKGBUILD 2013-12-28 14:04:51 UTC (rev 202838) @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=xf86-video-intel -pkgver=2.99.904 -pkgrel=1 +pkgver=2.21.15 +pkgrel=2 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -11,18 +11,21 @@ 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') +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=('ba480f523e3585c14eafa4efc058ebfee1e2ff35b2f62918e5f85ffc57e60179') +source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2 + intel-2.21.15-xserver-1.15-compat.patch) +sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc' + 'fbf8fa35974dbf758b095c390d79f542b97993482ae3b63ec6542bffa87ba09f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} + # fix build with Xorg 1.15 + patch -Np1 -i ${srcdir}/intel-2.21.15-xserver-1.15-compat.patch ./configure --prefix=/usr \ --enable-dri \ --with-default-accel=sna @@ -31,7 +34,7 @@ } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install Added: intel-2.21.15-xserver-1.15-compat.patch =================================================================== --- intel-2.21.15-xserver-1.15-compat.patch (rev 0) +++ intel-2.21.15-xserver-1.15-compat.patch 2013-12-28 14:04:51 UTC (rev 202838) @@ -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 +