pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Update to Mesa-7.0.4 (the head of the 7.0 bra...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a5e74b595ef6
branches: trunk
changeset: 545115:a5e74b595ef6
user: bjs <bjs%pkgsrc.org@localhost>
date: Sun Jul 27 00:03:42 2008 +0000
description:
Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,
lots of bug fixes; the intent of my update was mostly to fix
problems with i915 and r300 dri drivers and to provide the best environment
possible for the xorg server update to the 1.4 branch.
Morever, many of our patches from pkgsrc, i.e. those removed in this commit,
are now included upstream.
Additionally, MesaDemos now builds.
NOTES:
- MesaLib now requires xf86driproto 2.0.4, as earlier versions install
dri_interface.h, which is not correct.
- glu now exports its symbols via libtool's -export-symfile.
The symfile is generated pre-build--see glu/Makefile.
- glxinfo/glxgears do not seem to need to be linked to libpthread, and this
seems to cause problems on NetBSD with the new drm code. If I am wrong
about this, please let me know. The only program that seems to need
libpthread is glthreads in MesaDemos.
diffstat:
graphics/Mesa/Makefile.common | 17 +-
graphics/Mesa/Makefile.lib | 22 +-
graphics/MesaDemos/Makefile | 27 +-
graphics/MesaDemos/PLIST | 64 ++-
graphics/MesaDemos/distinfo | 20 +-
graphics/MesaDemos/patches/patch-aa | 13 -
graphics/MesaDemos/patches/patch-ab | 14 -
graphics/MesaDemos/patches/patch-ac | 21 -
graphics/MesaDemos/patches/patch-af | 13 -
graphics/MesaDemos/patches/patch-ah | 24 -
graphics/MesaDemos/patches/patch-ai | 13 -
graphics/MesaLib/Makefile | 23 +-
graphics/MesaLib/PLIST | 5 +-
graphics/MesaLib/distinfo | 40 +-
graphics/MesaLib/files/configs/default | 6 +-
graphics/MesaLib/files/configs/pkgsrc | 8 +-
graphics/MesaLib/hacks.mk | 6 +-
graphics/MesaLib/options.mk | 42 +-
graphics/MesaLib/patches/patch-aa | 14 -
graphics/MesaLib/patches/patch-ab | 61 +-
graphics/MesaLib/patches/patch-af | 44 -
graphics/MesaLib/patches/patch-ak | 22 -
graphics/MesaLib/patches/patch-al | 836 ---------------------------------
graphics/MesaLib/patches/patch-an | 17 -
graphics/MesaLib/patches/patch-ao | 28 -
graphics/MesaLib/patches/patch-ap | 63 --
graphics/MesaLib/patches/patch-ax | 21 +
graphics/MesaLib/patches/patch-ay | 10 +
graphics/glu/Makefile | 7 +-
graphics/glx-utils/Makefile | 15 +-
graphics/glx-utils/distinfo | 17 +-
31 files changed, 237 insertions(+), 1296 deletions(-)
diffs (truncated from 2022 to 300 lines):
diff -r ac4479cd4965 -r a5e74b595ef6 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common Sat Jul 26 23:44:26 2008 +0000
+++ b/graphics/Mesa/Makefile.common Sun Jul 27 00:03:42 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2008/06/16 15:28:56 tnn Exp $
+# $NetBSD: Makefile.common,v 1.66 2008/07/27 00:03:42 bjs Exp $
#
# This Makefile fragment is included either directly or indirectly (through
# Makefile.lib) by all packages that are built from the Mesa sources.
@@ -8,23 +8,22 @@
DISTNAME?= MesaLib-${MESA_VERSION}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+MASTER_SITES= ${MASTER_SITE_LOCAL}
# When changing this version, please run "make distinfo" in the following
# package directories:
#
# graphics/MesaLib
-# graphics/MesaDemos
# graphics/glx-utils
#
-MESA_VERSION= 7.0.3
+MESA_VERSION= 7.0.4
MESA_PKGVERSION= ${MESA_VERSION}${MESA_PATCHLEVEL}
-MESA_PATCHFILES= 001 002 003
-MESA_PATCHLEVEL= .3
+#MESA_PATCHFILES= 001 002 003
+MESA_PATCHLEVEL= .0
-PATCHFILES= ${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
-PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
-PATCH_DIST_STRIP= -p1
+#PATCHFILES= ${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
+#PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
+#PATCH_DIST_STRIP= -p1
MAINTAINER= bjs%NetBSD.org@localhost
HOMEPAGE= http://www.mesa3d.org/
diff -r ac4479cd4965 -r a5e74b595ef6 graphics/Mesa/Makefile.lib
--- a/graphics/Mesa/Makefile.lib Sat Jul 26 23:44:26 2008 +0000
+++ b/graphics/Mesa/Makefile.lib Sun Jul 27 00:03:42 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.12 2008/05/29 12:43:39 tnn Exp $
+# $NetBSD: Makefile.lib,v 1.13 2008/07/27 00:03:42 bjs Exp $
#
# This Makefile fragment is included by all packages that build libraries
# from the Mesa sources.
@@ -15,7 +15,7 @@
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
LIBTOOL= ${PKG_SHLIBTOOL}
-USE_TOOLS+= gmake makedepend pkg-config
+USE_TOOLS+= gmake pkg-config
PATCHDIR= ${.CURDIR}/../MesaLib/patches
DISTINFO_FILE= ${.CURDIR}/../MesaLib/distinfo
@@ -25,6 +25,7 @@
MAKE_ENV+= MAKE=${GMAKE:Q}
MAKE_ENV+= COPTS=${COPTS:M*:Q}
+MAKE_ENV+= MKDEP=${TRUE:Q}
#.if ${X11_TYPE} == "modular"
#. if defined(PKG_BUILD_OPTIONS.libX11) && \
@@ -65,24 +66,32 @@
RM_PATCH_BACKUP_DIRS= docs src/mesa src/glut/glx \
progs/demos progs/xdemos progs/glsl
pre-patch:
- @ for fn in ${RM_PATCH_BACKUP_DIRS}; do \
+ for fn in ${RM_PATCH_BACKUP_DIRS}; do \
${RM} -f ${WRKSRC}/$${fn}/*.orig; \
- done
+ done
post-patch:
${CP} ${.CURDIR}/../MesaLib/files/configs/[d-z]* ${WRKSRC}/configs
post-install: install-headers
-
+###
+### XXX MesaLib installs headers into GL/internal, and this directory is
+### created there by the pre-install target. TODO: unify these targets.
+###
.PHONY: install-headers
+.if empty(PKGNAME:M*MesaDemos*)
install-headers:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
.for hdr in ${MESA_HEADERS}
if [ -f ${WRKSRC}/include/GL/${hdr:Q} ]; then \
${INSTALL_DATA} ${WRKSRC}/include/GL/${hdr:Q} \
- ${DESTDIR}${PREFIX}/include/GL; \
+ ${DESTDIR}${PREFIX}/include/GL/${hdr:Q}; \
fi;
.endfor
+.else
+install-headers:
+ @${DO_NADA}
+.endif
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
@@ -90,4 +99,3 @@
SUBST_FILES.fix-paths= src/*.c
SUBST_FILES.fix-paths+= scripts/*.sh
SUBST_SED.fix-paths= -e 's,"/usr/local,"${PREFIX},g'
-SUBST_SED.fix-paths+= -e 's,"/var/log,"${VARBASE}/log,g'
diff -r ac4479cd4965 -r a5e74b595ef6 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile Sat Jul 26 23:44:26 2008 +0000
+++ b/graphics/MesaDemos/Makefile Sun Jul 27 00:03:42 2008 +0000
@@ -1,27 +1,30 @@
-# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:20 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2008/07/27 00:03:42 bjs Exp $
PKGNAME= MesaDemos-${MESA_VERSION}
COMMENT= OpenGL examples and Demos
-# We include Makefile.lib instead of Makefile.common since we actually
-# build the Mesa libraries as part of the build process, even though we
-# don't install them.
+# We include Makefile.lib here to pull in the configuration machinery.
#
.include "../../graphics/Mesa/Makefile.lib"
-PATCHDIR= ${.CURDIR}/patches
-DISTINFO_FILE= ${.CURDIR}/distinfo
-
-USE_TOOLS+= gmake pax
-MAKE_FLAGS+= LIB_DEP=""
+USE_TOOLS+= pax
+BUILD_DIRS= progs
+BUILD_TARGET= default
+EGDIR= ${PREFIX}/share/examples/${PKGNAME_NOREV}
.include "../../graphics/Mesa/buildlink3.mk"
pre-build:
cd ${WRKSRC} && ${RM} -fr src
+ ${CP} ${WRKSRC}/configs/pkgsrc ${WRKSRC}/configs/current
+###
+### XXX remove this when it's unnecessary
+###
+pre-install:
+ ${CHMOD} -x ${DESTDIR}${EGDIR}/demos/glslnoise.c
do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/${dir}
cd ${WRKSRC}/progs && pax \
-s ',^./.*Makefile.*,,' \
-s ',^./CVS.*,,' \
@@ -29,8 +32,8 @@
-s ',^./\.libs.*,,' \
-s ',^./\.deps.*,,' \
-s ',^./.*\.orig$$,,' \
- -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
- ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
+ -rw . ${DESTDIR}${EGDIR}/${PKGNAME_NOREV}/${dir}
+ ${CHMOD} -R a+rX ${DESTDIR}${EGDIR}/${PKGNAME_NOREV}
.include "../../x11/libXi/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
diff -r ac4479cd4965 -r a5e74b595ef6 graphics/MesaDemos/PLIST
--- a/graphics/MesaDemos/PLIST Sat Jul 26 23:44:26 2008 +0000
+++ b/graphics/MesaDemos/PLIST Sun Jul 27 00:03:42 2008 +0000
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.10 2007/08/13 11:18:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/07/27 00:03:42 bjs 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
@@ -16,14 +18,21 @@
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
@@ -33,6 +42,8 @@
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
@@ -48,14 +59,11 @@
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
@@ -73,12 +81,16 @@
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
@@ -94,6 +106,8 @@
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
@@ -101,11 +115,44 @@
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
@@ -118,6 +165,7 @@
share/examples/${PKGNAME}/osdemos/osdemo.c
share/examples/${PKGNAME}/osdemos/osdemo16.c
Home |
Main Index |
Thread Index |
Old Index