diff options
25 files changed, 280 insertions, 311 deletions
diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007 index 5d2ce2626df..ab78f38e3f2 100644 --- a/doc/CHANGES-2007 +++ b/doc/CHANGES-2007 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2007,v 1.1791 2007/08/13 10:31:54 abs Exp $ +$NetBSD: CHANGES-2007,v 1.1792 2007/08/13 11:18:28 seb Exp $ Changes to the packages collection and infrastructure in 2007: @@ -3276,3 +3276,9 @@ Changes to the packages collection and infrastructure in 2007: Updated mail/postfix to 2.4.5 [martti 2007-08-13] Updated mail/postfix-current to 2.5-20070731 [martti 2007-08-13] Updated devel/cpuflags to 1.09 [abs 2007-08-13] + Downgraded graphics/MesaLib to 6.4.2nb3 [seb 2007-08-13] + Downgraded graphics/glu to 6.4.2 [seb 2007-08-13] + Downgraded graphics/glut to 6.4.2 [seb 2007-08-13] + Downgraded graphics/glx-utils to 6.4.2 [seb 2007-08-13] + Downgraded graphics/MesaDemos to 6.4.2 [seb 2007-08-13] + Downgraded graphics/Mesa to 6.4.2 [seb 2007-08-13] diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index acc3072636a..4d8db85a33b 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.56 2007/08/12 15:14:46 adam Exp $ +# $NetBSD: Makefile.common,v 1.57 2007/08/13 11:18:29 seb Exp $ # # This Makefile fragment is included either directly or indirectly (through # Makefile.lib) by all packages that are built from the Mesa sources. @@ -11,11 +11,12 @@ EXTRACT_SUFX= .tar.bz2 # When changing this version, please run "make distinfo" in the following # package directories: +# # graphics/MesaLib # graphics/MesaDemos # graphics/glx-utils # -MESA_VERSION= 7.0.1 +MESA_VERSION= 6.4.2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mesa3d.org/ diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib index 9bd044aa05a..faa1df6cc3e 100644 --- a/graphics/Mesa/Makefile.lib +++ b/graphics/Mesa/Makefile.lib @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.lib,v 1.5 2007/08/12 15:14:47 adam Exp $ +# $NetBSD: Makefile.lib,v 1.6 2007/08/13 11:18:30 seb Exp $ # # This Makefile fragment is included by all packages that build libraries # from the Mesa sources. @@ -45,7 +45,7 @@ BUILD_TARGET= pkgsrc .PHONY: Mesa-install-libs pre-install: Mesa-install-libs Mesa-install-libs: - ${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries." + @${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries." @for lib in "" ${INSTLIBS}; do \ ${TEST} -n "$$lib" || continue; \ ${SETENV} ${MAKE_ENV} \ diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index 5c9867e67d1..274978a5624 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2007/08/12 15:14:47 adam Exp $ +# $NetBSD: Makefile,v 1.31 2007/08/13 11:18:32 seb Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -18,19 +18,19 @@ MAKE_FLAGS+= LIB_DEP="" .include "../../graphics/Mesa/buildlink3.mk" pre-build: - cd ${WRKSRC} && rm -fr src + cd ${WRKSRC} && ${RM} -fr src do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} - cd ${WRKSRC}/progs && pax \ + cd ${WRKSRC}/progs && ${PAX} \ -s ',^./.*Makefile.*,,' \ - -s ',^./CVS.*,,' \ - -s ',^./.*\.o$$,,' \ - -s ',^./\.libs.*,,' \ - -s ',^./\.deps.*,,' \ - -s ',^./.*\.orig$$,,' \ + -s ',^./CVS.*,,' \ + -s ',^./.*\.o$$,,' \ + -s ',^./\.libs.*,,' \ + -s ',^./\.deps.*,,' \ + -s ',^./.*\.orig$$,,' \ -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} - chmod -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV} + ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV} .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST index 68f248a55b2..5fcfe086c7b 100644 --- a/graphics/MesaDemos/PLIST +++ b/graphics/MesaDemos/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.9 2007/08/12 15:14:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/08/13 11:18:34 seb 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/arbfplight share/examples/${PKGNAME}/demos/arbfplight.c -share/examples/${PKGNAME}/demos/arbfslight -share/examples/${PKGNAME}/demos/arbfslight.c share/examples/${PKGNAME}/demos/arbocclude share/examples/${PKGNAME}/demos/arbocclude.c share/examples/${PKGNAME}/demos/bounce @@ -18,21 +16,14 @@ share/examples/${PKGNAME}/demos/cubemap.c share/examples/${PKGNAME}/demos/descrip.mms share/examples/${PKGNAME}/demos/drawpix share/examples/${PKGNAME}/demos/drawpix.c -share/examples/${PKGNAME}/demos/engine -share/examples/${PKGNAME}/demos/engine.c -share/examples/${PKGNAME}/demos/extfuncs.h share/examples/${PKGNAME}/demos/fire share/examples/${PKGNAME}/demos/fire.c share/examples/${PKGNAME}/demos/fogcoord share/examples/${PKGNAME}/demos/fogcoord.c share/examples/${PKGNAME}/demos/fplight share/examples/${PKGNAME}/demos/fplight.c -share/examples/${PKGNAME}/demos/fslight -share/examples/${PKGNAME}/demos/fslight.c share/examples/${PKGNAME}/demos/gamma share/examples/${PKGNAME}/demos/gamma.c -share/examples/${PKGNAME}/demos/gearbox -share/examples/${PKGNAME}/demos/gearbox.c share/examples/${PKGNAME}/demos/gears share/examples/${PKGNAME}/demos/gears.c share/examples/${PKGNAME}/demos/geartrain @@ -42,8 +33,6 @@ share/examples/${PKGNAME}/demos/glinfo share/examples/${PKGNAME}/demos/glinfo.c share/examples/${PKGNAME}/demos/gloss share/examples/${PKGNAME}/demos/gloss.c -share/examples/${PKGNAME}/demos/glslnoise -share/examples/${PKGNAME}/demos/glslnoise.c share/examples/${PKGNAME}/demos/gltestperf share/examples/${PKGNAME}/demos/gltestperf.c share/examples/${PKGNAME}/demos/glutfx @@ -59,11 +48,14 @@ share/examples/${PKGNAME}/demos/morph3d share/examples/${PKGNAME}/demos/morph3d.c 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/paltex share/examples/${PKGNAME}/demos/paltex.c share/examples/${PKGNAME}/demos/particles.cxx share/examples/${PKGNAME}/demos/particles.h +share/examples/${PKGNAME}/demos/pixeltex +share/examples/${PKGNAME}/demos/pixeltex.c share/examples/${PKGNAME}/demos/pointblast share/examples/${PKGNAME}/demos/pointblast.c share/examples/${PKGNAME}/demos/rain.cxx @@ -81,16 +73,12 @@ 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/singlebuffer -share/examples/${PKGNAME}/demos/singlebuffer.c share/examples/${PKGNAME}/demos/spectex share/examples/${PKGNAME}/demos/spectex.c share/examples/${PKGNAME}/demos/spriteblast share/examples/${PKGNAME}/demos/spriteblast.c share/examples/${PKGNAME}/demos/stex3d share/examples/${PKGNAME}/demos/stex3d.c -share/examples/${PKGNAME}/demos/streaming_rect -share/examples/${PKGNAME}/demos/streaming_rect.c share/examples/${PKGNAME}/demos/teapot share/examples/${PKGNAME}/demos/teapot.c share/examples/${PKGNAME}/demos/terrain @@ -106,8 +94,6 @@ share/examples/${PKGNAME}/demos/texenv share/examples/${PKGNAME}/demos/texenv.c share/examples/${PKGNAME}/demos/texobj share/examples/${PKGNAME}/demos/texobj.c -share/examples/${PKGNAME}/demos/trackball.c -share/examples/${PKGNAME}/demos/trackball.h share/examples/${PKGNAME}/demos/trispd share/examples/${PKGNAME}/demos/trispd.c share/examples/${PKGNAME}/demos/tunnel @@ -115,44 +101,11 @@ share/examples/${PKGNAME}/demos/tunnel.c share/examples/${PKGNAME}/demos/tunnel2 share/examples/${PKGNAME}/demos/tunnel2.c share/examples/${PKGNAME}/demos/tunneldat.h -share/examples/${PKGNAME}/demos/vao_demo -share/examples/${PKGNAME}/demos/vao_demo.c share/examples/${PKGNAME}/demos/winpos share/examples/${PKGNAME}/demos/winpos.c -share/examples/${PKGNAME}/fbdev/glfbdevtest.c share/examples/${PKGNAME}/ggi/asc-view.c share/examples/${PKGNAME}/ggi/gears.c share/examples/${PKGNAME}/ggi/gears2.c -share/examples/${PKGNAME}/glsl/CH06-brick.frag.txt -share/examples/${PKGNAME}/glsl/CH06-brick.vert.txt -share/examples/${PKGNAME}/glsl/CH11-bumpmap.frag.txt -share/examples/${PKGNAME}/glsl/CH11-bumpmap.vert.txt -share/examples/${PKGNAME}/glsl/CH11-toyball.frag.txt -share/examples/${PKGNAME}/glsl/CH11-toyball.vert.txt -share/examples/${PKGNAME}/glsl/CH18-mandel.frag.txt -share/examples/${PKGNAME}/glsl/CH18-mandel.vert.txt -share/examples/${PKGNAME}/glsl/brick -share/examples/${PKGNAME}/glsl/brick.c -share/examples/${PKGNAME}/glsl/bump -share/examples/${PKGNAME}/glsl/bump.c -share/examples/${PKGNAME}/glsl/cubemap.frag.txt -share/examples/${PKGNAME}/glsl/deriv -share/examples/${PKGNAME}/glsl/deriv.c -share/examples/${PKGNAME}/glsl/extfuncs.h -share/examples/${PKGNAME}/glsl/mandelbrot -share/examples/${PKGNAME}/glsl/mandelbrot.c -share/examples/${PKGNAME}/glsl/noise -share/examples/${PKGNAME}/glsl/noise.c -share/examples/${PKGNAME}/glsl/readtex.c -share/examples/${PKGNAME}/glsl/readtex.h -share/examples/${PKGNAME}/glsl/reflect.vert.txt -share/examples/${PKGNAME}/glsl/shadowtex.frag.txt -share/examples/${PKGNAME}/glsl/simple.vert.txt -share/examples/${PKGNAME}/glsl/texdemo1 -share/examples/${PKGNAME}/glsl/texdemo1.c -share/examples/${PKGNAME}/glsl/toyball -share/examples/${PKGNAME}/glsl/toyball.c -share/examples/${PKGNAME}/images/arch.rgb share/examples/${PKGNAME}/images/bw.rgb share/examples/${PKGNAME}/images/girl.rgb share/examples/${PKGNAME}/images/girl2.rgb @@ -165,8 +118,6 @@ 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}/osdemos/ostest1.c -share/examples/${PKGNAME}/osdemos/readtex.c share/examples/${PKGNAME}/redbook/README share/examples/${PKGNAME}/redbook/aaindex share/examples/${PKGNAME}/redbook/aaindex.c @@ -361,7 +312,6 @@ share/examples/${PKGNAME}/samples/wave.c share/examples/${PKGNAME}/util/README share/examples/${PKGNAME}/util/dumpstate.c share/examples/${PKGNAME}/util/errcheck.c -share/examples/${PKGNAME}/util/extfuncs.h share/examples/${PKGNAME}/util/glstate.c share/examples/${PKGNAME}/util/glstate.h share/examples/${PKGNAME}/util/glutskel.c @@ -373,8 +323,6 @@ share/examples/${PKGNAME}/util/readtex.c share/examples/${PKGNAME}/util/readtex.h share/examples/${PKGNAME}/util/showbuffer.c share/examples/${PKGNAME}/util/showbuffer.h -share/examples/${PKGNAME}/util/trackball.c -share/examples/${PKGNAME}/util/trackball.h share/examples/${PKGNAME}/util/winpos.c share/examples/${PKGNAME}/windml/readtex.c share/examples/${PKGNAME}/windml/uglaccum.c @@ -396,6 +344,7 @@ 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 @@ -433,6 +382,7 @@ share/examples/${PKGNAME}/xdemos/vindex.c share/examples/${PKGNAME}/xdemos/vtest.c share/examples/${PKGNAME}/xdemos/wincopy share/examples/${PKGNAME}/xdemos/wincopy.c +share/examples/${PKGNAME}/xdemos/xdemo share/examples/${PKGNAME}/xdemos/xdemo.c share/examples/${PKGNAME}/xdemos/xfont share/examples/${PKGNAME}/xdemos/xfont.c diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo index de702470690..cf3103d0d10 100644 --- a/graphics/MesaDemos/distinfo +++ b/graphics/MesaDemos/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.17 2007/08/12 15:14:47 adam Exp $ +$NetBSD: distinfo,v 1.18 2007/08/13 11:18:35 seb Exp $ -SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec -RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6 -Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes -SHA1 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = ee63b2b1804106a05efaffd3da2dee7637d0eecb -RMD160 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 1c84391874e013145529fee43763ff9f57a88dc9 -Size (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 315599 bytes -SHA1 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = deb1002cf377ba8bd9407bd3cf573f8c8be31671 -RMD160 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 -Size (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = 3343538 bytes +SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640 +RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 +Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes +SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771 +RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e +Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes +SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258 +RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a +Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4 -SHA1 (patch-ac) = 946aa52c85556440b4dc2ff99a6807c3c036c01e +SHA1 (patch-ac) = ebaaf755d35bd7f82fe93cff9bb98abee6bbf415 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1 -SHA1 (patch-ah) = 7ea6281c244a6329f83d4e137c015e3f4c259ff8 -SHA1 (patch-ai) = b51a6d1ee028120db5b791f0f65c4eb67558b4ee +SHA1 (patch-ah) = 02f1c4ac8a41999454cbebe5d91167fafc7f554e +SHA1 (patch-ai) = 9738bb842646980fccfd7f9eb5f830d1dc994c8c diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac index c977be22e51..17737b17e2e 100644 --- a/graphics/MesaDemos/patches/patch-ac +++ b/graphics/MesaDemos/patches/patch-ac @@ -1,12 +1,8 @@ -$NetBSD: patch-ac,v 1.10 2007/08/12 15:14:47 adam Exp $ +$NetBSD: patch-ac,v 1.11 2007/08/13 11:18:36 seb Exp $ ---- Makefile.orig 2007-08-03 21:31:28.000000000 +0200 +--- Makefile.orig 2005-11-29 23:38:49.000000000 +0100 +++ Makefile -@@ -1,10 +1,10 @@ - # Top-level Mesa makefile - --SHELL = /bin/bash -+SHELL = /bin/sh +@@ -2,7 +2,7 @@ TOP = . @@ -15,11 +11,11 @@ $NetBSD: patch-ac,v 1.10 2007/08/12 15:14:47 adam Exp $ default: $(TOP)/configs/current -@@ -137,6 +137,7 @@ linux-x86-64-static \ +@@ -117,6 +117,7 @@ linux-x86-xcb \ linux-x86-glide \ linux-x86-static \ netbsd \ +pkgsrc \ openbsd \ osf1 \ - osf1-static \ + solaris-x86 \ diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah index 5174043c869..bfa85b436f8 100644 --- a/graphics/MesaDemos/patches/patch-ah +++ b/graphics/MesaDemos/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.4 2007/08/12 15:14:47 adam Exp $ +$NetBSD: patch-ah,v 1.5 2007/08/13 11:18:38 seb Exp $ ---- configs/default.orig 2007-08-01 23:49:59.000000000 +0200 +--- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 +++ configs/default -@@ -16,10 +16,6 @@ MESA_TINY=1 +@@ -14,10 +14,6 @@ MESA_TINY=1 DRM_SOURCE_PATH=$(TOP)/../drm # Compiler and flags @@ -13,12 +13,12 @@ $NetBSD: patch-ah,v 1.4 2007/08/12 15:14:47 adam Exp $ GLU_CFLAGS = # Misc tools and flags -@@ -78,7 +74,7 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(G +@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c - - # Installation directories (for make install) --INSTALL_DIR = /usr/local -+INSTALL_DIR = ${PREFIX} - DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri - - # Where libGL will look for DRI hardware drivers + # Directories + LIB_DIR = $(TOP)/lib +-INSTALL_PREFIX = /usr/local ++INSTALL_PREFIX = ${PREFIX} + SRC_DIRS = mesa glu glut/glx glw + GLU_DIRS = sgi + DRIVER_DIRS = x11 osmesa diff --git a/graphics/MesaDemos/patches/patch-ai b/graphics/MesaDemos/patches/patch-ai index 1e07e61c857..14eb9b16035 100644 --- a/graphics/MesaDemos/patches/patch-ai +++ b/graphics/MesaDemos/patches/patch-ai @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.4 2007/08/12 15:14:47 adam Exp $ +$NetBSD: patch-ai,v 1.5 2007/08/13 11:18:38 seb Exp $ ---- include/GL/glxext.h.orig 2007-06-22 00:10:53.000000000 +0200 +--- include/GL/glxext.h.orig 2005-11-08 10:20:29.000000000 +1300 +++ include/GL/glxext.h -@@ -389,7 +389,7 @@ typedef struct { - #elif defined(__sun__) || defined(__digital__) +@@ -334,7 +334,7 @@ typedef struct { + #if defined(__sun__) #include <inttypes.h> #if defined(__STDC__) -#if defined(__arch64__) +#if defined(__arch64__) || defined(_LP64) typedef long int int64_t; - typedef unsigned long int uint64_t; #else + typedef long long int int64_t; diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 9feccface79..93815160fdd 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2007/08/12 15:14:47 adam Exp $ +# $NetBSD: Makefile,v 1.54 2007/08/13 11:18:39 seb Exp $ PKGNAME= MesaLib-${MESA_VERSION} +PKGREVISION= 3 COMMENT= Graphics library similar to SGI's OpenGL .include "../../graphics/Mesa/Makefile.lib" @@ -25,7 +26,7 @@ PTHREAD_STUBLIB= # provided by libc PKGSRC_MAKE_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB} pre-build: - cd ${WRKSRC} && rm -fr src/glu src/glut progs + cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 090c7790c8b..f6dc506c82b 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.39 2007/08/12 15:14:47 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2007/08/13 11:18:40 seb Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+ @@ -16,9 +16,9 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=3.4.2 BUILDLINK_ABI_DEPENDS.MesaLib+= MesaLib>=6.4.1nb1 BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib -. if !defined(BUILDING_MESA) +.if !defined(BUILDING_MESA) BUILDLINK_CPPFLAGS.MesaLib= -DGLX_GLXEXT_LEGACY -. endif +.endif BUILDLINK_TRANSFORM+= l:MesaGL:GL diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 592717a4fb2..f7570eafb34 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,26 +1,26 @@ -$NetBSD: distinfo,v 1.47 2007/08/12 15:14:48 adam Exp $ +$NetBSD: distinfo,v 1.48 2007/08/13 11:18:40 seb Exp $ -SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec -RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6 -Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes -SHA1 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = ee63b2b1804106a05efaffd3da2dee7637d0eecb -RMD160 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 1c84391874e013145529fee43763ff9f57a88dc9 -Size (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 315599 bytes -SHA1 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = deb1002cf377ba8bd9407bd3cf573f8c8be31671 -RMD160 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 -Size (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = 3343538 bytes +SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258 +RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a +Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes +SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771 +RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e +Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes +SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640 +RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 +Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606 SHA1 (patch-ab) = c257a57d4570576f160e9a4c029384718402c1bd -SHA1 (patch-ac) = 8f3a7279f79ffa95902b12cec9e63cd43993adbd -SHA1 (patch-ad) = cfa22d638c973fa5b80162447c13205dac34b3e6 -SHA1 (patch-ae) = f75748f523d211273fd02a971b59b29efee5be80 -SHA1 (patch-af) = 9d74d25ab6ebd49282fbfc1af7dfb77e6fa3ced3 -SHA1 (patch-ag) = 6c42ffbdb11e1c241e4bece89188b752103dc19f -SHA1 (patch-ah) = 699d1d1d43b62eb53c0508087439fa2632ea4e02 +SHA1 (patch-ac) = a12c3538907aaa63184371037c0f70924861fbe4 +SHA1 (patch-ad) = e926180243a180bc80b0332f2bcacc14b7c1f13b +SHA1 (patch-ae) = c7dd8f4b9db5241acdd0f850162b8b4116cd93bd +SHA1 (patch-af) = e3daa689966c27c32ddb0060a0910d2e5d063555 +SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac +SHA1 (patch-ah) = 94faa48a6945aa6e7a0fc8806129a463d99d4338 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558 -SHA1 (patch-aj) = 5155723f61ed5288c763da8c0e4645e8b9f19807 +SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a SHA1 (patch-ak) = 9f3480d08d2b6b7048b018956c57ad6e5d253174 -SHA1 (patch-al) = be55e752fb12c10593d4adb75e11593081ee13fd -SHA1 (patch-am) = 81ab11fba15b20adb88d4fc987f63b5a127e1cbf +SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7 +SHA1 (patch-am) = a7a40d0d1f371cfa312ae504582ce0521172f85c SHA1 (patch-ca) = 5a40dba087b59711778f499b084a2b818b779320 SHA1 (patch-cb) = 31b4358e171042608a017f4dc98d44f35fcdce70 diff --git a/graphics/MesaLib/hacks.mk b/graphics/MesaLib/hacks.mk index 3b8cefe41e7..eaedc11c500 100644 --- a/graphics/MesaLib/hacks.mk +++ b/graphics/MesaLib/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2007/08/12 15:14:48 adam Exp $ +# $NetBSD: hacks.mk,v 1.3 2007/08/13 11:18:43 seb Exp $ .if !defined(MESALIBS_HACKS_MK) MESALIBS_HACKS_MK= # defined @@ -10,7 +10,7 @@ MESALIBS_HACKS_MK= # defined .if ${LOWER_OPSYS} == "irix5.3" PKG_HACKS+= sys_types_h-inttypes_h-conflict post-wrapper: - mkdir ${BUILDLINK_DIR}/include/sys && grep -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h + ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h # should match int8_t, int16_t, and int32_t (only) .endif diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac index c19f413439b..f161beee91c 100644 --- a/graphics/MesaLib/patches/patch-ac +++ b/graphics/MesaLib/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.10 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-ac,v 1.11 2007/08/13 11:18:44 seb Exp $ ---- Makefile.orig 2007-08-03 21:31:28.000000000 +0200 +--- Makefile.orig 2005-11-29 23:38:49.000000000 +0100 +++ Makefile -@@ -4,7 +4,7 @@ SHELL = /bin/bash +@@ -2,7 +2,7 @@ TOP = . @@ -11,19 +11,19 @@ $NetBSD: patch-ac,v 1.10 2007/08/12 15:14:48 adam Exp $ default: $(TOP)/configs/current -@@ -90,6 +90,7 @@ hpux11-ia64 \ - hpux11-ia64-static \ +@@ -74,6 +74,7 @@ hpux11-64 \ + hpux11-64-static \ hpux9 \ hpux9-gcc \ +interix3 \ irix6-64 \ irix6-64-static \ irix6-n32 \ -@@ -137,6 +138,7 @@ linux-x86-64-static \ +@@ -117,6 +118,7 @@ linux-x86-xcb \ linux-x86-glide \ linux-x86-static \ netbsd \ +pkgsrc \ openbsd \ osf1 \ - osf1-static \ + solaris-x86 \ diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad index cccca1cd450..afb67572588 100644 --- a/graphics/MesaLib/patches/patch-ad +++ b/graphics/MesaLib/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.9 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-ad,v 1.10 2007/08/13 11:18:44 seb Exp $ ---- src/mesa/Makefile.orig 2007-08-01 23:50:00.000000000 +0200 +--- src/mesa/Makefile.orig 2005-07-26 07:55:56.000000000 +0200 +++ src/mesa/Makefile @@ -14,13 +14,13 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$ .SUFFIXES : .cpp @@ -19,13 +19,13 @@ $NetBSD: patch-ad,v 1.9 2007/08/12 15:14:48 adam Exp $ # Figure out what to make here -@@ -111,24 +111,24 @@ osmesa-only: depend subdirs $(TOP)/$(LIB +@@ -150,25 +150,23 @@ subdirs: # Make the GL library - $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) + $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) - @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ - -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -- -install $(TOP)/$(LIB_DIR) \ +- -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} \ @@ -33,12 +33,12 @@ $NetBSD: patch-ad,v 1.9 2007/08/12 15:14:48 adam Exp $ + -L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GL_LIB_DEPS} # Make the OSMesa library - # Note: version is kept at 6.5.3 to simplify app/linking issues - $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) + $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ - $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ -- -major 6 -minor 5 -patch 3 \ -- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ +- -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 \ @@ -46,8 +46,9 @@ $NetBSD: patch-ad,v 1.9 2007/08/12 15:14:48 adam Exp $ + ${OSMESA_LIB_DEPS:S|-lGL|libGL.la|} ; \ else \ - $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ -- -major 6 -minor 5 -patch 3 \ -- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ +- -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 \ diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae index e4a0d0195b2..089421c0db8 100644 --- a/graphics/MesaLib/patches/patch-ae +++ b/graphics/MesaLib/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.8 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-ae,v 1.9 2007/08/13 11:18:45 seb Exp $ ---- src/glw/Makefile.orig 2007-06-22 00:10:54.000000000 +0200 +--- 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,13 +11,13 @@ $NetBSD: patch-ae,v 1.8 2007/08/12 15:14:48 adam Exp $ -@@ -38,10 +38,10 @@ clean: +@@ -33,10 +33,10 @@ clean: # Make the library - $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) + $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) - $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \ - -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \ -- $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ +- $(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 \ diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af index 24006913dba..b0bae071de1 100644 --- a/graphics/MesaLib/patches/patch-af +++ b/graphics/MesaLib/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.7 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-af,v 1.8 2007/08/13 11:18:45 seb Exp $ ---- src/glu/sgi/Makefile.orig 2007-06-22 00:10:54.000000000 +0200 +--- 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 ##### @@ -14,13 +14,13 @@ $NetBSD: patch-af,v 1.7 2007/08/12 15:14:48 adam Exp $ $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ -@@ -136,10 +138,9 @@ $(TOP)/$(LIB_DIR): +@@ -136,10 +138,9 @@ $(LIB_DIR): # Make the library: - $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) + $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) - $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \ - -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ -- -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ +- -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLU_LIB_DEPS) $(OBJECTS) + ${LIBTOOL} --tag=CXX --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} \ + ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag index 8df032734e7..61065c5a415 100644 --- a/graphics/MesaLib/patches/patch-ag +++ b/graphics/MesaLib/patches/patch-ag @@ -1,22 +1,22 @@ -$NetBSD: patch-ag,v 1.9 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-ag,v 1.10 2007/08/13 11:18:46 seb Exp $ ---- src/glut/glx/Makefile.orig 2007-06-22 00:10:54.000000000 +0200 +--- 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 ##### .c.o: + ${LIBTOOL} --mode=compile \ - $(CC) -c -I$(TOP)/include $(X11_INCLUDES) $(CFLAGS) $(GLUT_CFLAGS) $< + $(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $< -@@ -90,10 +91,10 @@ default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NA +@@ -90,10 +91,10 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library - $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) + $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) - $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ - -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ -- $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ +- $(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 \ @@ -24,4 +24,4 @@ $NetBSD: patch-ag,v 1.9 2007/08/12 15:14:48 adam Exp $ + -L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GLUT_LIB_DEPS} - install: + clean: diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah index f20dc7d30f1..b0d488741dd 100644 --- a/graphics/MesaLib/patches/patch-ah +++ b/graphics/MesaLib/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.6 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-ah,v 1.7 2007/08/13 11:18:46 seb Exp $ ---- configs/default.orig 2007-08-01 23:49:59.000000000 +0200 +--- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 +++ configs/default -@@ -16,10 +16,6 @@ MESA_TINY=1 +@@ -14,10 +14,6 @@ MESA_TINY=1 DRM_SOURCE_PATH=$(TOP)/../drm # Compiler and flags @@ -13,23 +13,21 @@ $NetBSD: patch-ah,v 1.6 2007/08/12 15:14:48 adam Exp $ GLU_CFLAGS = # Misc tools and flags -@@ -68,7 +64,7 @@ PROGRAM_DIRS = demos redbook samples gls +@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c + + # Directories + LIB_DIR = $(TOP)/lib +-INSTALL_PREFIX = /usr/local ++INSTALL_PREFIX = ${PREFIX} + SRC_DIRS = mesa glu glut/glx glw + GLU_DIRS = sgi + DRIVER_DIRS = x11 osmesa +@@ -66,7 +62,7 @@ PROGRAM_DIRS = demos redbook samples xde # Library/program dependencies - #EXTRA_LIB_PATH ?= + EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ${PTHREAD_STUBLIB} - OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) - GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm - GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm -@@ -78,8 +74,8 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(G - - - # Installation directories (for make install) --INSTALL_DIR = /usr/local --DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri -+INSTALL_DIR = ${PREFIX} -+DRI_DRIVER_INSTALL_DIR = ${PREFIX}/lib/modules/dri - - # Where libGL will look for DRI hardware drivers - DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) + 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) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm diff --git a/graphics/MesaLib/patches/patch-aj b/graphics/MesaLib/patches/patch-aj index deff57b5b60..817f6e3608e 100644 --- a/graphics/MesaLib/patches/patch-aj +++ b/graphics/MesaLib/patches/patch-aj @@ -1,13 +1,22 @@ -$NetBSD: patch-aj,v 1.3 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-aj,v 1.4 2007/08/13 11:18:47 seb Exp $ ---- src/mesa/drivers/x11/xmesaP.h.orig 2007-08-01 23:50:00.000000000 +0200 +--- src/mesa/drivers/x11/xmesaP.h.orig 2005-10-04 23:00:36.000000000 +0200 +++ src/mesa/drivers/x11/xmesaP.h -@@ -228,7 +228,7 @@ struct xmesa_buffer { +@@ -30,7 +30,7 @@ + #ifdef XFree86Server + # include "GL/xf86glx.h" + # include "xf86glx_util.h" +-#elif defined(USE_XSHM) ++#elif defined(USE_XSHM) || defined(USE_XSHM_HDRONLY) + # include <X11/extensions/XShm.h> + #endif + #include "GL/xmesa.h" +@@ -218,7 +218,7 @@ struct xmesa_buffer { /* 0 = not available */ /* 1 = XImage support available */ /* 2 = Pixmap support available too */ --#if defined(USE_XSHM) && !defined(XFree86Server) -+#if (defined(USE_XSHM) || defined(USE_XSHM_HDRONLY)) && !defined(XFree86Server) +-#ifdef USE_XSHM ++#if defined(USE_XSHM) || defined(USE_XSHM_HDRONLY) XShmSegmentInfo shminfo; #endif - + #endif diff --git a/graphics/MesaLib/patches/patch-al b/graphics/MesaLib/patches/patch-al index 461ad3ec460..336475d77dd 100644 --- a/graphics/MesaLib/patches/patch-al +++ b/graphics/MesaLib/patches/patch-al @@ -1,8 +1,11 @@ -$NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-al,v 1.3 2007/08/13 11:18:47 seb Exp $ ---- src/mesa/drivers/x11/xm_tri.c.orig 2007-06-22 00:10:54.000000000 +0200 -+++ src/mesa/drivers/x11/xm_tri.c -@@ -66,7 +66,7 @@ +Declarations inside of macros are evil. Even more if they are not preceded +by an additional opening brace. + +--- src/mesa/drivers/x11/xm_tri.c.orig Tue Jan 31 22:16:56 2006 ++++ src/mesa/drivers/x11/xm_tri.c Tue Jan 31 22:30:15 2006 +@@ -64,7 +64,7 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); @@ -11,7 +14,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLint x = span.x, y = YFLIP(xrb, span.y); \ GLuint i; \ for (i = 0; i < span.end; i++, x++) { \ -@@ -82,7 +82,7 @@ +@@ -80,7 +80,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -20,7 +23,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -102,7 +102,7 @@ +@@ -99,7 +99,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -29,16 +32,16 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -117,7 +117,7 @@ +@@ -112,7 +112,7 @@ + span.green += span.greenStep; \ span.blue += span.blueStep; \ - span.alpha += span.alphaStep; \ span.z += span.zStep; \ - } + } } #include "swrast/s_tritemp.h" -@@ -137,7 +137,7 @@ +@@ -131,7 +131,7 @@ #define SETUP_CODE \ GET_XRB(xrb); @@ -47,16 +50,16 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -152,7 +152,7 @@ +@@ -144,7 +144,7 @@ + span.green += span.greenStep; \ span.blue += span.blueStep; \ - span.alpha += span.alphaStep; \ span.z += span.zStep; \ - } + } } #include "swrast/s_tritemp.h" -@@ -171,7 +171,7 @@ +@@ -163,7 +163,7 @@ #define SETUP_CODE \ GET_XRB(xrb); @@ -65,7 +68,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -184,7 +184,7 @@ +@@ -176,7 +176,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -74,16 +77,16 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -202,7 +202,7 @@ +@@ -194,7 +194,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); -#define RENDER_SPAN( span ) \ -+#define RENDER_SPAN( span ) { \ ++#define RENDER_SPAN( span ) { \ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -217,7 +217,7 @@ +@@ -209,7 +209,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -92,7 +95,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -232,7 +232,7 @@ +@@ -224,7 +224,7 @@ #define SETUP_CODE \ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); @@ -101,7 +104,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -248,7 +248,7 @@ +@@ -240,7 +240,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -110,7 +113,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -265,7 +265,7 @@ +@@ -257,7 +257,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -119,7 +122,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -278,7 +278,7 @@ +@@ -270,7 +270,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -128,7 +131,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -296,7 +296,7 @@ +@@ -288,7 +288,7 @@ #define SETUP_CODE \ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); @@ -137,7 +140,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -310,7 +310,7 @@ +@@ -302,7 +302,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -146,7 +149,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -327,7 +327,7 @@ +@@ -319,7 +319,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -155,7 +158,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ XDITHER_SETUP(y); \ -@@ -342,7 +342,7 @@ +@@ -334,7 +334,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -164,7 +167,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -357,7 +357,7 @@ +@@ -349,7 +349,7 @@ #define SETUP_CODE \ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; @@ -173,7 +176,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ XDITHER_SETUP(y); \ -@@ -373,7 +373,7 @@ +@@ -365,7 +365,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -182,7 +185,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -390,7 +390,7 @@ +@@ -382,7 +382,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -191,7 +194,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ LOOKUP_SETUP; \ for (i = 0; i < span.end; i++) { \ -@@ -404,7 +404,7 @@ +@@ -396,7 +396,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -200,7 +203,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -422,7 +422,7 @@ +@@ -414,7 +414,7 @@ #define SETUP_CODE \ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); @@ -209,7 +212,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -436,7 +436,7 @@ +@@ -428,7 +428,7 @@ span.green += span.greenStep; \ span.blue += span.blueStep; \ span.z += span.zStep; \ @@ -218,7 +221,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -453,7 +453,7 @@ +@@ -445,7 +445,7 @@ XMesaImage *img = xrb->ximage; \ unsigned long pixel; \ PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]); @@ -227,7 +230,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -463,7 +463,7 @@ +@@ -455,7 +455,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -236,16 +239,16 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -481,7 +481,7 @@ +@@ -472,7 +472,7 @@ + #define SETUP_CODE \ GET_XRB(xrb); \ - GLuint p = PACK_8A8B8G8R( v2->color[0], v2->color[1],\ - v2->color[2], v2->color[3]); + GLuint p = PACK_8B8G8R( v2->color[0], v2->color[1], v2->color[2] ); -#define RENDER_SPAN( span ) \ +#define RENDER_SPAN( span ) { \ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -490,7 +490,7 @@ +@@ -481,7 +481,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -254,16 +257,16 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -508,7 +508,7 @@ +@@ -498,7 +498,7 @@ + #define SETUP_CODE \ GET_XRB(xrb); \ - GLuint p = PACK_8A8R8G8B(v2->color[0], v2->color[1], \ - v2->color[2], v2->color[3]); + GLuint p = PACK_8R8G8B( v2->color[0], v2->color[1], v2->color[2] ); -#define RENDER_SPAN( span ) \ +#define RENDER_SPAN( span ) { \ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -517,7 +517,7 @@ +@@ -507,7 +507,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -272,7 +275,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -534,7 +534,7 @@ +@@ -524,7 +524,7 @@ #define SETUP_CODE \ GET_XRB(xrb); \ GLuint p = PACK_8R8G8B( v2->color[0], v2->color[1], v2->color[2] ); @@ -281,7 +284,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -543,7 +543,7 @@ +@@ -533,7 +533,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -290,7 +293,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -561,7 +561,7 @@ +@@ -551,7 +551,7 @@ #define SETUP_CODE \ GET_XRB(xrb); \ const GLubyte *color = v2->color; @@ -299,7 +302,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -573,7 +573,7 @@ +@@ -563,7 +563,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -308,7 +311,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -588,7 +588,7 @@ +@@ -578,7 +578,7 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; @@ -317,7 +320,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -601,7 +601,7 @@ +@@ -591,7 +591,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -326,7 +329,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -618,7 +618,7 @@ +@@ -608,7 +608,7 @@ #define SETUP_CODE \ GET_XRB(xrb); \ GLushort p = PACK_5R6G5B( v2->color[0], v2->color[1], v2->color[2] ); @@ -335,7 +338,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -627,7 +627,7 @@ +@@ -617,7 +617,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -344,7 +347,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -645,7 +645,7 @@ +@@ -635,7 +635,7 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); \ const GLubyte *color = v2->color; @@ -353,7 +356,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -656,7 +656,7 @@ +@@ -646,7 +646,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -362,7 +365,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -673,7 +673,7 @@ +@@ -663,7 +663,7 @@ #define SETUP_CODE \ GET_XRB(xrb); \ FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] ); @@ -371,7 +374,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ FLAT_DITHER_ROW_SETUP(YFLIP(xrb, y)); \ -@@ -684,7 +684,7 @@ +@@ -674,7 +674,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -380,7 +383,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -699,7 +699,7 @@ +@@ -689,7 +689,7 @@ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; \ FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] ); @@ -389,7 +392,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ FLAT_DITHER_ROW_SETUP(y); \ -@@ -711,7 +711,7 @@ +@@ -701,7 +701,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -398,7 +401,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -731,7 +731,7 @@ +@@ -721,7 +721,7 @@ GLubyte r = v2->color[0]; \ GLubyte g = v2->color[1]; \ GLubyte b = v2->color[2]; @@ -407,7 +410,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -741,7 +741,7 @@ +@@ -731,7 +731,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -416,7 +419,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -762,7 +762,7 @@ +@@ -752,7 +752,7 @@ GLubyte g = v2->color[1]; \ GLubyte b = v2->color[2]; \ GLubyte p = LOOKUP(r,g,b); @@ -425,7 +428,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ const DEPTH_TYPE z = FixedToDepth(span.z); \ -@@ -771,7 +771,7 @@ +@@ -761,7 +761,7 @@ zRow[i] = z; \ } \ span.z += span.zStep; \ @@ -434,7 +437,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -785,7 +785,7 @@ +@@ -775,7 +775,7 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; @@ -443,7 +446,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -796,7 +796,7 @@ +@@ -786,7 +786,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -452,7 +455,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -812,7 +812,7 @@ +@@ -801,7 +801,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -460,17 +463,17 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ +#define RENDER_SPAN( span ) { \ GLuint i; \ for (i = 0; i < span.end; i++) { \ - pRow[i] = PACK_8A8B8G8R(FixedToInt(span.red), \ -@@ -822,7 +822,7 @@ + pRow[i] = PACK_8B8G8R(FixedToInt(span.red), \ +@@ -809,7 +809,7 @@ + span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ - span.alpha += span.alphaStep; \ - } + } } #include "swrast/s_tritemp.h" -@@ -838,7 +838,7 @@ +@@ -824,7 +824,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -478,17 +481,17 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ +#define RENDER_SPAN( span ) { \ GLuint i; \ for (i = 0; i < span.end; i++) { \ - pRow[i] = PACK_8A8R8G8B(FixedToInt(span.red), \ -@@ -848,7 +848,7 @@ + pRow[i] = PACK_8R8G8B(FixedToInt(span.red), \ +@@ -832,7 +832,7 @@ + span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ - span.alpha += span.alphaStep; \ - } + } } #include "swrast/s_tritemp.h" -@@ -863,7 +863,7 @@ +@@ -847,7 +847,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -497,7 +500,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ pRow[i] = PACK_8R8G8B(FixedToInt(span.red), \ -@@ -871,7 +871,7 @@ +@@ -855,7 +855,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -506,7 +509,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -886,7 +886,7 @@ +@@ -870,7 +870,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -515,7 +518,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ PIXEL_TYPE *pixel = pRow; \ for (i = 0; i < span.end; i++, pixel++) { \ -@@ -896,7 +896,7 @@ +@@ -880,7 +880,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -524,7 +527,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -910,7 +910,7 @@ +@@ -894,7 +894,7 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; @@ -533,7 +536,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -921,7 +921,7 @@ +@@ -905,7 +905,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -542,7 +545,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -936,7 +936,7 @@ +@@ -920,7 +920,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -551,7 +554,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ for (i = 0; i < span.end; i++) { \ pRow[i] = (PIXEL_TYPE) PACK_5R6G5B(FixedToInt(span.red), \ -@@ -944,7 +944,7 @@ +@@ -928,7 +928,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -560,7 +563,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -960,7 +960,7 @@ +@@ -944,7 +944,7 @@ #define SETUP_CODE \ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); @@ -569,7 +572,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -969,7 +969,7 @@ +@@ -953,7 +953,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -578,7 +581,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -984,7 +984,7 @@ +@@ -968,7 +968,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -587,7 +590,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ XDITHER_SETUP(y); \ -@@ -994,7 +994,7 @@ +@@ -978,7 +978,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -596,7 +599,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1007,7 +1007,7 @@ +@@ -991,7 +991,7 @@ #define SETUP_CODE \ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; @@ -605,7 +608,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ XDITHER_SETUP(y); \ -@@ -1018,7 +1018,7 @@ +@@ -1002,7 +1002,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -614,7 +617,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1033,7 +1033,7 @@ +@@ -1017,7 +1017,7 @@ #define BYTES_PER_ROW (xrb->ximage->bytes_per_line) #define SETUP_CODE \ GET_XRB(xrb); @@ -623,7 +626,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ LOOKUP_SETUP; \ for (i = 0; i < span.end; i++) { \ -@@ -1042,7 +1042,7 @@ +@@ -1026,7 +1026,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -632,7 +635,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1058,7 +1058,7 @@ +@@ -1042,7 +1042,7 @@ #define SETUP_CODE \ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); @@ -641,7 +644,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -1067,7 +1067,7 @@ +@@ -1051,7 +1051,7 @@ span.red += span.redStep; \ span.green += span.greenStep; \ span.blue += span.blueStep; \ @@ -650,7 +653,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1082,12 +1082,12 @@ +@@ -1066,12 +1066,12 @@ XMesaImage *img = xrb->ximage; \ unsigned long pixel; \ PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]); @@ -665,7 +668,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1103,11 +1103,11 @@ +@@ -1087,11 +1087,11 @@ GET_XRB(xrb); \ unsigned long p = PACK_8B8G8R( v2->color[0], \ v2->color[1], v2->color[2] ); @@ -679,7 +682,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1123,11 +1123,11 @@ +@@ -1107,11 +1107,11 @@ GET_XRB(xrb); \ unsigned long p = PACK_8R8G8B( v2->color[0], \ v2->color[1], v2->color[2] ); @@ -693,7 +696,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1143,11 +1143,11 @@ +@@ -1127,11 +1127,11 @@ GET_XRB(xrb); \ unsigned long p = PACK_8R8G8B( v2->color[0], \ v2->color[1], v2->color[2] ); @@ -707,7 +710,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1162,14 +1162,14 @@ +@@ -1146,14 +1146,14 @@ #define SETUP_CODE \ GET_XRB(xrb); \ const GLubyte *color = v2->color; @@ -724,7 +727,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1182,7 +1182,7 @@ +@@ -1166,7 +1166,7 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; @@ -733,7 +736,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ GLuint i; \ GLint x = span.x, y = YFLIP(xrb, span.y); \ for (i = 0; i < span.end; i++, x++) { \ -@@ -1190,7 +1190,7 @@ +@@ -1174,7 +1174,7 @@ PACK_TRUEDITHER(p, x, y, v2->color[0], \ v2->color[1], v2->color[2] ); \ XMesaPutPixel(img, x, y, p); \ @@ -742,7 +745,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1206,11 +1206,11 @@ +@@ -1190,11 +1190,11 @@ GET_XRB(xrb); \ unsigned long p = PACK_5R6G5B( v2->color[0], \ v2->color[1], v2->color[2] ); @@ -756,7 +759,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1226,13 +1226,13 @@ +@@ -1210,13 +1210,13 @@ XMesaContext xmesa = XMESA_CONTEXT(ctx); \ GET_XRB(xrb); \ const GLubyte *color = v2->color; @@ -772,7 +775,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1247,13 +1247,13 @@ +@@ -1231,13 +1231,13 @@ #define SETUP_CODE \ GET_XRB(xrb); \ FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] ); @@ -788,7 +791,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1266,14 +1266,14 @@ +@@ -1250,14 +1250,14 @@ GET_XRB(xrb); \ XMesaImage *img = xrb->ximage; \ FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] ); @@ -805,7 +808,7 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1291,12 +1291,12 @@ +@@ -1275,12 +1275,12 @@ GLubyte r = v2->color[0]; \ GLubyte g = v2->color[1]; \ GLubyte b = v2->color[2]; @@ -820,12 +823,12 @@ $NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $ #include "swrast/s_tritemp.h" -@@ -1315,11 +1315,11 @@ +@@ -1299,11 +1299,11 @@ GLubyte g = v2->color[1]; \ GLubyte b = v2->color[2]; \ GLubyte p = LOOKUP(r,g,b); -#define RENDER_SPAN( span ) \ -+#define RENDER_SPAN( span ) { \ ++#define RENDER_SPAN( span ) { \ GLuint i; \ for (i = 0; i < span.end; i++) { \ pRow[i] = (PIXEL_TYPE) p; \ diff --git a/graphics/MesaLib/patches/patch-am b/graphics/MesaLib/patches/patch-am index 44f8fc2354d..a624269c3c5 100644 --- a/graphics/MesaLib/patches/patch-am +++ b/graphics/MesaLib/patches/patch-am @@ -1,20 +1,24 @@ -$NetBSD: patch-am,v 1.6 2007/08/12 15:14:48 adam Exp $ +$NetBSD: patch-am,v 1.7 2007/08/13 11:18:47 seb Exp $ ---- include/GL/glxext.h.orig 2007-06-22 00:10:53.000000000 +0200 +--- include/GL/glxext.h.orig 2005-11-07 22:20:29.000000000 +0100 +++ include/GL/glxext.h -@@ -389,7 +389,7 @@ typedef struct { - #elif defined(__sun__) || defined(__digital__) +@@ -331,10 +331,10 @@ typedef struct { + } GLXBufferClobberEventSGIX; + #endif + +-#if defined(__sun__) ++#if defined(__sun__) || defined(__digital__) #include <inttypes.h> #if defined(__STDC__) -#if defined(__arch64__) +#if defined(__arch64__) || defined(_LP64) typedef long int int64_t; - typedef unsigned long int uint64_t; #else -@@ -397,7 +397,7 @@ typedef long long int int64_t; - typedef unsigned long long int uint64_t; - #endif /* __arch64__ */ - #endif /* __STDC__ */ + typedef long long int int64_t; +@@ -343,7 +343,7 @@ typedef long long int int64_t; + #elif defined(__UNIXOS2__) || defined(__SOL64__) + typedef long int int32_t; + typedef long long int int64_t; -#elif defined( __VMS ) +#elif defined( __VMS ) || defined(__sgi) #include <inttypes.h> diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index 6b000e2b37a..72c146cc652 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2007/08/12 15:14:48 adam Exp $ +# $NetBSD: Makefile,v 1.50 2007/08/13 11:18:48 seb Exp $ PKGNAME= glu-${MESA_VERSION} COMMENT= GLU polygon tessellation facility for Mesa @@ -14,7 +14,7 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION} .include "../../graphics/MesaLib/buildlink3.mk" pre-build: - cd ${WRKSRC} && rm -fr src/mesa src/glut src/glw progs + cd ${WRKSRC} && ${RM} -fr src/mesa src/glut src/glw progs do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 0cbf4d6e11b..4a34d9b819a 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2007/08/12 15:14:49 adam Exp $ +# $NetBSD: Makefile,v 1.49 2007/08/13 11:18:48 seb Exp $ PKGNAME= glut-${MESA_VERSION} COMMENT= GLUT Graphics library similar to SGI's OpenGL @@ -19,7 +19,7 @@ INSTLIBS= ${WRKSRC}/src/glut/glx/libglut.la .include "../../graphics/glu/buildlink3.mk" pre-build: - cd ${WRKSRC} && rm -fr src/mesa src/glu src/glw progs + cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL diff --git a/graphics/glx-utils/distinfo b/graphics/glx-utils/distinfo index 7f01f3c5d2c..f017b2b9b62 100644 --- a/graphics/glx-utils/distinfo +++ b/graphics/glx-utils/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/08/12 15:14:49 adam Exp $ +$NetBSD: distinfo,v 1.3 2007/08/13 11:18:49 seb Exp $ -SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec -RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6 -Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes +SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258 +RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a +Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes |