Wed Jul 8 20:00:58 2009 UTC ()
Update to 7.4.4. Make software ratserizer actually work. Add one patch from
upstream repo to fix null pointer dereference.

Changes in 7.4.4:

* Fixed i965/i915 segfault in screen destruction (bug 22408)

Changes in 7.4.3:

* Fixed texture object reference counting bug (bug 21756)
* Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT
  point (SF bug 2793846)
* Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE
* Fixed some OSMesa build issues
* Fixed a vertex buffer object crash
* Fixed broken glTexImage3D() when image type = GL_BITMAP
* Fixed some GLSL preprocessor bugs
* Fixed framebuffer mem leak in i945/i965 DRI drivers
* Fixed texture coordinate repeat bug in swrast (bug 21872)
* Fixed incorrect viewport clamping (lower bound is zero, not one)
* GLX fix for glean's makeCurrent test case


(hasso)
diff -r1.6 -r1.7 pkgsrc/graphics/Mesa/Makefile.version
diff -r1.79 -r1.80 pkgsrc/graphics/MesaLib/Makefile
diff -r1.66 -r1.67 pkgsrc/graphics/MesaLib/distinfo
diff -r0 -r1.8 pkgsrc/graphics/MesaLib/patches/patch-ak
diff -r0 -r1.6 pkgsrc/graphics/MesaLib/patches/patch-al
diff -r1.1 -r0 pkgsrc/graphics/MesaLib/patches/patch-bc
diff -r1.1 -r0 pkgsrc/graphics/MesaLib/patches/patch-bd
diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/patch-be
diff -r1.54 -r1.55 pkgsrc/graphics/glu/Makefile
diff -r1.51 -r1.52 pkgsrc/graphics/glut/Makefile
diff -r1.11 -r1.12 pkgsrc/graphics/glx-utils/distinfo
cvs diff -r1.6 -r1.7 pkgsrc/graphics/Mesa/Attic/Makefile.version (expand / switch to unified diff)

