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

[Koop Mast]

Author: kwm
Date: Tue Nov 26 20:58:53 2013
New Revision: 334972
URL: http://svnweb.freebsd.org/changeset/ports/334972

Log:
  Update to 9.1.7.
  
  Stagify, abuse stage dir and plist to only install files we want to install.
  So we don't have to do complex do-install anymore, yay.
  
  For the WITH_GALLIUM option we don't need llvm at run-time.
  
  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	Tue Nov 26 20:42:34 2013	(r334971)
+++ head/graphics/dri/Makefile	Tue Nov 26 20:58:53 2013	(r334972)
@@ -41,7 +41,6 @@ ALL_DRI_DRIVERS=I915 I965 R200 RADEON SW
 ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
 .endif
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 PLIST_SUB+=	VERSION=${MESADISTVERSION}
@@ -53,7 +52,6 @@ DRI_DRIVERS=	${ALL_DRI_DRIVERS}
 .if defined(WITH_NEW_XORG)
 . if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64)
 BUILD_DEPENDS+=	llvm-config33:${PORTSDIR}/devel/llvm33
-RUN_DEPENDS+=	llvm-config33:${PORTSDIR}/devel/llvm33
 CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33
 
 CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl
@@ -101,16 +99,4 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
-do-install:
-.if !defined(WITH_NEW_XORG)
-	(cd ${WRKSRC}/src/mesa && ${GMAKE} install-dri)
-.else
-	(cd ${WRKSRC}/src/mesa/libdricore && ${GMAKE} install)
-	(cd ${WRKSRC}/src/mesa/drivers/dri && ${GMAKE} install)
-. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64)
-	(cd ${WRKSRC}/src/gallium/drivers/radeon && ${GMAKE} install)
-	(cd ${WRKSRC}/src/gallium/targets && ${GMAKE} install)
-. endif
-.endif
-
 .include <bsd.port.mk>

Modified: head/graphics/libEGL/Makefile
==============================================================================
--- head/graphics/libEGL/Makefile	Tue Nov 26 20:42:34 2013	(r334971)
+++ head/graphics/libEGL/Makefile	Tue Nov 26 20:58:53 2013	(r334972)
@@ -20,8 +20,7 @@ USE_XORG+=	glproto dri2proto xext xdamag
 LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libdrm.so:${PORTSDIR}/graphics/libdrm
 
-NO_STAGE=	yes
-BUILD_WKRSRC=	${WRKSRC}/src/egl
+BUILD_WRKSRC=	${WRKSRC}/src/egl
 INSTALL_WRKSRC=	${WRKSRC}/src/egl
 
 WITH_NEW_XORG=	yes

Modified: head/graphics/libGL/Makefile
==============================================================================
--- head/graphics/libGL/Makefile	Tue Nov 26 20:42:34 2013	(r334971)
+++ head/graphics/libGL/Makefile	Tue Nov 26 20:58:53 2013	(r334972)
@@ -16,7 +16,6 @@ USE_XORG=	glproto x11 xext xxf86vm xdama
 
 SUB_FILES=	pkg-install pkg-deinstall
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
@@ -25,24 +24,6 @@ LIBGLREVISION=	0
 LIBGLREVISION=	4
 .endif
 
-do-install:
-.if ! defined(WITH_NEW_XORG)
-	${RM} -f ${WRKSRC}/include/GL/glu*.h
-	@${MKDIR} ${PREFIX}/lib/.libGL
-	cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
-.else
-	cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA
-	cd ${WRKSRC}/src/glx; ${GMAKE} install
-	${MKDIR} ${PREFIX}/include/GL
-	cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/
-	@${MKDIR} ${PREFIX}/lib/.libGL
-	${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/
-	${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/
-.endif
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include "${.CURDIR}/bsd.mesalib.mk"
 
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")

Modified: head/graphics/libGL/bsd.mesalib.mk
==============================================================================
--- head/graphics/libGL/bsd.mesalib.mk	Tue Nov 26 20:42:34 2013	(r334971)
+++ head/graphics/libGL/bsd.mesalib.mk	Tue Nov 26 20:58:53 2013	(r334972)
@@ -17,7 +17,7 @@ MESAVERSION=	${MESABASEVERSION}${MESASUB
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 .if defined(WITH_NEW_XORG)
-MESABASEVERSION=	9.1.6
+MESABASEVERSION=	9.1.7
 # if there is a subversion, include the '-' between 7.11-rc2 for example.
 MESASUBVERSION=		
 PLIST_SUB+=	OLD="@comment " NEW=""

Modified: head/graphics/libGL/distinfo
==============================================================================
--- head/graphics/libGL/distinfo	Tue Nov 26 20:42:34 2013	(r334971)
+++ head/graphics/libGL/distinfo	Tue Nov 26 20:58:53 2013	(r334972)
@@ -1,4 +1,4 @@
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-9.1.6.tar.bz2) = e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d
-SIZE (MesaLib-9.1.6.tar.bz2) = 6134267
+SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0
+SIZE (MesaLib-9.1.7.tar.bz2) = 6134393

Modified: head/graphics/libglesv2/Makefile
==============================================================================
--- head/graphics/libglesv2/Makefile	Tue Nov 26 20:42:34 2013	(r334971)
+++ head/graphics/libglesv2/Makefile	Tue Nov 26 20:58:53 2013	(r334972)
@@ -20,7 +20,6 @@ USE_XORG+=	glproto dri2proto xext xdamag
 
 BUILD_WKRSRC=	${WRKSRC}/src/mapi/es2api
 INSTALL_WRKSRC=	${WRKSRC}/src/mapi/es2api
-NO_STAGE=	yes
 
 # this library doesn't exist in Mesa 7.6 so use newer
 WITH_NEW_XORG=yes