Date: Sun, 26 Dec 2010 05:00:54 GMT From: chris petrik <c.petrik.sosa@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/153450: [PATCH] update graphics/mesa-demos to 8.0.1 Message-ID: <201012260500.oBQ50s9P065789@red.freebsd.org> Resent-Message-ID: <201012260510.oBQ5A9ei030234@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153450
>Category: ports
>Synopsis: [PATCH] update graphics/mesa-demos to 8.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 26 05:10:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: chris petrik
>Release: FreeBSD 8.2-PRE
>Organization:
none
>Environment:
N/A
>Description:
mesa-demos is old, and doesn't require a full blown mesa* update. I have tested this locally and the demos work without issue.
The way the demos are compiled has change so no longer need a do-install as configure does that now.
I tested this on default Mesa (7.6.1) a change would need to be done to the bsd.mesa.mk to make the demos a separate port instead of part of mesa.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: mesa-demos/Makefile
===================================================================
RCS file: /usr/local/freebsdcvs/ports/graphics/mesa-demos/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- mesa-demos/Makefile 29 Oct 2010 11:18:38 -0000 1.33
+++ mesa-demos/Makefile 26 Dec 2010 04:30:56 -0000
@@ -2,47 +2,27 @@
# Date created: 7 Nov 2003
# Whom: anholt@FreeBSD.org
#
-# $FreeBSD: ports/graphics/mesa-demos/Makefile,v 1.33 2010/10/29 11:18:38 ehaupt Exp $
+# $FreeBSD: ports/graphics/mesa-demos/Makefile,v 1.31 2010/10/08 20:40:44 rene Exp $
#
-PORTNAME= demos
-PORTVERSION= ${MESAVERSION}
+PORTNAME= mesa-demos
+PORTVERSION= 8.0.1
CATEGORIES= graphics
-MASTER_SITES= CRITICAL/mesa3d:mesa,glut,demos
-PKGNAMEPREFIX= mesa-
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/${PORTVERSION}/
MAINTAINER= c.petrik.sosa@gmail.com
COMMENT= OpenGL demos distributed with Mesa
USE_GL= glu glut
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
+USE_AUTOTOOLS= autoconf
DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS= NVIDIA_GL "Use NVIDIA's libraries" off
-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 "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.pre.mk>
+
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
Index: mesa-demos/distinfo
===================================================================
RCS file: /usr/local/freebsdcvs/ports/graphics/mesa-demos/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- mesa-demos/distinfo 7 Feb 2010 11:51:07 -0000 1.22
+++ mesa-demos/distinfo 26 Dec 2010 04:26:43 -0000
@@ -1,12 +1,2 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaDemos-7.4.4.tar.bz2) = 628142ec9a54cd28cc027e6ce26cff47
-SHA256 (MesaDemos-7.4.4.tar.bz2) = 2b055f1b364795caec122092dedca9ac3ecce4fcf61947f52a286a681e9d1111
-SIZE (MesaDemos-7.4.4.tar.bz2) = 1367659
-MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-MD5 (MesaDemos-7.6.1.tar.bz2) = a4226f06732a02556fcf6be290b86dff
-SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
-SIZE (MesaDemos-7.6.1.tar.bz2) = 1547790
+SHA256 (mesa-demos-8.0.1.tar.gz) = ded85f659f9806b21a27f20a9e1e178e57142915b5a76f7066fb6720701d0596
+SIZE (mesa-demos-8.0.1.tar.gz) = 11596117
Index: mesa-demos/pkg-plist
===================================================================
RCS file: /usr/local/freebsdcvs/ports/graphics/mesa-demos/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- mesa-demos/pkg-plist 7 Feb 2010 11:51:07 -0000 1.5
+++ mesa-demos/pkg-plist 26 Dec 2010 04:26:43 -0000
@@ -1,31 +1,68 @@
bin/arbfplight
bin/arbfslight
bin/arbocclude
+bin/array
+bin/bezier
+bin/bitmap
bin/bounce
+bin/brick
+bin/bump
+bin/clear
+bin/clear-fbo
+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
-%%MESALIB76%%bin/dinoshade
+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/drawoverhead
bin/drawpix
+bin/drawrange
bin/engine
bin/fbo_firecube
-%%MESALIB76%%bin/fbotexture
+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/glinfo
bin/gloss
-%%MESALIB74%%bin/glslnoise
bin/glsync
bin/gltestperf
bin/glthreads
-%%MESALIB74%%bin/glutfx
bin/glxcontexts
bin/glxdemo
bin/glxgears
@@ -37,63 +74,206 @@
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-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
-%%MESALIB76%%bin/multictx
+bin/multictx
+bin/multinoise
+bin/multitex
+bin/noise
+bin/noise2
bin/offset
bin/overlay
bin/paltex
bin/pbdemo
bin/pbinfo
+bin/pgon-mode
+bin/point
+bin/point-clip
+bin/point-param
+bin/point-sprite
+bin/point-wide
+bin/point-wide-smooth
bin/pointblast
-%%MESALIB76%%bin/projtex
-bin/rain
+bin/pointcoord
+bin/points
+bin/poly
+bin/poly-flat
+bin/poly-flat-clip
+bin/poly-flat-unfilled-clip
+bin/poly-unfilled
+bin/projtex
+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
-%%MESALIB76%%bin/sharedtex_mt
+bin/sharedtex_mt
+bin/shtest
bin/singlebuffer
+bin/skinning
bin/spectex
bin/spriteblast
bin/stex3d
-%%MESALIB74%%bin/streaming_rect
+bin/swapbuffers
bin/teapot
bin/terrain
bin/tessdemo
+bin/texaaline
bin/texcyl
-%%MESALIB74%%bin/texdown
+bin/texdemo1
bin/texenv
-%%MESALIB74%%bin/texobj
+bin/teximage
bin/texture_from_pixmap
-%%MESALIB76%%bin/textures
+bin/textures
+bin/toyball
+bin/tri
+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-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-repeat
+bin/tri-scissor-tri
+bin/tri-square
+bin/tri-stencil
+bin/tri-stipple
+bin/tri-tex
+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-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-drawelements
+bin/vbo-drawrange
+bin/vbo-noninterleaved
+bin/vert-or-frag-only
+bin/vert-tex
+bin/vertexrate
+bin/vp-array
+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
-@dirrm %%DATADIR%%
Index: mesa-demos/files/patch-progs-xdemos-glxpixmap.c
===================================================================
RCS file: /usr/local/freebsdcvs/ports/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c,v
retrieving revision 1.1
diff -u -r1.1 patch-progs-xdemos-glxpixmap.c
--- mesa-demos/files/patch-progs-xdemos-glxpixmap.c 19 May 2007 20:09:57 -0000 1.1
+++ mesa-demos/files/patch-progs-xdemos-glxpixmap.c 26 Dec 2010 04:26:43 -0000
@@ -1,5 +1,5 @@
---- progs/xdemos/glxpixmap.c.orig Fri Apr 6 22:29:09 2007
-+++ progs/xdemos/glxpixmap.c Fri Apr 6 22:38:33 2007
+--- src/xdemos/glxpixmap.c.old 2010-12-25 21:23:31.000000000 -0600
++++ src/xdemos/glxpixmap.c 2010-12-25 21:25:05.000000000 -0600
@@ -105,7 +105,7 @@
* to render correctly. This is because Mesa allows RGB rendering
* into any kind of visual, not just TrueColor or DirectColor.
@@ -8,4 +8,4 @@
+#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 );
+ PFNGLXCREATEGLXPIXMAPMESAPROC glXCreateGLXPixmapMESA_func =
Index: mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
===================================================================
RCS file: /usr/local/freebsdcvs/ports/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c,v
retrieving revision 1.1
diff -u -r1.1 patch-progs-xdemos-yuvrect_client.c
--- mesa-demos/files/patch-progs-xdemos-yuvrect_client.c 19 May 2007 20:09:57 -0000 1.1
+++ mesa-demos/files/patch-progs-xdemos-yuvrect_client.c 26 Dec 2010 04:26:43 -0000
@@ -1,19 +1,20 @@
---- progs/xdemos/yuvrect_client.c.orig Fri Apr 6 22:42:30 2007
-+++ progs/xdemos/yuvrect_client.c Fri Apr 6 22:48:05 2007
-@@ -140,7 +140,11 @@
+--- src/xdemos/yuvrect_client.c.old 2010-12-25 21:25:27.000000000 -0600
++++ src/xdemos/yuvrect_client.c 2010-12-25 21:29:12.000000000 -0600
+@@ -140,7 +140,12 @@
exit(0);
}
- glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
+ #ifdef WITH_NVIDIA_GL
-+ glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
++ glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
+ #else
-+ glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++ glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
+ #endif
++
if (!glx_memory)
{
fprintf(stderr,"Failed to allocate MESA memory\n");
-@@ -317,7 +321,11 @@
+@@ -317,7 +322,12 @@
glXSwapBuffers(dpy, win);
event_loop(dpy, win);
@@ -23,6 +24,7 @@
+ #else
+ glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
+ #endif
++
glXDestroyContext(dpy, ctx);
XDestroyWindow(dpy, win);
XCloseDisplay(dpy);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012260500.oBQ50s9P065789>