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!

1 files changed, 0 insertions, 38 deletions

diff --git a/graphics/libGL/files/extra-src_glx_XF86dri.c b/graphics/libGL/files/extra-src_glx_XF86dri.c
deleted file mode 100644
index 42319b8abb6e..000000000000
--- a/graphics/libGL/files/extra-src_glx_XF86dri.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/glx/XF86dri.c.orig	2012-10-24 19:03:59.000000000 +0000
-+++ src/glx/XF86dri.c	2013-05-29 10:07:33.000000000 +0000
-@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #include <X11/extensions/Xext.h>
- #include <X11/extensions/extutil.h>
- #include "xf86dristr.h"
-+#include <limits.h>
- 
- static XExtensionInfo _xf86dri_info_data;
- static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
-@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int
-    }
- 
-    if (rep.length) {
--      if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) {
-+      if (rep.busIdStringLength < INT_MAX)
-+	 *busIdString = Xcalloc(rep.busIdStringLength + 1, 1);
-+      else
-+	 *busIdString = NULL;
-+      if (*busIdString == NULL) {
-          _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
-          UnlockDisplay(dpy);
-          SyncHandle();
-@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy
-    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
- 
-    if (rep.length) {
--      if (!
--          (*clientDriverName =
--           (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
-+      if (rep.clientDriverNameLength < INT_MAX)
-+	 *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1);
-+      else
-+	 *clientDriverName = NULL;
-+      if (*clientDriverName == NULL) {
-          _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
-          UnlockDisplay(dpy);
-          SyncHandle();