summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz>2009-09-02 22:30:34 +0000
committerwiz <wiz>2009-09-02 22:30:34 +0000
commite202deac8d55fde1ffd689a5833a87dd19c225b2 (patch)
tree5a8cc1c497a46dce1af4db879bb096fdf18bad7c /graphics
parent6a16ec60c86f5ad108e5ea53c8046f7388131040 (diff)
downloadpkgsrc-e202deac8d55fde1ffd689a5833a87dd19c225b2.tar.gz
Look for libGL.so, not any particular libGL.so.<X>, on NetBSD.
Bump PKGREVISION. From mrg@
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/Makefile4
-rw-r--r--graphics/MesaLib/distinfo3
-rw-r--r--graphics/MesaLib/patches/patch-an16
3 files changed, 20 insertions, 3 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 3a5c61a7947..9525603150d 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2009/08/25 05:27:57 hasso Exp $
+# $NetBSD: Makefile,v 1.82 2009/09/02 22:30:34 wiz Exp $
PKGNAME= MesaLib-${MESA_PKGVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Graphics library similar to SGI's OpenGL
MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 704a5ea451b..5e3c9993f95 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2009/08/08 08:25:51 wiz Exp $
+$NetBSD: distinfo,v 1.69 2009/09/02 22:30:34 wiz Exp $
SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
@@ -22,6 +22,7 @@ SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
+SHA1 (patch-an) = ff03138906ab51c88007f11fdcf1765778b8d5f8
SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
diff --git a/graphics/MesaLib/patches/patch-an b/graphics/MesaLib/patches/patch-an
new file mode 100644
index 00000000000..44ac3254aaa
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-an
@@ -0,0 +1,16 @@
+$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()) {