Date: Mon, 11 Mar 2013 14:56:57 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313913 - in head/graphics/mesa-demos: . files Message-ID: <201303111456.r2BEuvJK076898@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Mon Mar 11 14:56:56 2013 New Revision: 313913 URL: http://svnweb.freebsd.org/changeset/ports/313913 Log: Update to 8.0.1 This adds a bunch of new demos. Obtained from: xorg development repo Added: head/graphics/mesa-demos/files/patch-src-glsl-Makefile.am (contents, props changed) head/graphics/mesa-demos/files/patch-src-glsl-Makefile.in (contents, props changed) head/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c (contents, props changed) Deleted: head/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c head/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c head/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S head/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S head/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S head/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S Modified: head/graphics/mesa-demos/Makefile head/graphics/mesa-demos/distinfo head/graphics/mesa-demos/pkg-descr head/graphics/mesa-demos/pkg-plist Modified: head/graphics/mesa-demos/Makefile ============================================================================== --- head/graphics/mesa-demos/Makefile Mon Mar 11 14:38:10 2013 (r313912) +++ head/graphics/mesa-demos/Makefile Mon Mar 11 14:56:56 2013 (r313913) @@ -2,91 +2,36 @@ # $FreeBSD$ PORTNAME= mesa-demos -PORTVERSION= 7.6.1 -PORTREVISION= 1 +PORTVERSION= 8.1.0 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/ -DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \ - MesaDemos-${PORTVERSION}${EXTRACT_SUFX} +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/${PORTVERSION}/ +DISTFILES= mesa-demos-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL demos distributed with Mesa USE_BZIP2= yes USE_GMAKE= yes -USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -USE_GL= glu glut -USE_XORG= glproto x11 xext xt xxf86vm xdamage xfixes dri2proto +USE_GL= glu glut glew +USE_XORG= glproto x11 xext xi xxf86vm xdamage xfixes dri2proto CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --disable-gallium --with-demos=demos,xdemos - -#ALL_TARGET= yes - -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/ +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} -OPTIONS_DEFINE= NVIDIA XCB -NVIDIA_DESC= Use NVIDIA's OpenGL libraries -XCB_DESC= Use XCB for GLX - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MXCB} -CONFIGURE_ARGS+= --enable-xcb -.else -CONFIGURE_ARGS+= --disable-xcb -.endif +OPTIONS_DEFINE= NVIDIA +NVIDIA_DESC= Use NVIDIA's libraries post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/src/glu/Makefile \ - ${WRKSRC}/src/glw/Makefile \ - ${WRKSRC}/src/mesa/Makefile \ - ${WRKSRC}/src/mesa/drivers/dri/Makefile - @${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \ - -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \ - -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \ - -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \ - ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c - -do-install: - @for i in demos xdemos; do \ - cd ${WRKSRC}/progs/$$i; \ - for j in `${MAKE} -V PROGS`; do \ - ${ECHO_CMD} ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \ - ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \ - done; \ - done - ${MKDIR} ${DATADIR}/images ${DATADIR}/data - @cd ${WRKSRC}/progs/images; \ - for i in `ls *.rgb*`; do \ - ${ECHO_CMD} ${INSTALL_DATA} $$i ${DATADIR}/images; \ - ${INSTALL_DATA} $$i ${DATADIR}/images; \ - done - @cd ${WRKSRC}/progs/demos; \ - for i in `ls *.dat`; do \ - ${ECHO_CMD} ${INSTALL_DATA} $$i ${DATADIR}/data; \ - ${INSTALL_DATA} $$i ${DATADIR}/data; \ - done -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNVIDIA} CFLAGS+= -DWITH_NVIDIA_GL=1 .endif -.if !defined(ARCH) -ARCH!= uname -p -.endif - -.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on powerpc, or sparc64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/mesa-demos/distinfo ============================================================================== --- head/graphics/mesa-demos/distinfo Mon Mar 11 14:38:10 2013 (r313912) +++ head/graphics/mesa-demos/distinfo Mon Mar 11 14:56:56 2013 (r313913) @@ -1,4 +1,2 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b -SIZE (MesaDemos-7.6.1.tar.bz2) = 1547790 +SHA256 (mesa-demos-8.1.0.tar.bz2) = 9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828 +SIZE (mesa-demos-8.1.0.tar.bz2) = 10045237 Added: head/graphics/mesa-demos/files/patch-src-glsl-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mesa-demos/files/patch-src-glsl-Makefile.am Mon Mar 11 14:56:56 2013 (r313913) @@ -0,0 +1,20 @@ +--- src/glsl/Makefile.am.orig 2012-12-15 08:17:06.000000000 +0100 ++++ src/glsl/Makefile.am 2013-03-08 14:03:15.236159234 +0100 +@@ -34,7 +34,7 @@ + bin_PROGRAMS = \ + array \ + bezier \ +- bitmap \ ++ bitmap-demo \ + brick \ + bump \ + blinking-teapot \ +@@ -76,7 +76,7 @@ + samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY + + array_LDADD = ../util/libutil.la +-bitmap_LDADD = ../util/libutil.la ++bitmap_demo_LDADD = ../util/libutil.la + bezier_LDADD = ../util/libutil.la + brick_LDADD = ../util/libutil.la + bump_LDADD = ../util/libutil.la Added: head/graphics/mesa-demos/files/patch-src-glsl-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mesa-demos/files/patch-src-glsl-Makefile.in Mon Mar 11 14:56:56 2013 (r313913) @@ -0,0 +1,46 @@ +--- src/glsl/Makefile.in.orig 2013-02-24 12:12:04.000000000 +0100 ++++ src/glsl/Makefile.in 2013-03-08 14:06:19.689158671 +0100 +@@ -75,7 +75,7 @@ + build_triplet = @build@ + host_triplet = @host@ + @HAVE_GLUT_TRUE@bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ bitmap$(EXEEXT) brick$(EXEEXT) bump$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ bitmap_demo$(EXEEXT) brick$(EXEEXT) bump$(EXEEXT) \ + @HAVE_GLUT_TRUE@ blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \ + @HAVE_GLUT_TRUE@ deriv$(EXEEXT) fragcoord$(EXEEXT) \ + @HAVE_GLUT_TRUE@ fsraytrace$(EXEEXT) \ +@@ -120,9 +120,9 @@ + bezier_SOURCES = bezier.c + bezier_OBJECTS = bezier.$(OBJEXT) + bezier_DEPENDENCIES = ../util/libutil.la +-bitmap_SOURCES = bitmap.c +-bitmap_OBJECTS = bitmap.$(OBJEXT) +-bitmap_DEPENDENCIES = ../util/libutil.la ++bitmap_demo_SOURCES = bitmap.c ++bitmap_demo_OBJECTS = bitmap.$(OBJEXT) ++bitmap_demo_DEPENDENCIES = ../util/libutil.la + blinking_teapot_SOURCES = blinking-teapot.c + blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT) + blinking_teapot_DEPENDENCIES = ../util/libutil.la +@@ -460,7 +460,7 @@ + samplers_array_SOURCES = samplers.c + samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY + array_LDADD = ../util/libutil.la +-bitmap_LDADD = ../util/libutil.la ++bitmap_demo_LDADD = ../util/libutil.la + bezier_LDADD = ../util/libutil.la + brick_LDADD = ../util/libutil.la + bump_LDADD = ../util/libutil.la +@@ -602,9 +602,9 @@ + bezier$(EXEEXT): $(bezier_OBJECTS) $(bezier_DEPENDENCIES) $(EXTRA_bezier_DEPENDENCIES) + @rm -f bezier$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS) +-bitmap$(EXEEXT): $(bitmap_OBJECTS) $(bitmap_DEPENDENCIES) $(EXTRA_bitmap_DEPENDENCIES) +- @rm -f bitmap$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(bitmap_OBJECTS) $(bitmap_LDADD) $(LIBS) ++bitmap_demo$(EXEEXT): $(bitmap_demo_OBJECTS) $(bitmap_demo_DEPENDENCIES) $(EXTRA_bitmap_demo_DEPENDENCIES) ++ @rm -f bitmap_demo$(EXEEXT) ++ $(AM_V_CCLD)$(LINK) $(bitmap_demo_OBJECTS) $(bitmap_demo_LDADD) $(LIBS) + blinking-teapot$(EXEEXT): $(blinking_teapot_OBJECTS) $(blinking_teapot_DEPENDENCIES) $(EXTRA_blinking_teapot_DEPENDENCIES) + @rm -f blinking-teapot$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(blinking_teapot_OBJECTS) $(blinking_teapot_LDADD) $(LIBS) Added: head/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c Mon Mar 11 14:56:56 2013 (r313913) @@ -0,0 +1,11 @@ +--- src/xdemos/glxpixmap.c.orig Fri Apr 6 22:29:09 2007 ++++ src/xdemos/glxpixmap.c Fri Apr 6 22:38:33 2007 +@@ -105,7 +105,7 @@ + * to render correctly. This is because Mesa allows RGB rendering + * into any kind of visual, not just TrueColor or DirectColor. + */ +-#ifdef GLX_MESA_pixmap_colormap ++#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL) + if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) { + /* stand-alone Mesa, specify the colormap */ + glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap ); Modified: head/graphics/mesa-demos/pkg-descr ============================================================================== --- head/graphics/mesa-demos/pkg-descr Mon Mar 11 14:38:10 2013 (r313912) +++ head/graphics/mesa-demos/pkg-descr Mon Mar 11 14:56:56 2013 (r313913) @@ -1,10 +1,5 @@ -Mesa is a 3-D graphics library with an API which is very similar to that -of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax -or state machine, it is being used with authorization from Silicon Graphics, -Inc. However, the author makes no claim that Mesa is in any way a -compatible replacement for OpenGL or associated with Silicon Graphics, Inc. -Those who want a licensed implementation of OpenGL should contact a licensed -vendor. This software is distributed under the terms of the GNU Library -General Public License, see the LICENSE file for details. +Mesa demos is a collections of demos and test programs to demonstrate various +aspects of the mesa and OpenGL libraries. +It is part of the mesa software suite. WWW: http://www.mesa3d.org/ Modified: head/graphics/mesa-demos/pkg-plist ============================================================================== --- head/graphics/mesa-demos/pkg-plist Mon Mar 11 14:38:10 2013 (r313912) +++ head/graphics/mesa-demos/pkg-plist Mon Mar 11 14:56:56 2013 (r313913) @@ -1,26 +1,76 @@ bin/arbfplight bin/arbfslight bin/arbocclude +bin/arbocclude2 +bin/array +bin/bezier +bin/bitmap_demo +bin/blinking-teapot bin/bounce +bin/brick +bin/bump +bin/clear-color +bin/clear-fbo +bin/clear-fbo-scissor +bin/clear-fbo-tex +bin/clear-random +bin/clear-repeat +bin/clear-scissor +bin/clear-undefined bin/clearspd +bin/convolutions bin/copypix +bin/copytex bin/corender +bin/createwin bin/cubemap +bin/cuberender +bin/deriv bin/dinoshade +bin/dissolve +bin/dlist-begin-call-end +bin/dlist-dangling +bin/dlist-degenerate +bin/dlist-edgeflag +bin/dlist-edgeflag-dangling +bin/dlist-flat-tri +bin/dlist-mat-tri +bin/dlist-recursive-call +bin/dlist-tri-flat-tri +bin/dlist-tri-mat-tri +bin/draw2arrays +bin/drawarrays +bin/drawelements +bin/drawelements-large +bin/drawoverhead bin/drawpix +bin/drawrange bin/engine bin/fbo_firecube +bin/fbobind bin/fbotexture +bin/fill bin/fire +bin/flat-clip bin/fogcoord bin/fplight +bin/fragcoord +bin/fs-tri bin/fslight +bin/fsraytrace bin/gamma bin/gearbox bin/gears bin/geartrain +bin/genmipmap +bin/geom-outlining-130 +bin/geom-outlining-150 +bin/geom-sprites +bin/geom-stipple-lines +bin/geom-wide-lines bin/glinfo bin/gloss +bin/glslstateschange bin/glsync bin/gltestperf bin/glthreads @@ -35,60 +85,235 @@ bin/glxpbdemo bin/glxpixmap bin/glxsnoop bin/glxswapcontrol +bin/gs-tri +bin/identity bin/ipers bin/isosurf +bin/line +bin/line-clip +bin/line-cull +bin/line-flat +bin/line-smooth +bin/line-stipple-wide +bin/line-userclip +bin/line-userclip-clip +bin/line-userclip-nop +bin/line-userclip-nop-clip +bin/line-xor +bin/line-wide +bin/lineloop +bin/lineloop-clip +bin/lineloop-elts +bin/linestrip +bin/linestrip-clip +bin/linestrip-flat-stipple +bin/linestrip-stipple +bin/linestrip-stipple-wide +bin/linktest bin/lodbias +bin/long-fixed-func +bin/mandelbrot bin/manywin bin/morph3d bin/multiarb bin/multictx +bin/multinoise +bin/multitex +bin/noise +bin/noise2 bin/offset bin/overlay bin/paltex bin/pbdemo bin/pbinfo +bin/pgon-mode +bin/pixeltest +bin/point +bin/point-clip +bin/point-param +bin/point-sprite +bin/point-wide +bin/point-wide-smooth bin/pointblast +bin/pointcoord +bin/points +bin/poly +bin/poly-flat +bin/poly-flat-clip +bin/poly-flat-unfilled-clip +bin/poly-unfilled bin/projtex -bin/rain +bin/quad +bin/quad-clip +bin/quad-clip-all-vertices +bin/quad-clip-nearplane +bin/quad-degenerate +bin/quad-flat +bin/quad-offset-factor +bin/quad-offset-unfilled +bin/quad-offset-units +bin/quad-tex-2d +bin/quad-tex-3d +bin/quad-tex-alpha +bin/quad-tex-pbo +bin/quad-tex-sub +bin/quad-unfilled +bin/quad-unfilled-clip +bin/quad-unfilled-stipple +bin/quads +bin/quadstrip +bin/quadstrip-clip +bin/quadstrip-cont +bin/quadstrip-flat bin/ray bin/readpix +bin/readpixels bin/reflect bin/renormal +bin/samplers +bin/samplers_array +bin/shadow_sampler bin/shadowtex +bin/shape bin/sharedtex bin/sharedtex_mt +bin/shtest +bin/simplex-noise bin/singlebuffer +bin/skinning bin/spectex bin/spriteblast bin/stex3d +bin/sub-tex +bin/swapbuffers bin/teapot bin/terrain bin/tessdemo +bin/tex-quads +bin/texaaline bin/texcyl +bin/texdemo1 bin/texenv +bin/teximage bin/texture_from_pixmap bin/textures +bin/toyball +bin/tri +bin/tri-2101010 +bin/tri-2101010-dlist +bin/tri-alpha +bin/tri-alpha-tex +bin/tri-array-interleaved +bin/tri-blend +bin/tri-blend-color +bin/tri-blend-max +bin/tri-blend-min +bin/tri-blend-revsub +bin/tri-blend-sub +bin/tri-clear +bin/tri-clip +bin/tri-cull +bin/tri-cull-both +bin/tri-dlist +bin/tri-edgeflag +bin/tri-edgeflag-array +bin/tri-edgeflag-pv +bin/tri-fbo +bin/tri-fbo-tex +bin/tri-fbo-tex-mip +bin/tri-flat +bin/tri-flat-clip +bin/tri-fog +bin/tri-fp +bin/tri-fp-const-imm +bin/tri-lit +bin/tri-lit-material +bin/tri-logicop-none +bin/tri-logicop-xor +bin/tri-mask-tri +bin/tri-multitex-vbo +bin/tri-orig +bin/tri-query +bin/tri-point-line-clipped +bin/tri-repeat +bin/tri-scissor-tri +bin/tri-square +bin/tri-stencil +bin/tri-stipple +bin/tri-tex +bin/tri-tex-1d +bin/tri-tex-3d +bin/tri-tri +bin/tri-unfilled +bin/tri-unfilled-clip +bin/tri-unfilled-edgeflag +bin/tri-unfilled-fog +bin/tri-unfilled-point +bin/tri-unfilled-smooth +bin/tri-unfilled-tri +bin/tri-unfilled-tri-lit +bin/tri-unfilled-userclip +bin/tri-unfilled-userclip-stip +bin/tri-userclip +bin/tri-viewport +bin/tri-z +bin/tri-z-9 +bin/tri-z-clip +bin/tri-z-eq +bin/trifan +bin/trifan-flat +bin/trifan-flat-clip +bin/trifan-flat-unfilled-clip +bin/trifan-unfilled +bin/trirast bin/trispd +bin/tristrip +bin/tristrip-clip +bin/tristrip-flat bin/tunnel bin/tunnel2 +bin/twoside bin/vao_demo +bin/vbo +bin/vbo-drawarrays +bin/vbo-drawarrays-2101010 +bin/vbo-drawelements +bin/vbo-drawrange +bin/vbo-noninterleaved +bin/vert-or-frag-only +bin/vert-tex +bin/vbo-tri +bin/vertexrate +bin/vp-array +bin/vp-array-hf +bin/vp-array-int +bin/vp-clip +bin/vp-line-clip +bin/vp-tri +bin/vp-tri-cb +bin/vp-tri-cb-pos +bin/vp-tri-cb-tex +bin/vp-tri-imm +bin/vp-tri-invariant +bin/vp-tri-swap +bin/vp-tri-tex +bin/vp-unfilled +bin/vsraytrace bin/wincopy bin/winpos bin/xfont bin/xrotfontdemo -%%DATADIR%%/data/geartrain.dat -%%DATADIR%%/data/isosurf.dat -%%DATADIR%%/data/terrain.dat -%%DATADIR%%/images/arch.rgb -%%DATADIR%%/images/bw.rgb -%%DATADIR%%/images/girl.rgb -%%DATADIR%%/images/girl2.rgb -%%DATADIR%%/images/reflect.rgb -%%DATADIR%%/images/s128.rgb -%%DATADIR%%/images/tile.rgb -%%DATADIR%%/images/tree2.rgba -%%DATADIR%%/images/tree3.rgb -%%DATADIR%%/images/wrs_logo.rgb -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/data +%%DATADIR%%/arch.rgb +%%DATADIR%%/bw.rgb +%%DATADIR%%/geartrain.dat +%%DATADIR%%/girl.rgb +%%DATADIR%%/girl2.rgb +%%DATADIR%%/isosurf.dat +%%DATADIR%%/reflect.rgb +%%DATADIR%%/s128.rgb +%%DATADIR%%/terrain.dat +%%DATADIR%%/tile.rgb +%%DATADIR%%/tree2.rgba +%%DATADIR%%/tree3.rgb +%%DATADIR%%/wrs_logo.rgb @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303111456.r2BEuvJK076898>