summaryrefslogtreecommitdiff
path: root/graphics/MesaDemos
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-09-29 21:30:28 +0000
committerjschauma <jschauma@pkgsrc.org>2003-09-29 21:30:28 +0000
commitb949499421d3acfada46e823c64d06ec2c9ca15a (patch)
tree4bfbc2f1fba06ea9b1929d15bfda89c0f9e93391 /graphics/MesaDemos
parent73561c43c1faa3e4909f34ec12b32c27be5bb8fb (diff)
downloadpkgsrc-b949499421d3acfada46e823c64d06ec2c9ca15a.tar.gz
Update Mesa and friends to latest version 5.0.2:
- fixed texgen problem causing texcoord's Q to be zero (stex3d) - default GL_TEXTURE_COMPARE_MODE_ARB was wrong - GL_CURRENT_MATRIX_NV query was wrong - GL_CURRENT_MATRIX_STACK_DEPTH_NV query was off by one - GL_LIST_MODE query wasn't correct - GL_FOG_COORDINATE_SOURCE_EXT query wasn't supported - GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query returned wrong value - blended, wide lines didn't always work correctly - glVertexAttrib4svNV w component was always 1 - fixed bug in GL_IBM_rasterpos_clip (missing return) - GL_DEPTH_TEXTURE_MODE = GL_ALPHA didn't work correctly - a few Solaris compilation fixes - fixed glClear() problem for DRI drivers (non-existant stencil, etc) - fixed int/REAL mixup in GLU NURBS curve evaluator (Eric Cazeaux) - fixed delete [] bug in SI GLU (bug 721765) (Diego Santa Cruz) - glFog() didn't clamp fog colors - fixed bad float/int conversion for GL_TEXTURE_PRIORITY in the gl[Get]TexParameteri[v] functions - fixed invalid memory references in glTexGen functions (bug 781602) - integer-valued color arrays weren't handled correctly - glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't work - GL_EXT_texture_lod_bias is part of 1.4, overlooked in 5.0.1 - build GLUT with -fexceptions so C++ apps propogate exceptions While here, fix PR pkg/23003 by moving the version number to version.mk and including that in the buildlink.
Diffstat (limited to 'graphics/MesaDemos')
-rw-r--r--graphics/MesaDemos/PLIST5
-rw-r--r--graphics/MesaDemos/distinfo12
-rw-r--r--graphics/MesaDemos/patches/patch-ab54
-rw-r--r--graphics/MesaDemos/patches/patch-ac24
4 files changed, 9 insertions, 86 deletions
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index dcfa97b3248..1d6b1e481c0 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/29 21:30:28 jschauma Exp $
share/examples/${PKGNAME}/book/README
share/examples/${PKGNAME}/book/aaindex
share/examples/${PKGNAME}/book/aaindex.c
@@ -165,6 +165,7 @@ share/examples/${PKGNAME}/demos/multiarb
share/examples/${PKGNAME}/demos/multiarb.c
share/examples/${PKGNAME}/demos/occlude
share/examples/${PKGNAME}/demos/occlude.c
+share/examples/${PKGNAME}/demos/osdemo
share/examples/${PKGNAME}/demos/osdemo.c
share/examples/${PKGNAME}/demos/paltex
share/examples/${PKGNAME}/demos/paltex.c
@@ -185,6 +186,7 @@ share/examples/${PKGNAME}/demos/reflect
share/examples/${PKGNAME}/demos/reflect.c
share/examples/${PKGNAME}/demos/renormal
share/examples/${PKGNAME}/demos/renormal.c
+share/examples/${PKGNAME}/demos/shadowtex
share/examples/${PKGNAME}/demos/shadowtex.c
share/examples/${PKGNAME}/demos/spectex
share/examples/${PKGNAME}/demos/spectex.c
@@ -252,6 +254,7 @@ share/examples/${PKGNAME}/samples/logo
share/examples/${PKGNAME}/samples/logo.c
share/examples/${PKGNAME}/samples/nurb
share/examples/${PKGNAME}/samples/nurb.c
+share/examples/${PKGNAME}/samples/oglinfo
share/examples/${PKGNAME}/samples/oglinfo.c
share/examples/${PKGNAME}/samples/olympic
share/examples/${PKGNAME}/samples/olympic.c
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 6c8eb7ae286..f76e47c14d1 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/05/10 16:37:11 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/09/29 21:30:28 jschauma Exp $
-SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
-Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
-SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938
-Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes
+SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
+Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
+SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
+Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
-SHA1 (patch-ab) = 9b11eb413720f6a0863a15951dc23449ec25de2d
-SHA1 (patch-ac) = 79166ebd1f425ba592d9a62bccd47533c89f9807
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
deleted file mode 100644
index f22e7d333c6..00000000000
--- a/graphics/MesaDemos/patches/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/05/10 16:37:12 drochner Exp $
-
---- demos/Makefile.X11.orig 2001-08-21 07:42:11.000000000 +0200
-+++ demos/Makefile.X11 2003-05-10 18:23:01.000000000 +0200
-@@ -9,8 +9,8 @@
-
- ##### MACROS #####
-
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
-
- GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-
-@@ -36,7 +36,6 @@
- morph3d \
- multiarb \
- occlude \
-- osdemo \
- paltex \
- pixeltex \
- pointblast \
-@@ -44,7 +43,6 @@
- readpix \
- reflect \
- renormal \
-- shadowtex \
- spectex \
- stex3d \
- teapot \
-@@ -68,11 +66,11 @@
-
- # make executable from .c file:
- .c: $(LIB_DEP)
-- $(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
-+ $(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} $< $(GL_LIBS) -o $@
-
- # special case: need the -lOSMesa library:
- osdemo: osdemo.c
-- $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-+ $(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} osdemo.c $(OSMESA_LIBS) -o $@
-
-
- ##### TARGETS #####
-@@ -95,7 +93,7 @@
- cp ../util/readtex.c .
-
- readtex.h:
-- cp ../util/readtex.c .
-+ cp ../util/readtex.h .
-
-
- # execute all programs
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
deleted file mode 100644
index 6c94502a861..00000000000
--- a/graphics/MesaDemos/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/03/09 19:04:53 jschauma Exp $
-
---- samples/Makefile.X11.orig Tue Feb 15 20:09:06 2000
-+++ samples/Makefile.X11 Sat Mar 8 19:00:44 2003
-@@ -9,15 +9,15 @@
-
- ##### 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)
-
- PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-- font line logo nurb oglinfo olympic overlay point prim quad select \
-+ font line logo nurb olympic overlay point prim quad select \
- shape sphere star stencil stretch texture tri wave
-
-