From 920e79368abf25b0fecd9facd9843d35d0fe8632 Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Thu, 27 Nov 2014 14:48:48 +0000
Subject: [PATCH] Update to 10.3.4.

Enable TEXTURE option in dri by default [1]. This allows for OpenGL higher
  then 2.1 to be supported.
Make sure we depend on llvm at run time when gallium is enabled.
  The gallium based modules link to the llvm shared libraries. [2]

PR:		followup on 194655 [2]
Approved by:	core@ [1]
Obtained from:	xorg-dev repo
---
 graphics/dri/Makefile         | 3 ++-
 graphics/libEGL/Makefile      | 2 +-
 graphics/libGL/Makefile       | 2 +-
 graphics/libGL/bsd.mesalib.mk | 2 +-
 graphics/libGL/distinfo       | 4 ++--
 graphics/libglesv2/Makefile   | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 2d5976a92ef0..bf658cdf3387 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -16,6 +16,7 @@ USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
 		presentproto xvmc xshmfence
 
 OPTIONS_DEFINE=	TEXTURE
+OPTIONS_DEFAULT=TEXTURE
 
 OPTIONS_DEFINE_i386=	GALLIUM
 OPTIONS_DEFAULT_i386=	GALLIUM
@@ -70,6 +71,7 @@ DRI_LLVM_VER=	33
 . endif
 
 BUILD_DEPENDS+=	llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER}
+RUN_DEPENDS+=	llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER}
 CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${DRI_LLVM_VER}
 
 CONFIGURE_ARGS+=--enable-gallium-llvm \
@@ -92,7 +94,6 @@ IGNORE=	VDPAU option requires GALLIUM support to be enabled
 .endif
 CONFIGURE_ARGS+=--enable-vdpau
 LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
-RUN_DEPENDS+=	llvm${DRI_LLVM_VER}:${PORTSDIR}/devel/llvm${DRI_LLVM_VER}
 PLIST_SUB+=	VDPAU=""
 .else
 CONFIGURE_ARGS+=--disable-vdpau
diff --git a/graphics/libEGL/Makefile b/graphics/libEGL/Makefile
index 74871e6eff84..bc8caf98dacb 100644
--- a/graphics/libEGL/Makefile
+++ b/graphics/libEGL/Makefile
@@ -31,7 +31,7 @@ INSTALL_WRKSRC=	${WRKSRC}/src/egl
 .endif
 
 .if defined(WITH_NEW_MESA)
-LIBEGL_REVISION=	1
+LIBEGL_REVISION=	0
 .else
 LIBEGL_REVISION=	5
 .endif
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 15dc280efd5f..ea8a65ddb561 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -19,7 +19,7 @@ USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
 .include "${.CURDIR}/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLREVISION=	1
+LIBGLREVISION=	0
 .else
 LIBGLREVISION=	4
 .endif
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 263850801df7..bfffeb0143c3 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -28,7 +28,7 @@ MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 .if defined(WITH_NEW_MESA)
-MESABASEVERSION=	10.3.3
+MESABASEVERSION=	10.3.4
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=	
 
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index 9769cdd52bc4..039be81b8274 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,4 +1,4 @@
 SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0
 SIZE (MesaLib-9.1.7.tar.bz2) = 6134393
-SHA256 (MesaLib-10.3.3.tar.bz2) = 0e4eee4a2ddf86456eed2fc44da367f95471f74249636710491e85cc256c4753
-SIZE (MesaLib-10.3.3.tar.bz2) = 7282929
+SHA256 (MesaLib-10.3.4.tar.bz2) = e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a
+SIZE (MesaLib-10.3.4.tar.bz2) = 7282053
diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile
index d5a66f7187fc..a824eed359c4 100644
--- a/graphics/libglesv2/Makefile
+++ b/graphics/libglesv2/Makefile
@@ -20,7 +20,7 @@ USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLES_REVISION=	1
+LIBGLES_REVISION=	0
 .else
 LIBGLES_REVISION=	4
 .endif