[Midnightbsd-cvs] mports [15726] trunk/x11-drivers/xf86-video-intel: update intel video driver for x

[laffer1 at midnightbsd.org]

Revision: 15726
          http://svnweb.midnightbsd.org/mports/?rev=15726
Author:   laffer1
Date:     2013-12-22 13:06:55 -0500 (Sun, 22 Dec 2013)
Log Message:
-----------
update intel video driver for x

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-intel/Makefile
    trunk/x11-drivers/xf86-video-intel/distinfo

Modified: trunk/x11-drivers/xf86-video-intel/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-intel/Makefile	2013-12-22 18:05:31 UTC (rev 15725)
+++ trunk/x11-drivers/xf86-video-intel/Makefile	2013-12-22 18:06:55 UTC (rev 15726)
@@ -14,18 +14,32 @@
 
 USE_LDCONFIG=	yes
 XORG_CAT=	driver
-USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
-MAN4=		intel.4x
+USE_XORG=	glproto \
+		pixman \
+		x11 \
+		xext \
+		xf86driproto \
+		xineramaproto \
+		xrender \
+		xvmc
 
+.include <bsd.mport.options.mk>
+
 .if defined(WITH_NEW_XORG)
-INTEL_VERSION=	2.17.0
+INTEL_VERSION=	2.21.15
 INTEL_REVISION=	1
+CONFIGURE_ENV+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
+CONFIGURE_ARGS+=	--enable-sna
 MAKE_JOBS_UNSAFE=yes
 PLIST_SUB+=	OLD="@comment "
-EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
+EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
+		${PATCHDIR}/extra-src_sna_kgem.c \
+		${PATCHDIR}/extra-clang \
+		${PATCHDIR}/extra-i915kms
+LIB_DEPENDS+=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
-INTEL_REVISION=	4
+INTEL_REVISION=	6
 PLIST_SUB+=	OLD=""
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
@@ -48,14 +62,9 @@
 		${PATCHDIR}/extra-uxa_uxa-priv.h
 .endif
 
-.include <bsd.port.pre.mk>
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so
 
-.if defined(WITH_NEW_XORG)
-pre-configure:
-.if !exists(${LOCALBASE}/lib/libkms.so)
-	@${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option."
-	@${FALSE}
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/x11-drivers/xf86-video-intel/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-intel/distinfo	2013-12-22 18:05:31 UTC (rev 15725)
+++ trunk/x11-drivers/xf86-video-intel/distinfo	2013-12-22 18:06:55 UTC (rev 15726)
@@ -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.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
-SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
+SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc
+SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 1977431