head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.46 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.44 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.42 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.40 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.36 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.34 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.32 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.30 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.28 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.26 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.24 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.22 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.20 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.18 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.16 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.14 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.12 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.10 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2004.10.28.13.49.13; author adam; state dead; branches; next 1.2; 1.2 date 2004.01.20.02.48.33; author jschauma; state Exp; branches; next 1.1; 1.1 date 2003.11.18.16.10.55; author jschauma; state Exp; branches; next ; desc @@ 1.3 log @This one should be gone @ text @$NetBSD: patch-ae,v 1.2 2004/01/20 02:48:33 jschauma Exp $ --- progs/demos/Makefile.X11.orig 2003-10-03 10:03:15.000000000 -0400 +++ progs/demos/Makefile.X11 2004-01-19 20:47:16.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 OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) @@@@ -36,7 +36,6 @@@@ multiarb \ occlude \ osdemo \ - paltex \ pixeltex \ pointblast \ ray \ @@@@ -68,11 +67,11 @@@@ # make executable from .c file: .c: $(LIB_DEP) - $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@@ + $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@@ # special case: need the -lOSMesa library: osdemo: osdemo.c - $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@@ + $(CXX) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@@ ##### TARGETS ##### @ 1.2 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.1 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 @d3 5 a7 9 --- src/GGI/Makefile.am.orig 2003-11-13 21:47:55.000000000 -0500 +++ src/GGI/Makefile.am 2003-11-13 21:48:04.000000000 -0500 @@@@ -7,10 +7,10 @@@@ ggimesaconfdatadir = ${sysconfdir}/ggi ggimesaconfdata_DATA = ggimesa.conf -INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \ +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \ -I$(top_srcdir)/src $(GGI_CFLAGS) d9 2 a10 2 -DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\" +DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\" d12 24 a35 2 if HAVE_GGI # Build a libtool convenience library. @