diff options
| author | bjs <bjs> | 2008-07-27 00:03:42 +0000 |
|---|---|---|
| committer | bjs <bjs> | 2008-07-27 00:03:42 +0000 |
| commit | acf539a2f55f9214da800a2fd55ebe2468354985 (patch) | |
| tree | 7c65f0da0b8da23c4951cf9c284a77a1e0666911 /graphics/MesaDemos/Makefile | |
| parent | 2c01e19c148a81f02ffd50711e06c8b76e118659 (diff) | |
| download | pkgsrc-acf539a2f55f9214da800a2fd55ebe2468354985.tar.gz | |
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 (limited to 'graphics/MesaDemos/Makefile')
| -rw-r--r-- | graphics/MesaDemos/Makefile | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index e5ac3529e83..7e3b164714d 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -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 @@ do-install: -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" |