head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.16 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.14 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.12 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.10 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.8 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.6 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.4 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.2 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.5.0.10 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.8 pkgsrc-2008Q1:1.5.0.6 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.4 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.6 date 2008.07.27.00.03.42; author bjs; state dead; branches; next 1.5; 1.5 date 2007.08.13.11.18.38; author seb; state Exp; branches; next 1.4; 1.4 date 2007.08.12.15.14.47; author adam; state Exp; branches; next 1.3; 1.3 date 2006.01.19.12.53.17; author adam; state Exp; branches; next 1.2; 1.2 date 2004.10.26.13.57.47; author adam; state Exp; branches; next 1.1; 1.1 date 2004.01.20.02.48.33; author jschauma; state Exp; branches; next ; desc @@ 1.6 log @ Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically, lots of bug fixes; the intent of my update was mostly to fix problems with i915 and r300 dri drivers and to provide the best environment possible for the xorg server update to the 1.4 branch. Morever, many of our patches from pkgsrc, i.e. those removed in this commit, are now included upstream. Additionally, MesaDemos now builds. NOTES: - MesaLib now requires xf86driproto 2.0.4, as earlier versions install dri_interface.h, which is not correct. - glu now exports its symbols via libtool's -export-symfile. The symfile is generated pre-build--see glu/Makefile. - glxinfo/glxgears do not seem to need to be linked to libpthread, and this seems to cause problems on NetBSD with the new drm code. If I am wrong about this, please let me know. The only program that seems to need libpthread is glthreads in MesaDemos. @ text @$NetBSD: patch-ah,v 1.5 2007/08/13 11:18:38 seb Exp $ --- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 +++ configs/default @@@@ -14,10 +14,6 @@@@ MESA_TINY=1 DRM_SOURCE_PATH=$(TOP)/../drm # Compiler and flags -CC = cc -CXX = CC -CFLAGS = -O -CXXFLAGS = -O GLU_CFLAGS = # Misc tools and flags @@@@ -56,7 +52,7 @@@@ GLW_SOURCES = GLwDrawA.c # Directories LIB_DIR = $(TOP)/lib -INSTALL_PREFIX = /usr/local +INSTALL_PREFIX = ${PREFIX} SRC_DIRS = mesa glu glut/glx glw GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa @ 1.5 log @As discussed on tech-pkg@@ revert for now the last updates of the Mesa packages. Downgraded graphics/MesaLib to 6.4.2nb3 Downgraded graphics/glu to 6.4.2 Downgraded graphics/glut to 6.4.2 Downgraded graphics/glx-utils to 6.4.2 Downgraded graphics/MesaDemos to 6.4.2 Downgraded graphics/Mesa to 6.4.2 Approved byg agc@@. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $ @ 1.4 log @Changes 7.0.1: New features: * Added a bluegene-osmesa build config Bug fixes: * Added a few missing OpenGL 2.0 API entrypoints * Fixed glDrawPixels(GL_STENCIL_INDEX) pixel transfer * GLSL bug fix: added vec2(vec4) constructor * GLSL bug fix: .strq and .rgba writemasks didn't always work * Stencil pixel map didn't always work for glDrawPixels * Fixed polygon stipple bug in i915 driver * Binding a zero-sized texture didn't disable texturing * Queries of GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH didn't include the terminating zero * glXChooseFBConfig() in Xlib driver didn't handle GLX_STEREO flag properly * Fixed a GLSL function call bug * glPointParameteriv(GL_DISTANCE_ATTENUATION_EXT) didn't work * glGetAttribLocation() always returned 1 * Fixed a few memory-related bugs in GLU library Changes 7.0.0: New features: * OpenGL 2.0 and 2.1 API support. Bug fixes: * Fixed a few fog-related bugs. * Fixed broken GLSL mix() function. * Fixed broken GLSL exp() functions. * Fixed GLSL mod4(vec4, vec4) bug. * Implemented GLSL asin(), acos(), atan() functions. * Fixed an R300 driver bug that caused Xorg composite manager to crash * Fixed R300 vertex program/matrix bug * GLSL dFdx() and dFdy() work for fragment program inputs now (texcoords) * Specifying an invalid texture unit as a sampler could lead to a crash * The GLX protocol request for glXDestroyPBuffer() was incorrect * ARB vp state.light[n].half value was incorrect * Fixed a positional light source bug * Fixed point size attenuation problem * glPopAttrib didn't restore texture object's LOD bias * Fixed a TLS / TEXTREL problem @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configs/default.orig 2007-08-01 23:49:59.000000000 +0200 d5 1 a5 1 @@@@ -16,10 +16,6 @@@@ MESA_TINY=1 d16 1 a16 1 @@@@ -78,7 +74,7 @@@@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(G d18 7 a24 7 # Installation directories (for make install) -INSTALL_DIR = /usr/local +INSTALL_DIR = ${PREFIX} DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri # Where libGL will look for DRI hardware drivers @ 1.3 log @Changes 6.4: New: - Added a fast XOR line drawing function in Xlib driver - Added support for GL_ARB_texture_mirrored_repeat to savage driver (supported only on Savage4 hardware). Changes: - Mesa now packaged in three parts: Library, Demos and GLUT Bug fixes: - GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig - Some files were present multiple times in the 6.3.2 tarballs - r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207) - glxgears_fbconfig demo didn't work (bug 4237) - fixed bug when bilinear sampling 2d textures with borders - glXCreatePbuffer() could segfault instead of returning 0 (bug 4235) - fixed undefined frexp and rand in X.org libGLcore.a (bug 4242) - fixed a few problems with proxy color tables (bug 4270) - fixed precision problem in Z clearing (bug 4395) - glBitmap, glDraw/CopyPixels mistakenly generated selection hits - fixed potential segfault caused by reading pixels outside of renderbuffer bounds - glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB - fixed memory corruption bug involving software alpha buffers - glReadPixels clipped by window bounds was sometimes broken - glDraw/CopyPixels of stencil data ignored the stencil write mask - glReadPixels from a texture bound to a framebuffer object didn't work - glIsRender/FramebufferEXT weren't totally correct - fixed a number of point size attenuation/fade bugs - fixed glFogCoord bug 4729 - GLX encoding for transpose matrix functions was broken - fixed broken fragment program KIL and SWZ instructions - fragment programs that wrote result.depth.z didn't work Changes 6.4.1: Bug fixes: - redefining a vertex program string didn't take effect in TNL module - fixed occasional segfault upon vertex/fragment parsing error - vertex program LIT instruction didn't handle 0^0=1 correctly - fragment program fog option didn't work with glDrawPixels, glBitmap - USE_MGL_NAMESPACE didn't work for x86-64 - OSMesa demos were missing from previous release tarballs - fixed problem with float->ushort conversion in glClear (bug 4992) - popping of GL_EYE_PLANE texgen state was broken (bug 4996) - popping of GL_SPOT_DIRECTION light state was broken (bug 5005) - fixed occasional triangle color interpolation problem on VMS - work around invalid free() call (bug 5131) - fixed BSD X server compilation problem by including stdint.h @ text @d3 1 a3 1 --- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 d5 1 a5 1 @@@@ -14,10 +14,6 @@@@ MESA_TINY=1 d16 1 a16 1 @@@@ -56,7 +52,7 @@@@ GLW_SOURCES = GLwDrawA.c d18 7 a24 7 # Directories LIB_DIR = $(TOP)/lib -INSTALL_PREFIX = /usr/local +INSTALL_PREFIX = ${PREFIX} SRC_DIRS = mesa glu glut/glx glw GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa @ 1.2 log @Changes 6.2: New: - enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle) - updated Doxygen support (Jose Fonseca) Changes: - some GGI driver updates (Christoph Egger, bug 1025977) Bug fixes: - Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features - fixed a few compilation issues on IRIX - fixed a matrix classification bug (reported by Wes Bethel) - we weren't reseting the vertex/fragment program error state before parsing (Dave Reveman) - adjust texcoords for sampling texture rectangles (Dave Reveman) - glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented - repeated calls to glDeleteTexture(t) could lead to a crash - fixed potential ref count bugs in VBOs and vertex/fragment programs - spriteblast demo didn't handle window size changes correctly - glTexSubImage didn't handle pixels=NULL correctly for PBOs - fixed color index mode glDrawPixels bug (Karl Schultz) Changes 6.1: New: - Revamped Makefile system - glXUseRotatedXFont() utility (see xdemos/xuserotfont.c) - internal driver interface changes related to texture object allocation, vertex/fragment programs, BlendEquationSeparate, etc. - option to walk triangle edges with double-precision floats (Justin Novosad of Discreet) (see config.h file) - support for AUX buffers in software GLX driver - updated glext.h to version 24 and glxext.h to version 6 - new MESA_GLX_FORCE_ALPHA and MESA_GLX_DEPTH_BITS env vars - updated BeOS support (Philippe Houdoin) Changes: - fragment fog interpolation is perspective corrected now - new glTexImage code, much cleaner, may be a bit faster Bug fixes: - glArrayElement in display lists didn't handle generic vertex attribs - glFogCoord didn't always work properly - ARB_fragment_program fog options didn't work - frag prog TEX instruction no longer incorrectly divides s,t,r by q - ARB frag prog TEX and TEXP instructions now use LOD=0 - glTexEnviv in display lists didn't work - glRasterPos didn't do texgen or apply texture matrix - GL_DOUBLE-valued vertex arrays were broken in some cases - fixed texture rectangle edge/border sampling bugs - sampling an incomplete texture in a fragment program would segfault - glTexImage was missing a few error checks - fixed some minor glGetTexParameter glitches - GL_INTENSITY was mistakenly accepted as a to glTexImage - fragment program writes to RC/HC register were broken - fixed a few glitches in GL_HP_occlusion_test extension - glBeginQueryARB and glEndQueryARB didn't work inside display lists - vertex program state references were broken - fixed triangle color interpolation bug on AIX (Shane Blackett) - fixed a number of minor memory leaks (bug #1002030) @ text @d3 1 a3 1 --- configs/default.orig 2004-10-25 17:21:49.000000000 +0000 d5 1 a5 1 @@@@ -14,10 +14,6 @@@@ MESA_TINY=0 d16 1 a16 1 @@@@ -52,7 +48,7 @@@@ GLW_SOURCES = GLwDrawA.c @ 1.1 log @Update Mesa and friends to version 6.0: Changes since 5.2: New: - full OpenGL 1.5 support - updated GL/glext.h file to version 21 Changes: - changed max framebuffer size to 4Kx4K (MAX_WIDTH/HEIGHT in config.h) Bug fixes: - fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color clamping issue - updated suno5-gcc configs - glColor3 functions sometimes resulted in undefined alpha values - fixed FP divide by zero error seen on VMS with xlockmore, others - fixed vertex/fragment program debug problem (bug 873011) - building on AIX with gcc works now - glDeleteProgramsARB failed for ARB fragment programs (bug 876160) - glDrawRangeElements tried to modify potentially read-only storage - updated files for building on Windows Changes since 5.0.2: New features: - reorganized directory tree - GL_ARB_vertex/fragment_program extensions (Michal Krol & Karl Rasche) - GL_ATI_texture_env_combine3 extension (Ian Romanick) - GL_SGI_texture_color_table extension (Eric Plante) - GL_NV_fragment_program extension - GL_NV_light_max_exponent extension - GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle) - GL_ARB_occlusion_query extension - GL_ARB_point_sprite extension - GL_ARB_texture_non_power_of_two extension - GL_IBM_multimode_draw_arrays extension - GL_EXT_texture_mirror_clamp extension (Ian Romanick) - GL_ARB_vertex_buffer_object extension - new X86 feature detection code (Petr Sebor) - less memory used for display lists and vertex buffers - demo of per-pixel lighting with a fragment program (demos/fplight.c) - new version (18) of glext.h header - new spriteblast.c demo of GL_ARB_point_sprite - faster glDrawPixels in X11 driver in some cases (see RELNOTES-5.1) - faster glCopyPixels in X11 driver in some cases (see RELNOTES-5.1) Bug fixes: - really enable OpenGL 1.4 features in DOS driver. - fixed issues in glDrawPixels and glCopyPixels for very wide images - glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint - fixed some texgen bugs reported by Daniel Borca - fixed wglMakeCurrent(NULL, NULL) bug (#835861) - fixed glTexSubImage3D z-offset bug (Cedric Gautier) - fixed RGBA blend enable bug (Ville Syrjala) - glAccum is supposed to be a no-op in selection/feedback mode - fixed texgen bug #597589 (John Popplewell) Changes: - dropped API trace feature (src/Trace/) - documentation overhaul. merged with website content. more html. - glxgears.c demo updated to use GLX swap rate extensions - glTexImage1/2/3D now allows width/height/depth = 0 - disable SPARC asm code on Linux (bug 852204) @ text @d1 1 a1 1 $NetBSD: $ d3 22 a24 20 --- progs/redbook/Makefile.X11.orig 2003-10-03 10:03:15.000000000 -0400 +++ progs/redbook/Makefile.X11 2004-01-19 20:47:35.000000000 -0500 @@@@ -7,7 +7,7 @@@@ INCDIR = $(TOP)/include LIBDIR = $(TOP)/lib -LIBS = -L$(LIBDIR) $(APP_LIB_DEPS) +LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) @@@@ -28,7 +28,7 @@@@ .SUFFIXES: .c .c: $(LIB_DEP) - $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@@ + $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@@ @