Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/mesagl/Makefile,v retrieving revision 1.78 diff -u -u -r1.78 Makefile --- Makefile 20 Nov 2009 22:53:05 -0000 1.78 +++ Makefile 5 Mar 2010 14:29:23 -0000 @@ -6,43 +6,36 @@ # PORTNAME= mesagl -PORTVERSION= 5.0.2 +PORTVERSION= 7.7 CATEGORIES= graphics -MASTER_SITES= SF/mesa3d/MesaLib/${PORTVERSION} \ - ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ - +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/ PKGNAMESUFFIX= -mangled DISTNAME= MesaLib-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A graphics library similar to SGI's OpenGL - mangled version +COMMENT= A graphics library similar to SGIs OpenGL - mangled version -USE_BZIP2= yes -USE_LDCONFIG= yes +MAKE_JOBS_UNSAFE= yes +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 + +USE_BZIP2= yes USE_XORG= xxf86vm xext xfixes xdamage xt USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} -GLINC= gl.h gl_mangle.h glu.h glu_mangle.h glx.h glx_mangle.h \ - glext.h glxext.h osmesa.h xmesa.h xmesa_x.h xmesa_xf86.h -GLLIB= GL GLU GLw OSMesa -GLVER= 14 -MAKEFILE= Makefile.X11 -ALL_TARGET= realclean freebsd -MAKE_JOBS_UNSAFE= yes +CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-expat=${LOCALBASE}/include \ + --enable-gl-osmesa \ + --with-driver=xlib \ + --with-osmesa-bits=32 +CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib do-install: - @${MKDIR} ${PREFIX}/include/Mesa/GL -.for i in ${GLINC} - @${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/Mesa/GL/ -.endfor - @${MKDIR} ${PREFIX}/lib -.for l in ${GLLIB} - @${INSTALL_DATA} ${WRKSRC}/lib/libMesa${l}.a ${PREFIX}/lib/ - @${INSTALL_DATA} ${WRKSRC}/lib/libMesa${l}.so.?.? ${PREFIX}/lib/libMesa${l}.so.${GLVER} - @${LN} -sf ${PREFIX}/lib/libMesa${l}.so.${GLVER} ${PREFIX}/lib/libMesa${l}.so -.endfor + cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${PREFIX}/lib + cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \* ${PREFIX}/include/Mesa/GL .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/mesagl/distinfo,v retrieving revision 1.27 diff -u -u -r1.27 distinfo --- distinfo 30 Oct 2008 13:07:22 -0000 1.27 +++ distinfo 5 Mar 2010 08:42:57 -0000 @@ -1,3 +1,3 @@ -MD5 (MesaLib-5.0.2.tar.bz2) = 7b4bf9261657c2fca03796d4955e6f50 -SHA256 (MesaLib-5.0.2.tar.bz2) = e63d42092d65dac4d1b2493a5c14ec0bcb1d3b8dfe6769e0ca4914b559aa5eb3 -SIZE (MesaLib-5.0.2.tar.bz2) = 1719544 +MD5 (MesaLib-7.7.tar.bz2) = e3fa64a1508bc23dd9de9dd2cea7cfb1 +SHA256 (MesaLib-7.7.tar.bz2) = 6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a +SIZE (MesaLib-7.7.tar.bz2) = 5000637 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/mesagl/pkg-plist,v retrieving revision 1.25 diff -u -u -r1.25 pkg-plist --- pkg-plist 30 Oct 2008 13:07:22 -0000 1.25 +++ pkg-plist 5 Mar 2010 11:17:03 -0000 @@ -1,26 +1,38 @@ +lib/libMesaGL.so +lib/libMesaGL.so.1 +lib/libMesaGLU.so +lib/libMesaGLU.so.1 +lib/libMesaGLw.so +lib/libMesaGLw.so.1 +lib/libMesaOSMesa.so +lib/libMesaOSMesa.so.7 +lib/demodriver.so +lib/gallium/libMesaGL.so.1 +lib/gallium/libMesaGL.so +lib/libEGL.so +lib/libEGL.so.1 +include/Mesa/GL/dmesa.h +include/Mesa/GL/ggimesa.h include/Mesa/GL/gl.h include/Mesa/GL/gl_mangle.h +include/Mesa/GL/glext.h +include/Mesa/GL/glfbdev.h include/Mesa/GL/glu.h include/Mesa/GL/glu_mangle.h include/Mesa/GL/glx.h include/Mesa/GL/glx_mangle.h -include/Mesa/GL/glext.h include/Mesa/GL/glxext.h +include/Mesa/GL/internal/glcore.h +include/Mesa/GL/internal/dri_interface.h +include/Mesa/GL/internal/sarea.h +include/Mesa/GL/mesa_wgl.h +include/Mesa/GL/mglmesa.h include/Mesa/GL/osmesa.h -include/Mesa/GL/xmesa.h -include/Mesa/GL/xmesa_x.h -include/Mesa/GL/xmesa_xf86.h -lib/libMesaGL.a -lib/libMesaGL.so -lib/libMesaGL.so.14 -lib/libMesaGLU.a -lib/libMesaGLU.so -lib/libMesaGLU.so.14 -lib/libMesaGLw.a -lib/libMesaGLw.so -lib/libMesaGLw.so.14 -lib/libMesaOSMesa.a -lib/libMesaOSMesa.so -lib/libMesaOSMesa.so.14 +include/Mesa/GL/svgamesa.h +include/Mesa/GL/vms_x_fix.h +include/Mesa/GL/wglext.h +include/Mesa/GL/wmesa.h +@dirrm include/Mesa/GL/internal @dirrm include/Mesa/GL @dirrm include/Mesa +@dirrm lib/gallium Index: files/patch-Make-config =================================================================== RCS file: files/patch-Make-config diff -N files/patch-Make-config --- files/patch-Make-config 30 Oct 2008 13:07:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ ---- Make-config.orig 2003-09-03 09:29:56.000000000 -0500 -+++ Make-config 2008-07-16 18:25:59.000000000 -0500 -@@ -214,18 +214,18 @@ - - freebsd: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ -- "GL_LIB = libGL.a" \ -- "GLU_LIB = libGLU.a" \ -- "GLUT_LIB = libglut.a" \ -- "GLW_LIB = libGLw.a" \ -- "OSMESA_LIB = libOSMesa.a" \ -- "CC = gcc" \ -- "CPLUSPLUS = g++" \ -- "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \ -- "CCFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \ -+ "GL_LIB = libMesaGL.a" \ -+ "GLU_LIB = libMesaGLU.a" \ -+ "GLUT_LIB = libMesaGlut.a" \ -+ "GLW_LIB = libMesaGLw.a" \ -+ "OSMESA_LIB = libMesaOSMesa.a" \ -+ "CC ?= cc" \ -+ "CPLUSPLUS = ${CXX}" \ -+ "CFLAGS += -O2 -fPIC -I/usr/local/include -DUSE_MGL_NAMESPACE -DUSE_XSHM -DHZ=100" \ -+ "CCFLAGS += -O2 -fPIC -I/usr/local/include -DUSE_MGL_NAMESPACE -DUSE_XSHM -DHZ=100" \ - "GLUT_CFLAGS = -fexceptions" \ - "MAKELIB = ../bin/mklib.freebsd" \ -- "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" -+ "APP_LIB_DEPS = -L/usr/local/lib -lXext -lXmu -lXi -lX11 -lm" - - freebsd-386: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ Index: files/patch-configs_autoconf.in =================================================================== RCS file: files/patch-configs_autoconf.in diff -N files/patch-configs_autoconf.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configs_autoconf.in 5 Mar 2010 10:00:05 -0000 @@ -0,0 +1,19 @@ +--- configs/autoconf.in.orig 2010-03-05 10:58:12.000000000 +0100 ++++ configs/autoconf.in 2010-03-05 10:59:45.000000000 +0100 +@@ -40,11 +40,11 @@ + PYTHON_FLAGS = -t -O -O + + # Library names (base name) +-GL_LIB = GL +-GLU_LIB = GLU +-GLUT_LIB = glut +-GLW_LIB = GLw +-OSMESA_LIB = @OSMESA_LIB@ ++GL_LIB = MesaGL ++GLU_LIB = MesaGLU ++GLUT_LIB = Mesaglut ++GLW_LIB = MesaGLw ++OSMESA_LIB = Mesa@OSMESA_LIB@ + + # Library names (actual file names) + GL_LIB_NAME = @GL_LIB_NAME@ Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- files/patch-configure 30 Oct 2008 13:07:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ ---- configure.orig Fri Nov 7 12:00:34 2003 -+++ configure Thu Mar 2 16:13:38 2006 -@@ -1885,10 +1885,10 @@ - - # For Mesa-specific libs like libOSMesa. - LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0 # Mesa 5.0.2 --LIBGL_VERSION_INFO=5:${MESA_VERSION}:4 # OpenGL 1.4 --LIBGLU_VERSION_INFO=2:${MESA_VERSION}:1 # GLU 1.1 --SI_GLU_VERSION_INFO=4:${MESA_VERSION}:3 # GLU 1.3 --LIBGLUT_VERSION_INFO=10:1:7 # GLUT 3.7 -+LIBGL_VERSION_INFO=${GLVER}:0 -+LIBGLU_VERSION_INFO=${GLVER}:0 -+SI_GLU_VERSION_INFO=${GLVER}:0 -+LIBGLUT_VERSION_INFO=${GLUTVER}:0 - - - -@@ -7920,6 +7920,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8849,7 +8850,7 @@ - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -- CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS" -+ CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS" - THREAD_LIBS="$THREAD_LIBS -lpthread" - else - echo "$as_me: failed program was:" >&5 Index: files/patch-include+GL+glx_mangle.h =================================================================== RCS file: files/patch-include+GL+glx_mangle.h diff -N files/patch-include+GL+glx_mangle.h --- files/patch-include+GL+glx_mangle.h 30 Oct 2008 13:07:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,62 +0,0 @@ ---- include/GL/glx_mangle.h.orig 2008-07-15 00:24:26.000000000 -0500 -+++ include/GL/glx_mangle.h 2008-07-15 00:26:19.000000000 -0500 -@@ -51,5 +51,59 @@ - /* GLX 1.4 */ - #define glXGetProcAddress mglXGetProcAddress - -+/* ADDED by KSB@llnl for VisIt */ -+ -+#define glXAllocateMemoryNV mglXAllocateMemoryNV -+#define glXBindChannelToWindowSGIX mglXBindChannelToWindowSGIX -+#define glXBindSwapBarrierSGIX mglXBindSwapBarrierSGIX -+#define glXChannelRectSGIX mglXChannelRectSGIX -+#define glXChannelRectSyncSGIX mglXChannelRectSyncSGIX -+#define glXChooseFBConfig mglXChooseFBConfig -+#define glXChooseFBConfigSGIX mglXChooseFBConfigSGIX -+#define glXCreateContextWithConfigSGIX mglXCreateContextWithConfigSGIX -+#define glXCreateGLXPbufferSGIX mglXCreateGLXPbufferSGIX -+#define glXCreateGLXPixmapWithConfigSGIX mglXCreateGLXPixmapWithConfigSGIX -+#define glXCreateNewContext mglXCreateNewContext -+#define glXCreatePbuffer mglXCreatePbuffer -+#define glXCreatePixmap mglXCreatePixmap -+#define glXCreateWindow mglXCreateWindow -+#define glXCushionSGI mglXCushionSGI -+#define glXDestroyGLXPbufferSGIX mglXDestroyGLXPbufferSGIX -+#define glXDestroyPbuffer mglXDestroyPbuffer -+#define glXDestroyPixmap mglXDestroyPixmap -+#define glXDestroyWindow mglXDestroyWindow -+#define glXFreeContextEXT mglXFreeContextEXT -+#define glXFreeMemoryNV mglXFreeMemoryNV -+#define glXGetContextIDEXT mglXGetContextIDEXT -+#define glXGetCurrentDisplay mglXGetCurrentDisplay -+#define glXGetCurrentDisplayEXT mglXGetCurrentDisplayEXT -+#define glXGetCurrentReadDrawable mglXGetCurrentReadDrawable -+#define glXGetCurrentReadDrawableSGI mglXGetCurrentReadDrawableSGI -+#define glXGetFBConfigAttrib mglXGetFBConfigAttrib -+#define glXGetFBConfigAttribSGIX mglXGetFBConfigAttribSGIX -+#define glXGetFBConfigFromVisualSGIX mglXGetFBConfigFromVisualSGIX -+#define glXGetFBConfigs mglXGetFBConfigs -+#define glXGetProcAddressARB mglXGetProcAddressARB -+#define glXGetSelectedEvent mglXGetSelectedEvent -+#define glXGetSelectedEventSGIX mglXGetSelectedEventSGIX -+#define glXGetTransparentIndexSUN mglXGetTransparentIndexSUN -+#define glXGetVisualFromFBConfig mglXGetVisualFromFBConfig -+#define glXGetVisualFromFBConfigSGIX mglXGetVisualFromFBConfigSGIX -+#define glXImportContextEXT mglXImportContextEXT -+#define glXJoinSwapGroupSGIX mglXJoinSwapGroupSGIX -+#define glXMakeContextCurrent mglXMakeContextCurrent -+#define glXMakeCurrentReadSGI mglXMakeCurrentReadSGI -+#define glXQueryChannelDeltasSGIX mglXQueryChannelDeltasSGIX -+#define glXQueryChannelRectSGIX mglXQueryChannelRectSGIX -+#define glXQueryContext mglXQueryContext -+#define glXQueryContextInfoEXT mglXQueryContextInfoEXT -+#define glXQueryDrawable mglXQueryDrawable -+#define glXQueryGLXPbufferSGIX mglXQueryGLXPbufferSGIX -+#define glXQueryMaxSwapBarriersSGIX mglXQueryMaxSwapBarriersSGIX -+#define glXSelectEvent mglXSelectEvent -+#define glXSelectEventSGIX mglXSelectEventSGIX -+#define glXSet3DfxModeMESA mglXSet3DfxModeMESA -+#define glXSwapIntervalSGI mglXSwapIntervalSGI -+ - - #endif Index: files/patch-include_glx_mangle.h =================================================================== RCS file: files/patch-include_glx_mangle.h diff -N files/patch-include_glx_mangle.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-include_glx_mangle.h 5 Mar 2010 14:32:18 -0000 @@ -0,0 +1,62 @@ +--- include/GL/glx_mangle.h.orig 2010-03-05 15:31:17.000000000 +0100 ++++ include/GL/glx_mangle.h 2010-03-05 15:31:48.000000000 +0100 +@@ -26,6 +26,59 @@ + #ifndef GLX_MANGLE_H + #define GLX_MANGLE_H + ++/* ADDED by KSB@llnl for VisIt */ ++#define glXAllocateMemoryNV mglXAllocateMemoryNV ++#define glXBindChannelToWindowSGIX mglXBindChannelToWindowSGIX ++#define glXBindSwapBarrierSGIX mglXBindSwapBarrierSGIX ++#define glXChannelRectSGIX mglXChannelRectSGIX ++#define glXChannelRectSyncSGIX mglXChannelRectSyncSGIX ++#define glXChooseFBConfig mglXChooseFBConfig ++#define glXChooseFBConfigSGIX mglXChooseFBConfigSGIX ++#define glXCreateContextWithConfigSGIX mglXCreateContextWithConfigSGIX ++#define glXCreateGLXPbufferSGIX mglXCreateGLXPbufferSGIX ++#define glXCreateGLXPixmapWithConfigSGIX mglXCreateGLXPixmapWithConfigSGIX ++#define glXCreateNewContext mglXCreateNewContext ++#define glXCreatePbuffer mglXCreatePbuffer ++#define glXCreatePixmap mglXCreatePixmap ++#define glXCreateWindow mglXCreateWindow ++#define glXCushionSGI mglXCushionSGI ++#define glXDestroyGLXPbufferSGIX mglXDestroyGLXPbufferSGIX ++#define glXDestroyPbuffer mglXDestroyPbuffer ++#define glXDestroyPixmap mglXDestroyPixmap ++#define glXDestroyWindow mglXDestroyWindow ++#define glXFreeContextEXT mglXFreeContextEXT ++#define glXFreeMemoryNV mglXFreeMemoryNV ++#define glXGetContextIDEXT mglXGetContextIDEXT ++#define glXGetCurrentDisplay mglXGetCurrentDisplay ++#define glXGetCurrentDisplayEXT mglXGetCurrentDisplayEXT ++#define glXGetCurrentReadDrawable mglXGetCurrentReadDrawable ++#define glXGetCurrentReadDrawableSGI mglXGetCurrentReadDrawableSGI ++#define glXGetFBConfigAttrib mglXGetFBConfigAttrib ++#define glXGetFBConfigAttribSGIX mglXGetFBConfigAttribSGIX ++#define glXGetFBConfigFromVisualSGIX mglXGetFBConfigFromVisualSGIX ++#define glXGetFBConfigs mglXGetFBConfigs ++#define glXGetProcAddressARB mglXGetProcAddressARB ++#define glXGetSelectedEvent mglXGetSelectedEvent ++#define glXGetSelectedEventSGIX mglXGetSelectedEventSGIX ++#define glXGetTransparentIndexSUN mglXGetTransparentIndexSUN ++#define glXGetVisualFromFBConfig mglXGetVisualFromFBConfig ++#define glXGetVisualFromFBConfigSGIX mglXGetVisualFromFBConfigSGIX ++#define glXImportContextEXT mglXImportContextEXT ++#define glXJoinSwapGroupSGIX mglXJoinSwapGroupSGIX ++#define glXMakeContextCurrent mglXMakeContextCurrent ++#define glXMakeCurrentReadSGI mglXMakeCurrentReadSGI ++#define glXQueryChannelDeltasSGIX mglXQueryChannelDeltasSGIX ++#define glXQueryChannelRectSGIX mglXQueryChannelRectSGIX ++#define glXQueryContext mglXQueryContext ++#define glXQueryContextInfoEXT mglXQueryContextInfoEXT ++#define glXQueryDrawable mglXQueryDrawable ++#define glXQueryGLXPbufferSGIX mglXQueryGLXPbufferSGIX ++#define glXQueryMaxSwapBarriersSGIX mglXQueryMaxSwapBarriersSGIX ++#define glXSelectEvent mglXSelectEvent ++#define glXSelectEventSGIX mglXSelectEventSGIX ++#define glXSet3DfxModeMESA mglXSet3DfxModeMESA ++#define glXSwapIntervalSGI mglXSwapIntervalSGI ++ + #define glXChooseVisual mglXChooseVisual + #define glXCreateContext mglXCreateContext + #define glXDestroyContext mglXDestroyContext Index: files/patch-src+config.h =================================================================== RCS file: files/patch-src+config.h diff -N files/patch-src+config.h --- files/patch-src+config.h 30 Oct 2008 13:07:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ ---- src/config.h.orig 2008-07-15 00:16:29.000000000 -0500 -+++ src/config.h 2008-07-15 00:19:17.000000000 -0500 -@@ -118,8 +118,8 @@ - #define MAX_TEXTURE_UNITS 8 - - /* Maximum viewport/image size: */ --#define MAX_WIDTH 2048 --#define MAX_HEIGHT 2048 -+#define MAX_WIDTH 4096 -+#define MAX_HEIGHT 4096 - - /* Maxmimum size for CVA. May be overridden by the drivers. */ - #define MAX_ARRAY_LOCK_SIZE 3000 -@@ -162,7 +162,7 @@ - * rasterizer code. - */ - #ifndef DEFAULT_SOFTWARE_DEPTH_BITS --#define DEFAULT_SOFTWARE_DEPTH_BITS 16 -+#define DEFAULT_SOFTWARE_DEPTH_BITS 24 - #endif - #if DEFAULT_SOFTWARE_DEPTH_BITS <= 16 - #define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort Index: files/patch-src-mesa-main_config.h =================================================================== RCS file: files/patch-src-mesa-main_config.h diff -N files/patch-src-mesa-main_config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-mesa-main_config.h 5 Mar 2010 14:34:37 -0000 @@ -0,0 +1,11 @@ +--- src/mesa/main/config.h.orig 2010-03-05 15:33:54.000000000 +0100 ++++ src/mesa/main/config.h 2010-03-05 15:34:17.000000000 +0100 +@@ -277,7 +277,7 @@ + * Bits per depth buffer value (max is 32). + */ + #ifndef DEFAULT_SOFTWARE_DEPTH_BITS +-#define DEFAULT_SOFTWARE_DEPTH_BITS 16 ++#define DEFAULT_SOFTWARE_DEPTH_BITS 24 + #endif + /** Depth buffer data type */ + #if DEFAULT_SOFTWARE_DEPTH_BITS <= 16