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.38 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.36 pkgsrc-2008Q1:1.5.0.34 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.32 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.30 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.28 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.26 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.24 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.22 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.20 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.18 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.16 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.14 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.12 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.10 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc:1.1.1.1 TNF:1.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 2004.01.20.02.48.33; author jschauma; state Exp; branches; next 1.4; 1.4 date 2003.11.28.18.41.03; author jschauma; state Exp; branches; next 1.3; 1.3 date 2003.11.18.16.10.55; author jschauma; state Exp; branches; next 1.2; 1.2 date 2003.03.09.19.04.53; author jschauma; state Exp; branches; next 1.1; 1.1 date 2002.12.05.15.20.22; author jschauma; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.12.05.15.20.22; 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-aa,v 1.5 2004/01/20 02:48:33 jschauma Exp $ --- progs/demos/lodbias.c.orig 2004-01-19 20:06:16.000000000 -0500 +++ progs/demos/lodbias.c 2004-01-19 20:06:28.000000000 -0500 @@@@ -212,7 +212,7 @@@@ } /* resize to 256 x 256 */ if (width != 256 || height != 256) { - GLubyte *newImage = malloc(256 * 256 * 4); + GLubyte *newImage = (GLubyte *)malloc(256 * 256 * 4); gluScaleImage(format, width, height, GL_UNSIGNED_BYTE, image, 256, 256, GL_UNSIGNED_BYTE, newImage); free(image); @ 1.5 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: $ @ 1.4 log @As suggested by Ron Roskens in PR pkg/23489 (closing that PR): use si-glu sources to build a libGLU that includes GLU Polygon Tessellator functions and use this new functionality in MesaDemos. Bump PKGREVISIONs. @ text @d3 11 a13 12 --- book/Makefile.am.orig 2003-11-07 09:32:07.000000000 -0500 +++ book/Makefile.am 2003-11-28 12:47:45.000000000 -0500 @@@@ -15,8 +15,7 @@@@ EXTRA_DIST = jitter.h -LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \ - $(top_builddir)/src/libGL.la -lm +LDADD = $(GLUT_LIBS) -lGLU -lGL -lm #LDFLAGS = -no-install # execute all programs @ 1.3 log @Finally update Mesa and friends after the distfile changed on the website without a version bump. Changes made, according to the website, for libtool/autofoo fixes. Some changes from Ron Roskens: glut depends upon graphics/glu (otherwise its linked against X11R6 libs) MesaDemos: rather than using the pre-built distribution makefiles, use the automake/configure built makefiles which have the build dependencies all setup. This closes PR pkg/23476. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 9 --- book/Makefile.am.orig 2003-11-07 08:32:07.000000000 -0600 +++ book/Makefile.am 2003-11-17 20:50:19.000000000 -0600 @@@@ -10,13 +10,12 @@@@ lines list material mipmap model movelight nurbs pickdepth \ picksquare plane planet polyoff polys quadric robot sccolorlight \ scene scenebamb sceneflat select smooth stencil stroke surface \ - teaambient teapots tess tesswind texbind texgen texprox texsub \ + teaambient teapots texbind texgen texprox texsub \ texturesurf torus trim unproject varray wrap @ 1.2 log @Update Mesa and friends to version 5.0, using patches provided in PR pkg/19302. At the same time, move Mesa and friends to LOCALBASE rather than X11BASE, so that they can be installed regardless of XF version. Introduce MESA_REQD variable that can be set to 5.0, thus allowing systems with XF4 to indicate that the provided version is not good enough. All packages using Mesa, MesaLib, glu or glut will get a PKGREVISION bump over the next few days. @ text @d1 1 a1 1 $NetBSD: $ d3 3 a5 17 --- book/Makefile.X11.orig Tue Feb 15 20:09:06 2000 +++ book/Makefile.X11 Sat Mar 8 18:59:50 2003 @@@@ -9,10 +9,10 @@@@ ##### MACROS ##### -INCDIR = ../include -LIBDIR = ../lib +INCDIR = ${X11PREFIX}/include +LIBDIR = ${X11PREFIX}/lib -GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS) +GL_LIBS = ${LDFLAGS} -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS) LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) @@@@ -22,7 +22,7 @@@@ d13 6 d20 1 @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- book/Makefile.X11.orig Thu Nov 21 12:25:24 2002 +++ book/Makefile.X11 Thu Nov 21 12:25:44 2002 @@@@ -9,8 +9,8 @@@@ d14 4 a17 1 GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS) @ 1.1.1.1 log @Initial import of graphics/MesaDemos: MesaLib is a 3-D graphics library with an API which is very similar to that of OpenGL*. This package provides examples and demos of Mesa's capabilities, among them the examples from the ``Red Book'' (_OpenGL Programming Guide_, published by Addison-Wesley; ISBN 0-201-63274-8). @ text @@