Wed Sep 2 22:30:34 2009 UTC ()
Look for libGL.so, not any particular libGL.so.<X>, on NetBSD.
Bump PKGREVISION.

>From mrg@


(wiz)
diff -r1.81 -r1.82 pkgsrc/graphics/MesaLib/Makefile
diff -r1.68 -r1.69 pkgsrc/graphics/MesaLib/distinfo
diff -r0 -r1.3 pkgsrc/graphics/MesaLib/patches/patch-an
cvs diff -r1.81 -r1.82 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2009/08/25 05:27:57 1.81
+++ pkgsrc/graphics/MesaLib/Makefile 2009/09/02 22:30:34 1.82
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.81 2009/08/25 05:27:57 hasso Exp $ 1# $NetBSD: Makefile,v 1.82 2009/09/02 22:30:34 wiz Exp $
2 2
3PKGNAME= MesaLib-${MESA_PKGVERSION} 3PKGNAME= MesaLib-${MESA_PKGVERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5COMMENT= Graphics library similar to SGI's OpenGL 5COMMENT= Graphics library similar to SGI's OpenGL
6 6
7MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ 7MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
8 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \ 8 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \
9 xmesa_xf86.h 9 xmesa_xf86.h
10 10
11MESA_HEADERS+= internal/dri_interface.h internal/sarea.h 11MESA_HEADERS+= internal/dri_interface.h internal/sarea.h
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15BUILD_DEFS+= MESA_HZ 15BUILD_DEFS+= MESA_HZ
16PLIST_VARS= dri nodri 16PLIST_VARS= dri nodri
17 17
cvs diff -r1.68 -r1.69 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2009/08/08 08:25:51 1.68
+++ pkgsrc/graphics/MesaLib/distinfo 2009/09/02 22:30:34 1.69
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1$NetBSD: distinfo,v 1.68 2009/08/08 08:25:51 wiz Exp $ 1$NetBSD: distinfo,v 1.69 2009/09/02 22:30:34 wiz Exp $
2 2
3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe 3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1 4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes 5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes
6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431 6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431
7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176 7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176
8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes 8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes
9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3 9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3
10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes 11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
13SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee 13SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393 15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab 16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04 17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7 18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f 19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87 20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4 22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388 23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
 25SHA1 (patch-an) = ff03138906ab51c88007f11fdcf1765778b8d5f8
25SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 26SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
26SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905 27SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
27SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907 28SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
28SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7 29SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
29SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32 30SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
30SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3 31SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
31SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a 32SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
32SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f 33SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
33SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac 34SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
34SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5 35SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5
35SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477 36SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
36SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394 37SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
File Added: pkgsrc/graphics/MesaLib/patches/Attic/patch-an
$NetBSD: patch-an,v 1.3 2009/09/02 22:30:34 wiz Exp $

--- src/glx/x11/dri_common.c.orig	2009-06-17 17:31:54.000000000 +0000
+++ src/glx/x11/dri_common.c
@@ -103,7 +103,11 @@ _X_HIDDEN void *driOpenDriver(const char
    int len;
 
    /* Attempt to make sure libGL symbols will be visible to the driver */
+#ifdef __NetBSD__
+   glhandle = dlopen("libGL.so", RTLD_NOW | RTLD_GLOBAL);
+#else
    glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL);
+#endif
 
    libPaths = NULL;
    if (geteuid() == getuid()) {