summaryrefslogtreecommitdiff
path: root/x11/xf86-video-intel
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2016-01-05 13:05:37 +0000
committertnn <tnn@pkgsrc.org>2016-01-05 13:05:37 +0000
commit6d501f216d09544ae9fc2a8518deb11006fdb8fb (patch)
treec3df9a2706b221851cee106d2dacb04ff1f6dd40 /x11/xf86-video-intel
parentda0e4619cf9cca9c4c6ca1124293c7b2602c824b (diff)
downloadpkgsrc-6d501f216d09544ae9fc2a8518deb11006fdb8fb.tar.gz
Build fix for xorg-server-1.18.0. Bump revision for new driver ABI.
Diffstat (limited to 'x11/xf86-video-intel')
-rw-r--r--x11/xf86-video-intel/Makefile4
-rw-r--r--x11/xf86-video-intel/distinfo3
-rw-r--r--x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.c18
3 files changed, 22 insertions, 3 deletions
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index ce2f24d317d..2afca15ae34 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2015/09/25 00:44:44 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2016/01/05 13:05:37 tnn Exp $
DISTNAME= xf86-video-intel-2.99.917
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index 1f9309e2ef8..7fbd00b9c9f 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/01/05 13:05:37 tnn Exp $
SHA1 (xf86-video-intel-2.99.917.tar.bz2) = 9af9ded7a29026c211e5eb50a547e3e33976301d
RMD160 (xf86-video-intel-2.99.917.tar.bz2) = dd443e9e87286bbc454f4231a7a5d7c9bb2488a1
@@ -8,3 +8,4 @@ SHA1 (patch-src_backlight.c) = 39537a3233613c777f0475343f0be615bff3c3ca
SHA1 (patch-src_legacy_i810_i810__dri.c) = fb963b994d51c9db48457106048226214a2d986c
SHA1 (patch-src_sna_sna__display.c) = b2e5b330b5b4154b4d0bbf4edd7af1cec2c68cd8
SHA1 (patch-src_sna_sna__dri2.c) = 4bcc7e5c502a340954073386dad88fd6cebcc7b1
+SHA1 (patch-src_uxa_intel__driver.c) = 15ec83bf05b377764d1721c7a79ae9c6b1e7a0e6
diff --git a/x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.c b/x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.c
new file mode 100644
index 00000000000..4731c900a9c
--- /dev/null
+++ b/x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_uxa_intel__driver.c,v 1.1 2016/01/05 13:05:37 tnn Exp $
+
+fix build with xorg-server-1.18
+
+--- src/uxa/intel_driver.c.orig 2014-12-09 20:43:22.000000000 +0000
++++ src/uxa/intel_driver.c
+@@ -642,7 +642,11 @@ redisplay_dirty(ScreenPtr screen, Pixmap
+ return;
+
+ PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
++#ifdef HAS_DIRTYTRACKING_ROTATION
++ PixmapSyncDirtyHelper(dirty);
++#else
+ PixmapSyncDirtyHelper(dirty, &pixregion);
++#endif
+ RegionUninit(&pixregion);
+
+ intel_flush(intel);