Update to 2.20.13.

This update enables SNA support. It still needs to be manualy enabled in xorg.conf.

Submitted by:	avg@


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@592 058c260c-8361-11dd-a0ac-aa2bafec7d09

4 files changed, 28 insertions, 15 deletions

diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index d85e17c..c57e29e 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -22,11 +22,13 @@ USE_XORG=	xvmc xineramaproto x11 xf86driproto glproto
 MAN4=		intel.4x
 
 .if defined(WITH_NEW_XORG)
-INTEL_VERSION=	2.20.4
+INTEL_VERSION=	2.20.13
 INTEL_REVISION=	0
+CONFIGURE_ARGS+=	--enable-sna
 MAKE_JOBS_UNSAFE=yes
 PLIST_SUB+=	OLD="@comment "
-EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
+EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms \
+		${PATCHDIR}/extra-configure-sna
 LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
@@ -53,8 +55,6 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
 		${PATCHDIR}/extra-uxa_uxa-priv.h
 .endif
 
-CONFIGURE_ARGS+=--disable-sna
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NEW_XORG)
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index 6d4a51d..62f4bdb 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
-SHA256 (xorg/driver/xf86-video-intel-2.20.4.tar.bz2) = f36d857a64a28b839abc4999e8e8f4704f5769ed284800fecc5dfd2aa03150d8
-SIZE (xorg/driver/xf86-video-intel-2.20.4.tar.bz2) = 1614197
+SHA256 (xorg/driver/xf86-video-intel-2.20.13.tar.bz2) = 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3
+SIZE (xorg/driver/xf86-video-intel-2.20.13.tar.bz2) = 1649369
diff --git a/x11-drivers/xf86-video-intel/files/extra-configure-sna b/x11-drivers/xf86-video-intel/files/extra-configure-sna
new file mode 100644
index 0000000..b26efcf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-configure-sna
@@ -0,0 +1,11 @@
+--- configure.orig	2012-10-26 13:05:01.098919480 +0300
++++ configure	2012-10-26 13:05:05.145919575 +0300
+@@ -18498,7 +18498,7 @@
+ _ACEOF
+ 
+ else
+-  SNA=no
++#  SNA=no
+ fi
+ 
+ done
diff --git a/x11-drivers/xf86-video-intel/files/extra-i915kms b/x11-drivers/xf86-video-intel/files/extra-i915kms
index ed50181..c900909 100644
--- a/x11-drivers/xf86-video-intel/files/extra-i915kms
+++ b/x11-drivers/xf86-video-intel/files/extra-i915kms
@@ -1,11 +1,13 @@
---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
-+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
-@@ -334,7 +334,7 @@
- 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
+--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
+@@ -393,8 +393,8 @@
  		 dev->domain, dev->bus, dev->dev, dev->func);
  
--	intel->drmSubFD = drmOpen("i915", busid);
-+	intel->drmSubFD = drmOpen("i915kms", busid);
- 	if (intel->drmSubFD == -1) {
- 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- 			   "[drm] Failed to open DRM device for %s: %s\n",
+ 	ret = drmCheckModesettingSupported(id);
+-	if (ret) {
+-		if (xf86LoadKernelModule("i915"))
++	if (ret || 1) {
++		if (xf86LoadKernelModule("i915kms"))
+ 			ret = drmCheckModesettingSupported(id);
+ 		if (ret)
+ 			return FALSE;