The FreeBSD graphics/x11 team proudly presents

a kwm, zeising production:

MESA 9.1.6

Starring:
Mesa 9.1.6, including libGL, libGLU and dri (new xorg only)
Addition of libEGL and libglesv2
KMS support for ATI graphics cards in 10-current (new xorg only)
Improved sparc64 support for new xorg. [1]
pixman 0.30.2, including shlib bump and portrevision bumps
libX11 1.6.2
Make absolute pointing devices work with x11-drivers/xf86-input-mouse
x11-drivers/xf86-video-ati 7.2.0 for 10-current (KMS aware ati driver)

Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
When updating MESA related ports (libGL, dri) you need to remove old versions
first.  See UPDATING for details.

PR:		ports/181962 [2]
Submitted by:	marius [1]
		zeising [2]
Exp-run by:	bdrewery
Approved by:	portmgr (bdrewery)

Thanks to all who helped testing!

6 files changed, 74 insertions, 86 deletions

diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index e3675aa1d708..f34c93f32e26 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -29,20 +29,20 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
-INTEL_VERSION=	2.21.9
+INTEL_VERSION=	2.21.15
 INTEL_REVISION=	0
+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-clang \
-		${PATCHDIR}/extra-src_sna_compiler.h \
+EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
 		${PATCHDIR}/extra-src_sna_kgem.c \
-		${PATCHDIR}/extra-src__sna__sna_threads.c \
+		${PATCHDIR}/extra-clang \
 		${PATCHDIR}/extra-i915kms
 LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
