4 files changed, 22 insertions, 19 deletions

diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common
index bc2f9988a2c3..8217287e9af8 100644
--- a/graphics/libGL/Makefile.common
+++ b/graphics/libGL/Makefile.common
@@ -18,7 +18,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	10.6.9
+MESABASEVERSION=	11.0.6
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -78,6 +78,9 @@ CONFIGURE_ARGS+=	--enable-gbm
 # the third option in --with-egl-platforms is wayland.
 CONFIGURE_ARGS+=	--enable-egl --with-egl-platforms=x11,drm
 
+# we don't care about GLes v1
+CONFIGURE_ARGS+=	--disable-gles1
+
 CONFIGURE_ARGS+=	--enable-gles2
 
 # Clover (OpenCL).
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index b5bf13b0a017..2fe5c4cd185e 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mesa-10.6.9.tar.xz) = b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3
-SIZE (mesa-10.6.9.tar.xz) = 7041588
+SHA256 (mesa-11.0.6.tar.xz) = 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760
+SIZE (mesa-11.0.6.tar.xz) = 7272972
diff --git a/graphics/libGL/files/patch-src__loader__Makefile.in b/graphics/libGL/files/patch-src__loader__Makefile.in
index f4e3d463cc80..9b46a2483982 100644
--- a/graphics/libGL/files/patch-src__loader__Makefile.in
+++ b/graphics/libGL/files/patch-src__loader__Makefile.in
@@ -1,12 +1,11 @@
---- src/loader/Makefile.in.orig	2015-06-16 04:57:13.615972000 -0400
-+++ src/loader/Makefile.in	2015-06-16 04:59:22.244911000 -0400
-@@ -514,7 +514,8 @@
+--- src/loader/Makefile.in.orig	2015-08-24 10:41:51.309456000 +0200
++++ src/loader/Makefile.in	2015-08-24 10:42:39.452059000 +0200
+@@ -505,7 +505,7 @@
  noinst_LTLIBRARIES = libloader.la
  libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \
  	-I$(top_srcdir)/src $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) \
--	$(am__append_1) $(am__append_3) $(am__append_4)
-+	$(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_3) \
-+	$(am__append_4)
+-	$(am__append_1) $(am__append_3)
++	$(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_3)
  libloader_la_SOURCES = $(LOADER_C_FILES)
- libloader_la_LIBADD = $(am__append_2) $(am__append_5)
+ libloader_la_LIBADD = $(am__append_2) $(am__append_4)
  all: all-am
diff --git a/graphics/libGL/files/patch-src__loader__loader.c b/graphics/libGL/files/patch-src__loader__loader.c
index ea8ae2b2ce6e..01def0be9f5b 100644
--- a/graphics/libGL/files/patch-src__loader__loader.c
+++ b/graphics/libGL/files/patch-src__loader__loader.c
@@ -1,6 +1,6 @@
---- src/loader/loader.c.orig	2014-08-21 01:27:47.000000000 +0200
-+++ src/loader/loader.c	2014-09-04 19:57:56.384142575 +0200
-@@ -67,7 +67,7 @@
+--- src/loader/loader.c.orig	2015-08-22 12:01:00.000000000 +0200
++++ src/loader/loader.c	2015-08-24 10:50:05.251081000 +0200
+@@ -70,7 +70,7 @@
  #include <stdarg.h>
  #include <stdio.h>
  #include <string.h>
@@ -8,8 +8,8 @@
 +#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ)
  #include <assert.h>
  #include <dlfcn.h>
- #include <fcntl.h>
-@@ -488,6 +488,53 @@
+ #include <unistd.h>
+@@ -505,6 +505,54 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
  }
  #endif
  
@@ -60,10 +60,11 @@
 +
 +#endif
 +
- #if !defined(__NOT_HAVE_DRM_H)
++
+ #if defined(HAVE_LIBDRM)
  /* for i915 */
  #include <i915_drm.h>
-@@ -571,6 +618,10 @@
+@@ -588,6 +636,10 @@ loader_get_pci_id_for_fd(int fd, int *ve
     if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
        return 1;
  #endif
@@ -71,10 +72,10 @@
 +   if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id))
 +      return 1;
 +#endif
- #if !defined(__NOT_HAVE_DRM_H)
+ #if HAVE_LIBDRM
     if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
        return 1;
-@@ -665,6 +716,13 @@
+@@ -685,6 +737,13 @@ loader_get_device_name_for_fd(int fd)
     if ((result = sysfs_get_device_name_for_fd(fd)))
        return result;
  #endif