ports/139011: [patch] Add options to support GLX TLS in x11-servers/xorg-server

[Peter Jeremy]

>Number:         139011
>Category:       ports
>Synopsis:       [patch]  Add options to support GLX TLS in x11-servers/xorg-server
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 21 12:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Peter Jeremy
>Release:        FreeBSD 8.0-BETA4 amd64
>Organization:
n/a
>Environment:
System: FreeBSD server.vk2pj.dyndns.org 8.0-BETA4 FreeBSD 8.0-BETA4 #1: Fri Sep 18 09:11:01 EST 2009 root at server.vk2pj.dyndns.org:/tank/obj/usr/src/sys/server amd64

>Description:
	The X.org 7.4 server expects to be multi-threaded but unless it
	is compiled with HAL enabled, it will not link against libpthread.
	Whilst this does not cause compilation errors, it will result in
	various runtime anomolies - the exact problems depend on the
	specific driver but the Intel driver is particularly badly
	affected.  Enabling GLX Thread Local Storage appears to be the
	correct work-around for this issue.

>How-To-Repeat:
	Build xorg-server without HAL and use with an Intel driver on
	(eg) i945 GPU.  Switch to/from VTYs and watch the display
	break.
>Fix:
Index: x11-servers/xorg-server/Makefile
===================================================================
RCS file: /usr/ncvs/ports/x11-servers/xorg-server/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- x11-servers/xorg-server/Makefile	19 Jun 2009 23:19:01 -0000	1.73
+++ x11-servers/xorg-server/Makefile	20 Jun 2009 14:32:10 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	xorg-server
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
@@ -50,6 +51,7 @@
 
 OPTIONS=	HAL	"Compile with HAL config support" on \
 		AIGLX	"Compile with Accelerated Indirect GLX support" on \
+		GLX_TLS	"Compile with GLX Thread Local Storage" on \
 		SUID	"Install the Xorg server with setuid bit set" on
 
 .include <bsd.port.pre.mk>
@@ -74,6 +76,12 @@
 CONFIGURE_ARGS+=	--enable-aiglx=no
 .endif
 
+.if !defined(WITHOUT_GLX_TLS)
+CONFIGURE_ARGS+=	--enable-glx-tls=yes
+.else
+CONFIGURE_ARGS+=	--enable-glx-tls=no
+.endif
+
 .if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
 CONFIGURE_ARGS+=--enable-install-setuid=yes
 .else
>Release-Note:
>Audit-Trail:
>Unformatted: