diff --git a/xorg/mesa/build b/xorg/mesa/build
index 9eaf2414..f7c4b3e2 100755
--- a/xorg/mesa/build
+++ b/xorg/mesa/build
@@ -2,12 +2,15 @@
 
 patch -p1 < mesa-no-gettext.patch
 
+export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS"
+
 meson \
     --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --localstatedir=/var \
     --buildtype=release \
+    -Dglx-use-tls=false \
     -Dplatforms=x11,drm \
     . output
 
diff --git a/xorg/mesa/version b/xorg/mesa/version
index 6db232b7..11a6cf80 100644
--- a/xorg/mesa/version
+++ b/xorg/mesa/version
@@ -1 +1 @@
-19.1.1 1
+19.1.1 2