summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-09-15 00:24:26 +0000
committertnn <tnn@pkgsrc.org>2015-09-15 00:24:26 +0000
commit450184775fa2cb88885fedac4c9fa7be875b4392 (patch)
treecee19a8e92421a7843744389f263df1b6cca32be /graphics
parent9e26ef839fd1da44ca4699e5bf9a789bd7ad462b (diff)
downloadpkgsrc-450184775fa2cb88885fedac4c9fa7be875b4392.tar.gz
Back out enablement of glx-tls for NetBSD. The x86_64 assembler code for the
tls dispatch table (entry_x86-64_tls.h) needs some additional fixes, but although I know the issue it is too hairy to attempt during freeze.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/Makefile4
-rw-r--r--graphics/MesaLib/options.mk4
2 files changed, 3 insertions, 5 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 74673cb353e..356d2434b10 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2015/09/12 16:50:24 tnn Exp $
+# $NetBSD: Makefile,v 1.109 2015/09/15 00:24:26 tnn Exp $
DISTNAME= mesa-10.6.7
-PKGREVISION= 1
+PKGREVISION= 2
PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
CATEGORIES= graphics x11
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index 3c89814f8ad..cc9c5369356 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.38 2015/09/13 12:32:14 bouyer Exp $
+# $NetBSD: options.mk,v 1.39 2015/09/15 00:24:26 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
PKG_SUPPORTED_OPTIONS= llvm dri
@@ -38,8 +38,6 @@ CONFIGURE_ARGS+= --enable-egl
# Use Thread Local Storage in GLX where it is supported by Mesa and works.
.if \
- !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
- !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \
!empty(MACHINE_PLATFORM:MLinux-*-i386) || \
!empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
!empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) || \