svn commit: r416285 - in head/graphics/libGL: . files

[Koop Mast]

Author: kwm
Date: Thu Jun  2 18:09:35 2016
New Revision: 416285
URL: https://svnweb.freebsd.org/changeset/ports/416285

Log:
  Update Mesa to 11.2.2.
  
  Future mesa version will drop the glx-tls configure switch. This is by
  default disabled on !linux and when the configure switch is dropped
  glx-tls will be enabled always. Add a blob explaining why, we can't
  enable this on FreeBSD yet. We might need to backport some patches
  until we can.
  
  Obtained from:	graphics team development repo.

Deleted:
  head/graphics/libGL/files/patch-src__gallium__state_trackers__clover__Makefile.in
Modified:
  head/graphics/libGL/Makefile.common
  head/graphics/libGL/distinfo

Modified: head/graphics/libGL/Makefile.common
==============================================================================
--- head/graphics/libGL/Makefile.common	Thu Jun  2 15:53:10 2016	(r416284)
+++ head/graphics/libGL/Makefile.common	Thu Jun  2 18:09:35 2016	(r416285)
@@ -18,7 +18,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	11.1.2
+MESABASEVERSION=	11.2.2
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -31,7 +31,7 @@ MAINTAINER=	x11 at FreeBSD.org
 BUILD_DEPENDS+=	makedepend:devel/makedepend
 LIB_DEPENDS+=	libdevq.so:devel/libdevq
 
-USES+=		compiler:c++11-lib gettext-tools gmake libtool \
+USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
 		pathfix pkgconfig python:2,build shebangfix tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -55,7 +55,7 @@ python_OLD_CMD=	"/usr/bin/env[[:space:]]
 python_CMD=	${LOCALBASE}/bin/python2
 SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
 		src/gallium/drivers/svga/svgadump/svga_dump.py \
-		src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py
+		src/mapi/glapi/gen/*.py
 SHEBANG_FILES+=	src/mapi/mapi_abi.py
 
 MASTERDIR=		${.CURDIR}/../../graphics/libGL
@@ -76,6 +76,14 @@ CONFIGURE_ARGS+=	--disable-dri3
 
 CONFIGURE_ARGS+=	--enable-gbm
 
+# There are issues that need to be fixed to use TLS model "initial-exec"
+# So stick with "global-dynamic"'s model for now. kan@ is working on a
+# patch for rtld. We might want to backport global-dynamic or
+# pthread_setspecific which it uses now by default. But since this
+# configure switch is going away ...
+# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
+#CONFIGURE_ARGS+=	--enable-glx-tls
+
 # libEGL, dri and clover need gallium enabled.
 # the third option in --with-egl-platforms is wayland.
 CONFIGURE_ARGS+=	--enable-egl --with-egl-platforms=x11,drm

Modified: head/graphics/libGL/distinfo
==============================================================================
--- head/graphics/libGL/distinfo	Thu Jun  2 15:53:10 2016	(r416284)
+++ head/graphics/libGL/distinfo	Thu Jun  2 18:09:35 2016	(r416285)
@@ -1,2 +1,2 @@
-SHA256 (mesa-11.1.2.tar.xz) = 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b
-SIZE (mesa-11.1.2.tar.xz) = 7561920
+SHA256 (mesa-11.2.2.tar.xz) = 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4
+SIZE (mesa-11.2.2.tar.xz) = 7860932