diff options
| author | drochner <drochner@pkgsrc.org> | 2006-03-02 20:19:31 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-03-02 20:19:31 +0000 |
| commit | 6c6a9f6a0e5ecfd236da317f3a71120aadd196bc (patch) | |
| tree | b9c237a814fbdd8abf968b39a4df4e6a3e7fa80d | |
| parent | c1889f8bb8fa400cb0606b7241ae103c066baca3 (diff) | |
| download | pkgsrc-6c6a9f6a0e5ecfd236da317f3a71120aadd196bc.tar.gz | |
don't link libGL explicitely against libpthread, it is not
used by the library itself, the version which comes with X11 doesn't
do it, and it fixes some cases where GL is loaded dynamically
bump PKGREVISION
| -rw-r--r-- | graphics/MesaLib/Makefile | 3 | ||||
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ah | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index bcd87b17b5b..8aa6b4bc82f 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2006/02/09 12:27:42 adam Exp $ +# $NetBSD: Makefile,v 1.46 2006/03/02 20:19:31 drochner Exp $ PKGNAME= MesaLib-${MESA_VERSION} +PKGREVISION= 1 COMMENT= Graphics library similar to SGI's OpenGL .include "../../graphics/Mesa/Makefile.common" diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 09337050089..155751db379 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2006/02/09 12:27:42 adam Exp $ +$NetBSD: distinfo,v 1.38 2006/03/02 20:19:31 drochner Exp $ SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640 RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 @@ -16,7 +16,7 @@ SHA1 (patch-ad) = e926180243a180bc80b0332f2bcacc14b7c1f13b SHA1 (patch-ae) = c7dd8f4b9db5241acdd0f850162b8b4116cd93bd SHA1 (patch-af) = 323ceab5653127cf233e66311a947c6718edb14c SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac -SHA1 (patch-ah) = b9ee33c497b8abe2af004a4f13219a19f413f30e +SHA1 (patch-ah) = f7939e25c786128ded9b804276b7ade22f0edaac SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7 diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah index c8f6de7a8ff..874754493b1 100644 --- a/graphics/MesaLib/patches/patch-ah +++ b/graphics/MesaLib/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $ +$NetBSD: patch-ah,v 1.4 2006/03/02 20:19:32 drochner Exp $ --- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 +++ configs/default @@ -27,7 +27,7 @@ $NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $ # Library/program dependencies EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ++GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm 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 |