svn commit: r373491 - in head/graphics: dri libEGL libGL libglesv2

[Koop Mast]

Author: kwm
Date: Thu Nov 27 14:48:48 2014
New Revision: 373491
URL: https://svnweb.freebsd.org/changeset/ports/373491
QAT: https://qat.redports.org/buildarchive/r373491/

Log:
  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

Modified:
  head/graphics/dri/Makefile
  head/graphics/libEGL/Makefile
  head/graphics/libGL/Makefile
  head/graphics/libGL/bsd.mesalib.mk
  head/graphics/libGL/distinfo
  head/graphics/libglesv2/Makefile

Modified: head/graphics/dri/Makefile
==============================================================================
--- head/graphics/dri/Makefile	Thu Nov 27 14:23:07 2014	(r373490)
+++ head/graphics/dri/Makefile	Thu Nov 27 14:48:48 2014	(r373491)
@@ -16,6 +16,7 @@ USE_XORG=	glproto x11 xext xxf86vm xdama
 		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 su
 .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

Modified: head/graphics/libEGL/Makefile
==============================================================================
--- head/graphics/libEGL/Makefile	Thu Nov 27 14:23:07 2014	(r373490)
+++ head/graphics/libEGL/Makefile	Thu Nov 27 14:48:48 2014	(r373491)
@@ -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

Modified: head/graphics/libGL/Makefile
==============================================================================
--- head/graphics/libGL/Makefile	Thu Nov 27 14:23:07 2014	(r373490)
+++ head/graphics/libGL/Makefile	Thu Nov 27 14:48:48 2014	(r373491)
@@ -19,7 +19,7 @@ USE_XORG=	glproto x11 xext xxf86vm xdama
 .include "${.CURDIR}/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLREVISION=	1
+LIBGLREVISION=	0
 .else
 LIBGLREVISION=	4
 .endif

Modified: head/graphics/libGL/bsd.mesalib.mk
==============================================================================
--- head/graphics/libGL/bsd.mesalib.mk	Thu Nov 27 14:23:07 2014	(r373490)
+++ head/graphics/libGL/bsd.mesalib.mk	Thu Nov 27 14:48:48 2014	(r373491)
@@ -28,7 +28,7 @@ MESAVERSION=	${MESABASEVERSION}${MESASUB
 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=	
 

Modified: head/graphics/libGL/distinfo
==============================================================================
--- head/graphics/libGL/distinfo	Thu Nov 27 14:23:07 2014	(r373490)
+++ head/graphics/libGL/distinfo	Thu Nov 27 14:48:48 2014	(r373491)
@@ -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

Modified: head/graphics/libglesv2/Makefile
==============================================================================
--- head/graphics/libglesv2/Makefile	Thu Nov 27 14:23:07 2014	(r373490)
+++ head/graphics/libglesv2/Makefile	Thu Nov 27 14:48:48 2014	(r373491)
@@ -20,7 +20,7 @@ USE_XORG+=	glproto dri2proto xext xdamag
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLES_REVISION=	1
+LIBGLES_REVISION=	0
 .else
 LIBGLES_REVISION=	4
 .endif