[79254] trunk/dports/x11/mesa

[jeremyhu at macports.org]

Revision: 79254
          http://trac.macports.org/changeset/79254
Author:   jeremyhu at macports.org
Date:     2011-06-06 19:32:49 -0700 (Mon, 06 Jun 2011)
Log Message:
-----------
mesa: Fix +iglx variant to actually build indirect rather than direct

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Added Paths:
-----------
    trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2011-06-07 02:23:54 UTC (rev 79253)
+++ trunk/dports/x11/mesa/Portfile	2011-06-07 02:32:49 UTC (rev 79254)
@@ -10,6 +10,7 @@
 # xquartz-dev mailing list, and let us know why.
 
 version             7.10.2
+revision            1
 categories          x11 graphics
 maintainers         jeremyhu openmaintainer
 description         Mesa 3D Graphics Library
@@ -96,9 +97,6 @@
 }
 
 post-patch {
-	# http://trac.macports.org/ticket/24337
-	reinplace "/SRC_DIRS/ s/glew//g" ${worksrcpath}/configs/darwin
-
 	# Ensure correct compilers are used in mklib.
 	reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx}\":"  ${worksrcpath}/bin/mklib
 	reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":"    ${worksrcpath}/bin/mklib
@@ -112,19 +110,8 @@
 	}
 }
 
-post-destroot {
-	# http://trac.macports.org/ticket/24337
-	# http://trac.macports.org/ticket/24349
-	# mesa just installs all headers from GL/*.h
-	#delete "${destroot}${prefix}/include/GL/glew.h"
-	#delete "${destroot}${prefix}/include/GL/glxew.h"
-	#delete "${destroot}${prefix}/include/GL/wglew.h"
-}
-
 variant iglx description {Install a libGL that uses your X11 server's indirect GLX path for rendering (the default is off which allows libGL to accelerate rendering using OpenGL.framework)} {
-	post-patch {
-	        reinplace "s:src/glx/apple:src/glx:" ${worksrcpath}/configs/darwin
-	}
+    patchfiles-append mesa-7.10.2-iglx.patch
 }
 
 platform darwin 8 {

Added: trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch
===================================================================
--- trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch	2011-06-07 02:32:49 UTC (rev 79254)
@@ -0,0 +1,23 @@
+diff --git a/configs/darwin b/configs/darwin
+index 3cf1110..aa5a22c 100644
+--- a/configs/darwin
++++ b/configs/darwin
+@@ -13,8 +13,7 @@ CC = gcc
+ CXX = g++
+ PIC_FLAGS = -fPIC
+ DEFINES =  -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
+-	   -DGLX_ALIAS_UNSUPPORTED \
+-	   -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
++	   -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
+ 
+ # -DGLX_INDIRECT_RENDERING \
+ 
+@@ -54,7 +53,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X
+ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
+ 
+ # omit glw lib for now:
+-SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx
++SRC_DIRS = glsl mapi/glapi mapi/vgapi glx mesa gallium glu glut/glx
+ GLU_DIRS = sgi
+ DRIVER_DIRS = osmesa
+ #DRIVER_DIRS = dri
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110606/e55fb3d1/attachment.html>