[pkgsrc/trunk]: pkgsrc/x11/xorg-libs Fix unlocking unlocked mutex error that ...

[reinoud <reinoud%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d082b1e8384
branches:  trunk
changeset: 529130:2d082b1e8384
user:      reinoud <reinoud%pkgsrc.org@localhost>
date:      Fri May 25 18:52:48 2007 +0000

description:
Fix unlocking unlocked mutex error that would get generated when GL was
initialised on a non GL display. Somehow an extra UnlockDisplay(dpy) was put
in.

This patch could also be of use in the modular xorg libs GL libs.

diffstat:

 x11/xorg-libs/Makefile         |   4 ++--
 x11/xorg-libs/distinfo         |   3 ++-
 x11/xorg-libs/patches/patch-cx |  12 ++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r b3124c0be27e -r 2d082b1e8384 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Fri May 25 18:22:45 2007 +0000
+++ b/x11/xorg-libs/Makefile    Fri May 25 18:52:48 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2007/05/25 18:52:48 reinoud Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG}
 DISTFILES=             X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
diff -r b3124c0be27e -r 2d082b1e8384 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Fri May 25 18:22:45 2007 +0000
+++ b/x11/xorg-libs/distinfo    Fri May 25 18:52:48 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2007/01/17 16:32:35 joerg Exp $
+$NetBSD: distinfo,v 1.59 2007/05/25 18:52:49 reinoud Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -76,3 +76,4 @@
 SHA1 (patch-cu) = 99e0ec0a7119ccc8d0df72dec67ee5e4fe0dd5c7
 SHA1 (patch-cv) = a314b92adeadc66481ecfe5893f104640dbc2228
 SHA1 (patch-cw) = f57f4436817fbc73f758f48e83062bf8b4a716b2
+SHA1 (patch-cx) = 25289c7e373ef716d4fbfcf821e64efaefc422f4
diff -r b3124c0be27e -r 2d082b1e8384 x11/xorg-libs/patches/patch-cx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-cx    Fri May 25 18:52:48 2007 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-cx,v 1.1 2007/05/25 18:52:50 reinoud Exp $
+
+--- extras/Mesa/src/glx/x11/glxext.c.orig      2005-10-18 04:51:52.000000000 +0200
++++ extras/Mesa/src/glx/x11/glxext.c
+@@ -1000,7 +1000,6 @@ static Bool AllocAndFetchScreenConfigs(D
+           return GL_FALSE;
+       }
+ 
+-      UnlockDisplay(dpy);
+       if (!reply.numVisuals) {
+           /* This screen does not support GL rendering */
+           UnlockDisplay(dpy);