-INTEL_REVISION=	4
+INTEL_REVISION=	5
 PLIST_SUB+=	OLD=""
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index 79dca8e997e0..e1360d7a8ea0 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.21.9.tar.bz2) = 1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189
-SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) = 1735037
+SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc
+SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 1977431
diff --git a/x11-drivers/xf86-video-intel/files/extra-clang b/x11-drivers/xf86-video-intel/files/extra-clang
index bb499458d41e..924f27d48cef 100644
--- a/x11-drivers/xf86-video-intel/files/extra-clang
+++ b/x11-drivers/xf86-video-intel/files/extra-clang
@@ -1,27 +1,15 @@
---- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
-+++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
-@@ -1691,7 +1691,7 @@
- static drmModeEncoderPtr
- intel_get_kencoder(struct intel_mode *mode, int num)
+--- src/sna/sna_cpu.c.orig	2013-08-14 12:04:40.231041285 +0200
++++ src/sna/sna_cpu.c	2013-08-14 12:05:51.237030719 +0200
+@@ -41,6 +41,7 @@
  {
--	struct intel_output *iterator;
-+	struct intel_output *iterator = NULL;
- 	int id = mode->mode_res->encoders[num];
+ 	unsigned max = __get_cpuid_max(BASIC_CPUID, NULL);
+ 	unsigned int eax, ebx, ecx, edx;
++	eax = ebx = ecx = edx = 0;
+ 	unsigned features = 0;
+ 	unsigned extra = 0;
  
- 	list_for_each_entry(iterator, &mode->outputs, link)
---- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
-+++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
-@@ -119,7 +119,7 @@
- static void intel_batch_do_flush(ScrnInfoPtr scrn)
- {
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
--	struct intel_pixmap *priv;
-+	struct intel_pixmap *priv = NULL;
- 
- 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
- 		priv->dirty = 0;
---- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
-+++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
+--- src/sna/sna_damage.c.orig	2013-08-14 12:06:26.381036854 +0200
++++ src/sna/sna_damage.c	2013-08-14 12:07:23.684023065 +0200
 @@ -410,7 +410,7 @@
  	int n, nboxes;
  	BoxPtr boxes, free_boxes = NULL;
@@ -31,7 +19,7 @@
  
  	assert(damage->mode != DAMAGE_ALL);
  	assert(damage->dirty);
-@@ -1671,7 +1671,7 @@
+@@ -1709,7 +1709,7 @@
  {
  	int n, nboxes;
  	BoxPtr boxes;
@@ -40,8 +28,30 @@
  
  	RegionCopy(r, &damage->region);
  	if (!damage->dirty)
---- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
-+++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
+--- src/uxa/intel_batchbuffer.c.orig	2013-08-14 12:08:14.323028320 +0200
++++ src/uxa/intel_batchbuffer.c	2013-08-14 12:08:37.202016923 +0200
+@@ -141,7 +141,7 @@
+ static void intel_batch_do_flush(ScrnInfoPtr scrn)
+ {
+ 	intel_screen_private *intel = intel_get_screen_private(scrn);
+-	struct intel_pixmap *priv;
++	struct intel_pixmap *priv = NULL;
+ 
+ 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
+ 		priv->dirty = 0;
+--- src/uxa/intel_display.c.orig	2013-08-14 12:09:25.802015629 +0200
++++ src/uxa/intel_display.c	2013-08-14 12:09:51.034009844 +0200
+@@ -1753,7 +1753,7 @@
+ static drmModeEncoderPtr
+ intel_get_kencoder(struct intel_mode *mode, int num)
+ {
+-	struct intel_output *iterator;
++	struct intel_output *iterator = NULL;
+ 	int id = mode->mode_res->encoders[num];
+ 
+ 	list_for_each_entry(iterator, &mode->outputs, link)
+--- src/uxa/uxa-accel.c.orig	2013-08-14 12:02:11.898048975 +0200
++++ src/uxa/uxa-accel.c	2013-08-14 12:03:39.336042139 +0200
 @@ -944,7 +944,7 @@
  
  	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
diff --git a/x11-drivers/xf86-video-intel/files/extra-i915kms b/x11-drivers/xf86-video-intel/files/extra-i915kms
index c900909f7747..b5d43c6deecd 100644
--- a/x11-drivers/xf86-video-intel/files/extra-i915kms
+++ b/x11-drivers/xf86-video-intel/files/extra-i915kms
@@ -1,13 +1,13 @@
---- 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);
+--- src/intel_device.c.orig	2013-06-30 16:03:51.000000000 +0200
++++ src/intel_device.c	2013-07-02 14:08:34.903060688 +0200
+@@ -94,8 +94,8 @@
+ 			 pci->domain, pci->bus, pci->dev, pci->func);
  
- 	ret = drmCheckModesettingSupported(id);
--	if (ret) {
--		if (xf86LoadKernelModule("i915"))
-+	if (ret || 1) {
-+		if (xf86LoadKernelModule("i915kms"))
- 			ret = drmCheckModesettingSupported(id);
- 		if (ret)
- 			return FALSE;
+ 		ret = drmCheckModesettingSupported(id);
+-		if (ret) {
+-			if (xf86LoadKernelModule("i915"))
++		if (ret || 1) {
++			if (xf86LoadKernelModule("i915kms"))
+ 				ret = drmCheckModesettingSupported(id);
+ 			if (ret)
+ 				return -1;
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
deleted file mode 100644
index 47131740bc6c..000000000000
--- a/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
-+++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
-@@ -37,7 +37,6 @@
- #define must_check __attribute__((warn_unused_result))
- #define constant __attribute__((const))
- #define pure __attribute__((pure))
--#define __packed__ __attribute__((__packed__))
- #define flatten __attribute__((flatten))
- #else
- #define likely(expr) (expr)
-@@ -48,7 +47,6 @@
- #define must_check
- #define constant
- #define pure
--#define __packed__
- #define flatten
- #endif
- 
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
index 9771d08562b3..39f3729e83be 100644
--- a/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
@@ -1,18 +1,14 @@
---- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
-+++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
-@@ -658,7 +658,11 @@
- 	if (file) {
- 		size_t len = 0;
- 		char *line = NULL;
-+#ifdef __GLIBC__
- 		while (getline(&line, &len, file) != -1) {
-+#else
-+		while ((line = fgetln(file, &len)) != (char *) NULL) {
-+#endif
- 			int mb;
- 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
- 				/* Paranoid check against gargantuan caches */
-@@ -1666,7 +1670,8 @@
+--- src/sna/kgem.c.orig	2013-08-04 11:10:59.000000000 +0200
++++ src/sna/kgem.c	2013-08-14 11:59:14.787060294 +0200
+@@ -25,6 +25,7 @@
+  *
+  */
+ 
++#define _WITH_GETLINE
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+@@ -1890,7 +1891,8 @@
  static struct kgem_bo *
  search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
  {
@@ -22,7 +18,7 @@
  
  	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
  
-@@ -1868,7 +1873,8 @@
+@@ -2104,7 +2106,8 @@
  
  static bool kgem_retire__flushing(struct kgem *kgem)
  {
@@ -32,7 +28,7 @@
  	bool retired = false;
  
  	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
-@@ -2073,7 +2079,8 @@
+@@ -2309,7 +2312,8 @@
  static void kgem_commit(struct kgem *kgem)
  {
  	struct kgem_request *rq = kgem->next_request;
@@ -42,7 +38,7 @@
  
  	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
  		assert(next->request.prev == &bo->request);
-@@ -2154,7 +2161,8 @@
+@@ -2390,7 +2394,8 @@
  
  static void kgem_finish_buffers(struct kgem *kgem)
  {
@@ -51,8 +47,8 @@
 +	struct kgem_buffer *next;
  
  	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
- 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
-@@ -2963,7 +2971,8 @@
+ 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%s\n",
+@@ -3252,7 +3257,8 @@
  static struct kgem_bo *
  search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
  {
@@ -62,7 +58,7 @@
  	bool use_active = (flags & CREATE_INACTIVE) == 0;
  	struct list *cache;
  
-@@ -3521,7 +3530,7 @@
+@@ -3855,7 +3861,7 @@
  			       uint32_t flags)
  {
  	struct list *cache;
@@ -71,7 +67,7 @@
  	uint32_t pitch, tiled_height, size;
  	uint32_t handle;
  	int i, bucket, retry;
-@@ -4834,7 +4843,7 @@
+@@ -5302,7 +5308,7 @@
  void kgem_clear_dirty(struct kgem *kgem)
  {
  	struct list * const buffers = &kgem->next_request->buffers;
@@ -79,8 +75,8 @@
 +	struct kgem_bo *bo = NULL;
  
  	list_for_each_entry(bo, buffers, request) {
- 		if (!bo->dirty)
-@@ -5072,7 +5081,7 @@
+ 		if (!bo->gpu_dirty)
+@@ -5578,7 +5584,7 @@
  				   uint32_t size, uint32_t flags,
  				   void **ret)
  {