--- pkgsrc/graphics/Mesa/Attic/Makefile.version 2009/06/05 11:10:35 1.6
+++ pkgsrc/graphics/Mesa/Attic/Makefile.version 2009/07/08 20:00:57 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.version,v 1.6 2009/06/05 11:10:35 wiz Exp $ 1# $NetBSD: Makefile.version,v 1.7 2009/07/08 20:00:57 hasso Exp $
2# 2#
3# When changing this version, please run "make distinfo" in the following 3# When changing this version, please run "make distinfo" in the following
4# package directories: 4# package directories:
5# 5#
6# graphics/MesaLib 6# graphics/MesaLib
7# graphics/glx-utils 7# graphics/glx-utils
8# 8#
9# used by graphics/Mesa/Makefile.common 9# used by graphics/Mesa/Makefile.common
10# used by x11/modular-xorg-server/options.mk 10# used by x11/modular-xorg-server/options.mk
11 11
12MESA_DISTNAME= MesaLib-${MESA_VERSION} 12MESA_DISTNAME= MesaLib-${MESA_VERSION}
13MESA_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} 13MESA_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
14 14
15MESA_VERSION= 7.4.2 15MESA_VERSION= 7.4.4
16MESA_PKGVERSION= ${MESA_VERSION} 16MESA_PKGVERSION= ${MESA_VERSION}
cvs diff -r1.79 -r1.80 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2009/06/19 18:19:15 1.79
+++ pkgsrc/graphics/MesaLib/Makefile 2009/07/08 20:00:57 1.80
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.79 2009/06/19 18:19:15 hasso Exp $ 1# $NetBSD: Makefile,v 1.80 2009/07/08 20:00:57 hasso Exp $
2 2
3PKGNAME= MesaLib-${MESA_PKGVERSION} 3PKGNAME= MesaLib-${MESA_PKGVERSION}
4PKGREVISION= 3 
5COMMENT= Graphics library similar to SGI's OpenGL 4COMMENT= Graphics library similar to SGI's OpenGL
6 5
7MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ 6MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
8 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \ 7 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \
9 xmesa_xf86.h 8 xmesa_xf86.h
10 9
11MESA_HEADERS+= internal/dri_interface.h internal/sarea.h 10MESA_HEADERS+= internal/dri_interface.h internal/sarea.h
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15BUILD_DEFS+= MESA_HZ 14BUILD_DEFS+= MESA_HZ
16PLIST_VARS= dri nodri 15PLIST_VARS= dri nodri
17 16
cvs diff -r1.66 -r1.67 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2009/06/19 18:19:15 1.66
+++ pkgsrc/graphics/MesaLib/distinfo 2009/07/08 20:00:58 1.67
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: distinfo,v 1.66 2009/06/19 18:19:15 hasso Exp $ 1$NetBSD: distinfo,v 1.67 2009/07/08 20:00:58 hasso Exp $
2 2
3SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa 3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
4RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5 4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
5Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes 5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes
6SHA1 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 85f357345d71dfe60b785f0cbb03d1e070841c2d 6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431
7RMD160 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = caa69b7f2aa7136377cda2f690699415396c64ab 7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176
8Size (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 328646 bytes 8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes
9SHA1 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = fe70945ccf2c08d18ae4e83000018f0400352065 9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3
10RMD160 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = e70b8fd203325e676d90485632bf266e39d46a7e 10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
11Size (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = 3371577 bytes 11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e 13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393 15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab 16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04 17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7 18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f 19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87 20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
 22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
 23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
22SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
23SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 25SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
24SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905 26SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
25SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907 27SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
26SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7 28SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
27SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32 29SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
28SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3 30SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
29SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a 31SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
30SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f 32SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
31SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac 33SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
32SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a 34SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5
33SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4 
34SHA1 (patch-be) = 5407ae34110aa37b8d05801723f2b4739fd95021 
35SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477 35SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
36SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394 36SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
File Added: pkgsrc/graphics/MesaLib/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.8 2009/07/08 20:00:58 hasso Exp $

--- src/mesa/glapi/glapi.c.orig	2009-07-01 20:41:37 +0300
+++ src/mesa/glapi/glapi.c	2009-07-01 20:41:52 +0300
@@ -221,7 +221,7 @@ PUBLIC void *_glapi_Context = NULL;
  * We should call this periodically from a function such as glXMakeCurrent
  * in order to test if multiple threads are being used.
  */
-void
+PUBLIC void
 _glapi_check_multithread(void)
 {
 #if defined(THREADS) && !defined(GLX_USE_TLS)
File Added: pkgsrc/graphics/MesaLib/patches/Attic/patch-al
$NetBSD: patch-al,v 1.6 2009/07/08 20:00:58 hasso Exp $

http://cgit.freedesktop.org/mesa/mesa/commit/?id=32c44fb8

--- src/glx/x11/glxcmds.c.orig	2009-07-08 21:22:47 +0300
+++ src/glx/x11/glxcmds.c	2009-07-08 21:23:31 +0300
@@ -164,7 +164,7 @@ GetGLXScreenConfigs(Display *dpy, int sc
 {
     __GLXdisplayPrivate * const priv = __glXInitialize(dpy);
 
-    return (priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL;
+    return (priv && priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL;
 }
File Deleted: pkgsrc/graphics/MesaLib/patches/Attic/patch-bc
File Deleted: pkgsrc/graphics/MesaLib/patches/Attic/patch-bd
cvs diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/Attic/patch-be (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-be 2009/06/19 18:19:15 1.1
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-be 2009/07/08 20:00:58 1.2
@@ -1,57 +1,39 @@ @@ -1,57 +1,39 @@
1$NetBSD: patch-be,v 1.1 2009/06/19 18:19:15 hasso Exp $ 1$NetBSD: patch-be,v 1.2 2009/07/08 20:00:58 hasso Exp $
2 2
3--- src/mesa/drivers/osmesa/Makefile.orig 2009-06-19 13:36:30 +0300 3--- src/mesa/drivers/osmesa/Makefile.orig 2009-06-17 20:30:03 +0300
4+++ src/mesa/drivers/osmesa/Makefile 2009-06-19 13:45:04 +0300 4+++ src/mesa/drivers/osmesa/Makefile 2009-06-22 07:52:00 +0300
5@@ -19,7 +19,7 @@ INCLUDE_DIRS = \ 5@@ -21,14 +21,15 @@ INCLUDE_DIRS = \
6 -I$(TOP)/src/mesa \ 
7 -I$(TOP)/src/mesa/main 
8  6
 7 # Standalone osmesa needs to be linked with core Mesa APIs
 8 ifeq ($(DRIVER_DIRS), osmesa)
9-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a 9-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
10+CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la 10+CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la
11  11 else
12  12 CORE_MESA =
13 .PHONY: osmesa8 13 endif
14@@ -27,7 +27,8 @@ CORE_MESA = $(TOP)/src/mesa/libmesa.a $( 
15  14
16  15
17 .c.o: 16 .c.o:
18- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ 17- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
19+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \ 18+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \
20+ $(CFLAGS) $< -o $(@:.o=.lo) 19+ $(CFLAGS) $< -o $(@:.o=.lo)
21  20
22  21
23 default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) 22 default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
24@@ -44,11 +45,11 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_ 23@@ -38,11 +39,11 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
25 osmesa8: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) 24 # sources. We can also build libOSMesa16/libOSMesa32 by setting
26  25 # -DCHAN_BITS=16/32.
27 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) 26 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
28- $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ 
29- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ 
30- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ 
31- -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ 
32- $(OSMESA_LIB_DEPS) $(OBJECTS) 
33+ $(LIBTOOL) --mode=link $(CC) \ 
34+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \ 
35+ -rpath $(PREFIX)/lib \ 
36+ -version-info $(MESA_MAJOR):$(MESA_MINOR):0 \ 
37+ $(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo) 
38  
39  
40  
41@@ -56,11 +57,11 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $( 
42 # The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built 
43 # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 
44 osmesa16: $(OBJECTS) $(CORE_MESA) 
45- $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ 27- $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
46- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ 28- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
47- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ 29- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
48- -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ 30- -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
49- $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) 31- $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
50+ $(LIBTOOL) --mode=link $(CC) \ 32+ $(LIBTOOL) --mode=link $(CC) \
51+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \ 33+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \
52+ -rpath $(PREFIX)/lib \ 34+ -rpath $(PREFIX)/lib \
53+ -version-info $(MESA_MAJOR):$(MESA_MINOR):0 \ 35+ -version-info $(MESA_MAJOR):$(MESA_MINOR):0 \
54+ $(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA) 36+ $(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA)
55  37
56  38
57  39
cvs diff -r1.54 -r1.55 pkgsrc/graphics/glu/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/glu/Makefile 2009/06/10 17:33:34 1.54
+++ pkgsrc/graphics/glu/Makefile 2009/07/08 20:00:58 1.55
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.54 2009/06/10 17:33:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.55 2009/07/08 20:00:58 hasso Exp $
2 2
3PKGNAME= glu-${MESA_PKGVERSION} 3PKGNAME= glu-${MESA_PKGVERSION}
4PKGREVISION= 1 
5COMMENT= GLU polygon tessellation facility for Mesa 4COMMENT= GLU polygon tessellation facility for Mesa
6 5
7CONFLICTS+= Mesa-glx-[0-9]* 6CONFLICTS+= Mesa-glx-[0-9]*
8CONFLICTS+= Mesa<3.2.1 7CONFLICTS+= Mesa<3.2.1
9 8
10MESA_HEADERS= glu.h glu_mangle.h 9MESA_HEADERS= glu.h glu_mangle.h
11 10
12PKGCONFIG_OVERRIDE+= src/glu/glu.pc.in 11PKGCONFIG_OVERRIDE+= src/glu/glu.pc.in
13# no configure stage 12# no configure stage
14PKGCONFIG_OVERRIDE_STAGE= pre-build 13PKGCONFIG_OVERRIDE_STAGE= pre-build
15 14
16.include "../../graphics/Mesa/Makefile.lib" 15.include "../../graphics/Mesa/Makefile.lib"
17 16
cvs diff -r1.51 -r1.52 pkgsrc/graphics/glut/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/glut/Attic/Makefile 2009/06/11 07:23:24 1.51
+++ pkgsrc/graphics/glut/Attic/Makefile 2009/07/08 20:00:58 1.52
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.51 2009/06/11 07:23:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2009/07/08 20:00:58 hasso Exp $
2 2
3PKGNAME= glut-${MESA_PKGVERSION} 3PKGNAME= glut-${MESA_PKGVERSION}
4PKGREVISION= 1 
5COMMENT= GLUT Graphics library similar to SGI's OpenGL 4COMMENT= GLUT Graphics library similar to SGI's OpenGL
6 5
7CONFLICTS+= Mesa-glx-[0-9]* 6CONFLICTS+= Mesa-glx-[0-9]*
8CONFLICTS+= Mesa<3.2.1 7CONFLICTS+= Mesa<3.2.1
9 8
10MESA_HEADERS= glut.h glutf90.h 9MESA_HEADERS= glut.h glutf90.h
11 10
12PKGCONFIG_OVERRIDE+= src/glut/glx/glut.pc.in 11PKGCONFIG_OVERRIDE+= src/glut/glx/glut.pc.in
13# no configure stage 12# no configure stage
14PKGCONFIG_OVERRIDE_STAGE= pre-build 13PKGCONFIG_OVERRIDE_STAGE= pre-build
15 14
16.include "../../graphics/Mesa/Makefile.lib" 15.include "../../graphics/Mesa/Makefile.lib"
17 16
cvs diff -r1.11 -r1.12 pkgsrc/graphics/glx-utils/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/glx-utils/distinfo 2009/06/05 11:10:35 1.11
+++ pkgsrc/graphics/glx-utils/distinfo 2009/07/08 20:00:58 1.12
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.11 2009/06/05 11:10:35 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2009/07/08 20:00:58 hasso Exp $
2 2
3SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa 3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
4RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5 4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
5Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes 5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes