diff options
| author | adam <adam@pkgsrc.org> | 2006-01-19 12:53:17 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2006-01-19 12:53:17 +0000 |
| commit | f1fb57c495f70f101d3f74500d457c322bc877ba (patch) | |
| tree | f25b2eb5201eb92dae2a8b8783c830f0536b3989 | |
| parent | bc79a3aee852dc0375711d4e015dcd5ee21f6147 (diff) | |
| download | pkgsrc-f1fb57c495f70f101d3f74500d457c322bc877ba.tar.gz | |
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
| -rw-r--r-- | graphics/Mesa/Makefile.common | 5 | ||||
| -rw-r--r-- | graphics/MesaDemos/Makefile | 3 | ||||
| -rw-r--r-- | graphics/MesaDemos/PLIST | 67 | ||||
| -rw-r--r-- | graphics/MesaDemos/distinfo | 22 | ||||
| -rw-r--r-- | graphics/MesaDemos/patches/patch-ac | 6 | ||||
| -rw-r--r-- | graphics/MesaDemos/patches/patch-ad | 13 | ||||
| -rw-r--r-- | graphics/MesaDemos/patches/patch-ah | 8 | ||||
| -rw-r--r-- | graphics/MesaLib/Makefile | 7 | ||||
| -rw-r--r-- | graphics/MesaLib/PLIST | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/builtin.mk | 6 | ||||
| -rw-r--r-- | graphics/MesaLib/distinfo | 31 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ac | 8 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ad | 45 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ae | 19 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-af | 14 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ag | 16 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ah | 16 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-aj | 6 | ||||
| -rw-r--r-- | graphics/glu/Makefile | 3 | ||||
| -rw-r--r-- | graphics/glu/builtin.mk | 6 | ||||
| -rw-r--r-- | graphics/glut/Makefile | 3 |
21 files changed, 136 insertions, 172 deletions
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index b8f0494ddcf..c795eae31c8 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,14 +1,15 @@ -# $NetBSD: Makefile.common,v 1.44 2005/11/08 16:41:30 tv Exp $ +# $NetBSD: Makefile.common,v 1.45 2006/01/19 12:53:17 adam Exp $ DISTNAME= MesaLib-${MESA_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES+= ${DISTNAME:S/MesaLib/MesaGLUT/}${EXTRACT_SUFX} DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} EXTRACT_SUFX= .tar.bz2 -MESA_VERSION= 6.2.1 +MESA_VERSION= 6.4.1 MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.mesa3d.org/ diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index c80533863b8..bda11da2457 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/01/12 12:59:15 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2006/01/19 12:53:17 adam Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -9,6 +9,7 @@ DISTINFO_FILE= ${.CURDIR}/distinfo .include "../../graphics/Mesa/Makefile.common" USE_LANGUAGES= c c++ +USE_TOOLS+= gmake MAKE_FLAGS+= LIB_DEP="" pre-build: diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST index 3bc401037b7..99772df5f63 100644 --- a/graphics/MesaDemos/PLIST +++ b/graphics/MesaDemos/PLIST @@ -1,51 +1,8 @@ -@comment $NetBSD: PLIST,v 1.7 2004/10/26 13:57:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/01/19 12:53:17 adam Exp $ share/examples/${PKGNAME}/beos/GLInfo.cpp share/examples/${PKGNAME}/beos/demo.cpp share/examples/${PKGNAME}/beos/sample.cpp share/examples/${PKGNAME}/demos/README -share/examples/${PKGNAME}/demos/Windows/all.dsp -share/examples/${PKGNAME}/demos/Windows/bounce.dsp -share/examples/${PKGNAME}/demos/Windows/clearspd.dsp -share/examples/${PKGNAME}/demos/Windows/cubemap.dsp -share/examples/${PKGNAME}/demos/Windows/demos.dsw -share/examples/${PKGNAME}/demos/Windows/drawpix.dsp -share/examples/${PKGNAME}/demos/Windows/fire.dsp -share/examples/${PKGNAME}/demos/Windows/gears.dsp -share/examples/${PKGNAME}/demos/Windows/geartrain.dsp -share/examples/${PKGNAME}/demos/Windows/glinfo.dsp -share/examples/${PKGNAME}/demos/Windows/gloss.dsp -share/examples/${PKGNAME}/demos/Windows/gltestperf.dsp -share/examples/${PKGNAME}/demos/Windows/glutfx.dsp -share/examples/${PKGNAME}/demos/Windows/ipers.dsp -share/examples/${PKGNAME}/demos/Windows/isosurf.dsp -share/examples/${PKGNAME}/demos/Windows/loadbias.dsp -share/examples/${PKGNAME}/demos/Windows/morph3d.dsp -share/examples/${PKGNAME}/demos/Windows/multiarb.dsp -share/examples/${PKGNAME}/demos/Windows/occlude.dsp -share/examples/${PKGNAME}/demos/Windows/osdemo.dsp -share/examples/${PKGNAME}/demos/Windows/paltex.dsp -share/examples/${PKGNAME}/demos/Windows/pixeltex.dsp -share/examples/${PKGNAME}/demos/Windows/pointblast.dsp -share/examples/${PKGNAME}/demos/Windows/rain.dsp -share/examples/${PKGNAME}/demos/Windows/ray.dsp -share/examples/${PKGNAME}/demos/Windows/readpix.dsp -share/examples/${PKGNAME}/demos/Windows/reflect.dsp -share/examples/${PKGNAME}/demos/Windows/renormal.dsp -share/examples/${PKGNAME}/demos/Windows/shadowtex.dsp -share/examples/${PKGNAME}/demos/Windows/spectex.dsp -share/examples/${PKGNAME}/demos/Windows/spriteblast.dsp -share/examples/${PKGNAME}/demos/Windows/stex3d.dsp -share/examples/${PKGNAME}/demos/Windows/teapot.dsp -share/examples/${PKGNAME}/demos/Windows/terrain.dsp -share/examples/${PKGNAME}/demos/Windows/tessdemo.dsp -share/examples/${PKGNAME}/demos/Windows/texcyl.dsp -share/examples/${PKGNAME}/demos/Windows/texdown.dsp -share/examples/${PKGNAME}/demos/Windows/texenv.dsp -share/examples/${PKGNAME}/demos/Windows/texobj.dsp -share/examples/${PKGNAME}/demos/Windows/trispd.dsp -share/examples/${PKGNAME}/demos/Windows/tunnel.dsp -share/examples/${PKGNAME}/demos/Windows/tunnel2.dsp -share/examples/${PKGNAME}/demos/Windows/winpos.dsp share/examples/${PKGNAME}/demos/arbfplight share/examples/${PKGNAME}/demos/arbfplight.c share/examples/${PKGNAME}/demos/arbocclude @@ -93,10 +50,6 @@ 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/osdemo16.c -share/examples/${PKGNAME}/demos/osdemo32.c share/examples/${PKGNAME}/demos/paltex share/examples/${PKGNAME}/demos/paltex.c share/examples/${PKGNAME}/demos/particles.cxx @@ -118,6 +71,8 @@ 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/showbuffer.c +share/examples/${PKGNAME}/demos/showbuffer.h share/examples/${PKGNAME}/demos/spectex share/examples/${PKGNAME}/demos/spectex.c share/examples/${PKGNAME}/demos/spriteblast @@ -153,12 +108,16 @@ share/examples/${PKGNAME}/ggi/gears.c share/examples/${PKGNAME}/ggi/gears2.c share/examples/${PKGNAME}/images/bw.rgb share/examples/${PKGNAME}/images/girl.rgb +share/examples/${PKGNAME}/images/girl2.rgb share/examples/${PKGNAME}/images/reflect.rgb share/examples/${PKGNAME}/images/s128.rgb share/examples/${PKGNAME}/images/tile.rgb share/examples/${PKGNAME}/images/tree2.rgba share/examples/${PKGNAME}/images/tree3.rgb share/examples/${PKGNAME}/images/wrs_logo.rgb +share/examples/${PKGNAME}/osdemos/osdemo.c +share/examples/${PKGNAME}/osdemos/osdemo16.c +share/examples/${PKGNAME}/osdemos/osdemo32.c share/examples/${PKGNAME}/redbook/README share/examples/${PKGNAME}/redbook/aaindex share/examples/${PKGNAME}/redbook/aaindex.c @@ -328,6 +287,8 @@ share/examples/${PKGNAME}/samples/prim share/examples/${PKGNAME}/samples/prim.c share/examples/${PKGNAME}/samples/quad share/examples/${PKGNAME}/samples/quad.c +share/examples/${PKGNAME}/samples/readtex.c +share/examples/${PKGNAME}/samples/readtex.h share/examples/${PKGNAME}/samples/rgbtoppm.c share/examples/${PKGNAME}/samples/select share/examples/${PKGNAME}/samples/select.c @@ -383,10 +344,14 @@ share/examples/${PKGNAME}/windml/wrs_logo.bmp share/examples/${PKGNAME}/xdemos/descrip.mms share/examples/${PKGNAME}/xdemos/glthreads share/examples/${PKGNAME}/xdemos/glthreads.c +share/examples/${PKGNAME}/xdemos/glwdemo.c +share/examples/${PKGNAME}/xdemos/glxcontexts +share/examples/${PKGNAME}/xdemos/glxcontexts.c share/examples/${PKGNAME}/xdemos/glxdemo share/examples/${PKGNAME}/xdemos/glxdemo.c share/examples/${PKGNAME}/xdemos/glxgears share/examples/${PKGNAME}/xdemos/glxgears.c +share/examples/${PKGNAME}/xdemos/glxgears_fbconfig share/examples/${PKGNAME}/xdemos/glxgears_fbconfig.c share/examples/${PKGNAME}/xdemos/glxheads share/examples/${PKGNAME}/xdemos/glxheads.c @@ -403,6 +368,8 @@ share/examples/${PKGNAME}/xdemos/manywin.c share/examples/${PKGNAME}/xdemos/offset share/examples/${PKGNAME}/xdemos/offset.c share/examples/${PKGNAME}/xdemos/opencloseopen.c +share/examples/${PKGNAME}/xdemos/overlay +share/examples/${PKGNAME}/xdemos/overlay.c share/examples/${PKGNAME}/xdemos/pbdemo share/examples/${PKGNAME}/xdemos/pbdemo.c share/examples/${PKGNAME}/xdemos/pbinfo @@ -423,14 +390,16 @@ share/examples/${PKGNAME}/xdemos/xrotfontdemo share/examples/${PKGNAME}/xdemos/xrotfontdemo.c share/examples/${PKGNAME}/xdemos/xuserotfont.c share/examples/${PKGNAME}/xdemos/xuserotfont.h +share/examples/${PKGNAME}/xdemos/yuvrect_client +share/examples/${PKGNAME}/xdemos/yuvrect_client.c @dirrm share/examples/${PKGNAME}/xdemos @dirrm share/examples/${PKGNAME}/windml @dirrm share/examples/${PKGNAME}/util @dirrm share/examples/${PKGNAME}/samples @dirrm share/examples/${PKGNAME}/redbook +@dirrm share/examples/${PKGNAME}/osdemos @dirrm share/examples/${PKGNAME}/images @dirrm share/examples/${PKGNAME}/ggi -@dirrm share/examples/${PKGNAME}/demos/Windows @dirrm share/examples/${PKGNAME}/demos @dirrm share/examples/${PKGNAME}/beos @dirrm share/examples/${PKGNAME} diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo index 91c9760729a..4a7d702a6c0 100644 --- a/graphics/MesaDemos/distinfo +++ b/graphics/MesaDemos/distinfo @@ -1,14 +1,16 @@ -$NetBSD: distinfo,v 1.13 2005/02/24 08:45:02 agc Exp $ +$NetBSD: distinfo,v 1.14 2006/01/19 12:53:17 adam Exp $ -SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189 -RMD160 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = cfc5e8db61289c017ff20dd6b4c6db5c7b66855b -Size (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 1627520 bytes -SHA1 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = f8da791e365eec633a70c4b5a76d96d27838e20b -RMD160 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 62b3ebc47e822c4704b69c9888e74bae12a1391b -Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes +SHA1 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = efb70276ccd9cd13dbd7d5e581213a5ca3e4ef25 +RMD160 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = e3a54d6442fa5d6e446bb0b6704bd22c31fb4927 +Size (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = 2913887 bytes +SHA1 (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = b28f0dcee182604646e0e7d6aaaea25d816bacce +RMD160 (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = a09583b05c551852f5b4bc9688bca8a713c5f3bc +Size (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = 270793 bytes +SHA1 (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = ae7a13ed55dfac9dde13464df0c4ac98ac6f7669 +RMD160 (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = 3cff02a195e2aa558d3b5dbbfe15e03ee280df62 +Size (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = 819391 bytes SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4 -SHA1 (patch-ac) = 3640b405d9402b6a8e96a257813f116f5502740b -SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b +SHA1 (patch-ac) = ebaaf755d35bd7f82fe93cff9bb98abee6bbf415 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1 -SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf +SHA1 (patch-ah) = 02f1c4ac8a41999454cbebe5d91167fafc7f554e diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac index 2398fa02405..d22115836b3 100644 --- a/graphics/MesaDemos/patches/patch-ac +++ b/graphics/MesaDemos/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.8 2005/01/04 15:50:08 adam Exp $ +$NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $ ---- Makefile.orig 2004-12-05 18:25:19.000000000 +0000 +--- Makefile.orig 2005-11-29 23:38:49.000000000 +0100 +++ Makefile @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2005/01/04 15:50:08 adam Exp $ default: $(TOP)/configs/current -@@ -100,6 +100,7 @@ linux-x86-64-static \ +@@ -117,6 +117,7 @@ linux-x86-xcb \ linux-x86-glide \ linux-x86-static \ netbsd \ diff --git a/graphics/MesaDemos/patches/patch-ad b/graphics/MesaDemos/patches/patch-ad deleted file mode 100644 index 92db20ec87b..00000000000 --- a/graphics/MesaDemos/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2004/01/20 02:48:33 jschauma Exp $ - ---- progs/demos/osdemo.c.orig 2004-01-19 20:07:26.000000000 -0500 -+++ progs/demos/osdemo.c 2004-01-19 20:08:09.000000000 -0500 -@@ -301,7 +301,7 @@ - - if (filename != NULL) { - #ifdef SAVE_TARGA -- write_targa(filename, buffer, WIDTH, HEIGHT); -+ write_targa(filename, (const GLubyte*)buffer, WIDTH, HEIGHT); - #else - write_ppm(filename, buffer, WIDTH, HEIGHT); - #endif diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah index f922e0fb9ad..fabbcd5ca9d 100644 --- a/graphics/MesaDemos/patches/patch-ah +++ b/graphics/MesaDemos/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.2 2004/10/26 13:57:47 adam Exp $ +$NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $ ---- configs/default.orig 2004-10-25 17:21:49.000000000 +0000 +--- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 +++ configs/default -@@ -14,10 +14,6 @@ MESA_TINY=0 +@@ -14,10 +14,6 @@ MESA_TINY=1 DRM_SOURCE_PATH=$(TOP)/../drm # Compiler and flags @@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2004/10/26 13:57:47 adam Exp $ GLU_CFLAGS = # Misc tools and flags -@@ -52,7 +48,7 @@ GLW_SOURCES = GLwDrawA.c +@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c # Directories LIB_DIR = $(TOP)/lib diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 8183ddd1042..82d94039b62 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:19 rillig Exp $ +# $NetBSD: Makefile,v 1.43 2006/01/19 12:53:17 adam Exp $ PKGNAME= MesaLib-${MESA_VERSION} -PKGREVISION= 3 COMMENT= Graphics library similar to SGI's OpenGL .include "../../graphics/Mesa/Makefile.common" @@ -15,10 +14,6 @@ INSTLIBS= ${WRKSRC}/src/mesa/libGL.la \ CONFIGURE_ARGS+= --disable-sparc .endif -.if !empty(CC_VERSION:Mgcc-3*) -BUILDLINK_TRANSFORM+= rm:-O[23] -.endif - .include "../../mk/pthread.buildlink3.mk" pre-build: diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index 60f2e351508..e836c933ae7 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.14 2004/09/22 08:09:32 jlam Exp $ +@comment $NetBSD: PLIST,v 1.15 2006/01/19 12:53:17 adam Exp $ include/GL/gl.h include/GL/gl_mangle.h include/GL/glext.h include/GL/glx.h -include/GL/glxext.h include/GL/glx_mangle.h +include/GL/glxext.h include/GL/osmesa.h include/GL/xmesa.h include/GL/xmesa_x.h diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk index 959a832e149..c557282c39f 100644 --- a/graphics/MesaLib/builtin.mk +++ b/graphics/MesaLib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.11 2005/07/10 10:42:26 grant Exp $ +# $NetBSD: builtin.mk,v 1.12 2006/01/19 12:53:17 adam Exp $ BUILTIN_PKG:= MesaLib @@ -45,10 +45,10 @@ USE_BUILTIN.MesaLib= ${IS_BUILTIN.MesaLib} . if defined(BUILTIN_PKG.MesaLib) && \ !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) USE_BUILTIN.MesaLib= yes -. for _dep_ in ${BUILDLINK_DEPENDS.MesaLib} +. for dep in ${BUILDLINK_DEPENDS.MesaLib} . if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) USE_BUILTIN.MesaLib!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.MesaLib:Q}; then \ + if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 4ee2294c01d..a079fb10a61 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,18 +1,21 @@ -$NetBSD: distinfo,v 1.32 2005/11/08 16:41:30 tv Exp $ +$NetBSD: distinfo,v 1.33 2006/01/19 12:53:17 adam Exp $ -SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189 -RMD160 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = cfc5e8db61289c017ff20dd6b4c6db5c7b66855b -Size (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 1627520 bytes -SHA1 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = f8da791e365eec633a70c4b5a76d96d27838e20b -RMD160 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 62b3ebc47e822c4704b69c9888e74bae12a1391b -Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes +SHA1 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = efb70276ccd9cd13dbd7d5e581213a5ca3e4ef25 +RMD160 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = e3a54d6442fa5d6e446bb0b6704bd22c31fb4927 +Size (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = 2913887 bytes +SHA1 (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = b28f0dcee182604646e0e7d6aaaea25d816bacce +RMD160 (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = a09583b05c551852f5b4bc9688bca8a713c5f3bc +Size (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = 270793 bytes +SHA1 (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = ae7a13ed55dfac9dde13464df0c4ac98ac6f7669 +RMD160 (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = 3cff02a195e2aa558d3b5dbbfe15e03ee280df62 +Size (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = 819391 bytes SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606 SHA1 (patch-ab) = c257a57d4570576f160e9a4c029384718402c1bd -SHA1 (patch-ac) = 1791e47aa5a0e9d86002cf4c76dc66338e235fac -SHA1 (patch-ad) = 297981dfd609dab0b213ac75324e07c2364a2b27 -SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0 -SHA1 (patch-af) = 8f77d0a0e7c63de6bcc44a653767ccd04107c98c -SHA1 (patch-ag) = 3d05125b389c26b04884775f3f631247faa8a716 -SHA1 (patch-ah) = 0c0a4d18531d2bc9ea1be83e89f373be5609f0e7 +SHA1 (patch-ac) = a12c3538907aaa63184371037c0f70924861fbe4 +SHA1 (patch-ad) = e926180243a180bc80b0332f2bcacc14b7c1f13b +SHA1 (patch-ae) = c7dd8f4b9db5241acdd0f850162b8b4116cd93bd +SHA1 (patch-af) = 323ceab5653127cf233e66311a947c6718edb14c +SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac +SHA1 (patch-ah) = b9ee33c497b8abe2af004a4f13219a19f413f30e SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558 -SHA1 (patch-aj) = 8282697af31605d07176943d7cf7e8f413e212de +SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac index eaf93d61ad8..085728c0a71 100644 --- a/graphics/MesaLib/patches/patch-ac +++ b/graphics/MesaLib/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $ +$NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $ ---- Makefile.orig 2004-12-05 13:25:19.000000000 -0500 +--- Makefile.orig 2005-11-29 23:38:49.000000000 +0100 +++ Makefile @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $ default: $(TOP)/configs/current -@@ -64,6 +64,7 @@ hpux11-64 \ +@@ -74,6 +74,7 @@ hpux11-64 \ hpux11-64-static \ hpux9 \ hpux9-gcc \ @@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $ irix6-64 \ irix6-64-static \ irix6-n32 \ -@@ -100,6 +101,7 @@ linux-x86-64-static \ +@@ -117,6 +118,7 @@ linux-x86-xcb \ linux-x86-glide \ linux-x86-static \ netbsd \ diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad index e8eafb217b1..a0cf00284f1 100644 --- a/graphics/MesaLib/patches/patch-ad +++ b/graphics/MesaLib/patches/patch-ad @@ -1,52 +1,59 @@ -$NetBSD: patch-ad,v 1.7 2005/07/13 18:39:58 kristerw Exp $ +$NetBSD: patch-ad,v 1.8 2006/01/19 12:53:17 adam Exp $ ---- src/mesa/Makefile.orig 2004-10-04 09:44:50.000000000 -0500 +--- src/mesa/Makefile.orig 2005-07-26 07:55:56.000000000 +0200 +++ src/mesa/Makefile -@@ -12,10 +12,10 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$ - +@@ -14,13 +14,13 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$ + .SUFFIXES : .cpp .c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ + ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ + .cpp.o: +- $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@ ++ ${LIBTOOL} --mode=compile $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@ + .S.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ + ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ # Figure out what to make here -@@ -112,22 +112,23 @@ subdirs: +@@ -150,25 +150,23 @@ subdirs: # Make the GL library $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) -- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \ -- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \ +- @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ +- -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ +- -install $(LIB_DIR) \ - $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) + ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB_NAME:.so=.la} \ + ${STAND_ALONE_OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR} \ -+ -L${X11BASE}/lib ${GL_LIB_DEPS} -R ${X11BASE}/lib ++ -L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GL_LIB_DEPS} # Make the OSMesa library $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) - if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ -- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ + @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ +- $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ +- -major $(MESA_MAJOR) \ - -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) \ - $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ -+ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ -+ ${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ -+ -version-info ${MESA_MAJOR}:${MESA_MINOR} \ -+ ${OSMESA_LIB_DEPS:M-l*:S|-lGL|libGL.la|} ; \ ++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ ++ ${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info ${MESA_MAJOR}:${MESA_MINOR} \ ++ ${OSMESA_LIB_DEPS:S|-lGL|libGL.la|} ; \ else \ -- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ +- $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ +- -major $(MESA_MAJOR) \ - -minor $(MESA_MINOR) -patch $(GL_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) \ - $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ -+ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ -+ ${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ -+ -version-info ${MESA_MAJOR}:${MESA_MINOR} \ -+ ${OSMESA_LIB_DEPS:M-l*:S|-lGL|libGL.la|} ; \ ++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ ++ ${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info ${MESA_MAJOR}:${MESA_MINOR} \ ++ ${OSMESA_LIB_DEPS:S|-lGL|libGL.la|} ; \ fi diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae index 79ae3680348..e57ff89be2f 100644 --- a/graphics/MesaLib/patches/patch-ae +++ b/graphics/MesaLib/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.6 2005/06/05 15:39:06 minskim Exp $ +$NetBSD: patch-ae,v 1.7 2006/01/19 12:53:17 adam Exp $ ---- src/glw/Makefile.orig 2004-06-25 17:51:39.000000000 -0500 +--- src/glw/Makefile.orig 2005-07-26 07:55:56.000000000 +0200 +++ src/glw/Makefile @@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o) ##### RULES ##### @@ -11,17 +11,18 @@ $NetBSD: patch-ae,v 1.6 2005/06/05 15:39:06 minskim Exp $ -@@ -33,9 +33,10 @@ clean: +@@ -33,10 +33,10 @@ clean: # Make the library $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) -- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \ -- -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ +- $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \ +- -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \ +- $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLW_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ -+ -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR} \ -+ -L${X11BASE}/lib ${GLW_LIB_DEPS:M-l*:S|-lGL|libGL.la}} \ -+ -R ${X11BASE}/lib ++ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} \ ++ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info ${MAJOR}:${MINOR} -L${X11BASE}/lib \ ++ ${GLW_LIB_DEPS:S|-lGL|../mesa/libGL.la|} -Wl,-R${X11BASE}/lib # diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af index 785c0550954..2728a594ee4 100644 --- a/graphics/MesaLib/patches/patch-af +++ b/graphics/MesaLib/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.4 2005/06/07 14:21:42 minskim Exp $ +$NetBSD: patch-af,v 1.5 2006/01/19 12:53:17 adam Exp $ ---- src/glu/sgi/Makefile.orig 2004-08-16 02:46:28.000000000 -0500 +--- src/glu/sgi/Makefile.orig 2005-07-26 07:55:56.000000000 +0200 +++ src/glu/sgi/Makefile @@ -115,9 +115,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) ##### RULES ##### @@ -18,13 +18,13 @@ $NetBSD: patch-af,v 1.4 2005/06/07 14:21:42 minskim Exp $ # Make the library: $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) -- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \ -- -minor $(GLU_MINOR) -patch $(GLU_TINY) \ +- $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \ +- -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ - -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLU_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ -+ -rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR} \ -+ ${GLU_LIB_DEPS:M-l*} ++ ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} \ ++ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info ${GLU_MAJOR}:${GLU_MINOR} ${GLU_LIB_DEPS} clean: diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag index d4521db80ab..88b473a4c04 100644 --- a/graphics/MesaLib/patches/patch-ag +++ b/graphics/MesaLib/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.7 2005/06/07 14:31:48 minskim Exp $ +$NetBSD: patch-ag,v 1.8 2006/01/19 12:53:17 adam Exp $ ---- src/glut/glx/Makefile.orig 2004-12-05 12:00:20.000000000 -0600 +--- src/glut/glx/Makefile.orig 2005-07-26 07:55:56.000000000 +0200 +++ src/glut/glx/Makefile @@ -79,6 +79,7 @@ OBJECTS = $(SOURCES:.c=.o) ##### RULES ##### @@ -14,14 +14,14 @@ $NetBSD: patch-ag,v 1.7 2005/06/07 14:31:48 minskim Exp $ # Make the library $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) -- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \ -- -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \ -- -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ +- $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ +- -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ +- $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLUT_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ -+ -rpath ${PREFIX}/lib \ ++ ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} \ ++ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ + -version-info ${GLUT_MAJOR}:${GLUT_MINOR} \ -+ -L${X11BASE}/lib ${GLUT_LIB_DEPS:M-l*} -R${X11BASE}/lib ++ -L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GLUT_LIB_DEPS} clean: diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah index fadc6584af4..c8f6de7a8ff 100644 --- a/graphics/MesaLib/patches/patch-ah +++ b/graphics/MesaLib/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $ +$NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $ ---- configs/default.orig 2004-10-25 17:21:49.000000000 +0000 +--- 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 @@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $ GLU_CFLAGS = # Misc tools and flags -@@ -52,7 +48,7 @@ GLW_SOURCES = GLwDrawA.c +@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c # Directories LIB_DIR = $(TOP)/lib @@ -22,12 +22,12 @@ $NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $ SRC_DIRS = mesa glu glut/glx glw GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa -@@ -60,7 +56,7 @@ PROGRAM_DIRS = demos redbook samples xde - +@@ -66,7 +62,7 @@ PROGRAM_DIRS = demos redbook samples xde # Library/program dependencies --GL_LIB_DEPS = -lX11 -lXext -lm -lpthread -+GL_LIB_DEPS = -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + EXTRA_LIB_PATH ?= +-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm - GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm + GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm diff --git a/graphics/MesaLib/patches/patch-aj b/graphics/MesaLib/patches/patch-aj index b1b22d1f229..4511df2cebd 100644 --- a/graphics/MesaLib/patches/patch-aj +++ b/graphics/MesaLib/patches/patch-aj @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.1 2005/11/08 16:41:30 tv Exp $ +$NetBSD: patch-aj,v 1.2 2006/01/19 12:53:17 adam Exp $ ---- src/mesa/drivers/x11/xmesaP.h.orig 2004-03-04 11:22:01.000000000 -0500 +--- src/mesa/drivers/x11/xmesaP.h.orig 2005-10-04 23:00:36.000000000 +0200 +++ src/mesa/drivers/x11/xmesaP.h @@ -30,7 +30,7 @@ #ifdef XFree86Server @@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.1 2005/11/08 16:41:30 tv Exp $ # include <X11/extensions/XShm.h> #endif #include "GL/xmesa.h" -@@ -185,7 +185,7 @@ struct xmesa_buffer { +@@ -218,7 +218,7 @@ struct xmesa_buffer { /* 0 = not available */ /* 1 = XImage support available */ /* 2 = Pixmap support available too */ diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index 722ddef370a..7d6c45c454a 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:20 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2006/01/19 12:53:17 adam Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} -PKGREVISION= 1 COMMENT= GLU polygon tessellation facility for Mesa CONFLICTS+= Mesa-glx-[0-9]* diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk index 18f3916117e..3d15449dde3 100644 --- a/graphics/glu/builtin.mk +++ b/graphics/glu/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.8 2005/06/03 19:12:49 jlam Exp $ +# $NetBSD: builtin.mk,v 1.9 2006/01/19 12:53:17 adam Exp $ BUILTIN_PKG:= glu @@ -45,10 +45,10 @@ USE_BUILTIN.glu= ${IS_BUILTIN.glu} . if defined(BUILTIN_PKG.glu) && \ !empty(IS_BUILTIN.glu:M[yY][eE][sS]) USE_BUILTIN.glu= yes -. for _dep_ in ${BUILDLINK_DEPENDS.glu} +. for dep in ${BUILDLINK_DEPENDS.glu} . if !empty(USE_BUILTIN.glu:M[yY][eE][sS]) USE_BUILTIN.glu!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.glu:Q}; then \ + if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.glu:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index e1fef6c21e5..430d0f131cb 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:20 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2006/01/19 12:53:18 adam Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} -PKGREVISION= 3 COMMENT= GLUT Graphics library similar to SGI's OpenGL CONFLICTS+= Mesa-glx-[0-9]* |