diff options
| author | reinoud <reinoud> | 2007-05-25 18:52:48 +0000 |
|---|---|---|
| committer | reinoud <reinoud> | 2007-05-25 18:52:48 +0000 |
| commit | bc3b3eacf20a5f25f9c3ffc4aa24c2f10386cf46 (patch) | |
| tree | 385e97b19d4d182cd17644312b3426d2f6986749 | |
| parent | 39965e91e084025d6d1f9c1df1a3971f45330769 (diff) | |
| download | pkgsrc-bc3b3eacf20a5f25f9c3ffc4aa24c2f10386cf46.tar.gz | |
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.
| -rw-r--r-- | x11/xorg-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-cx | 12 |
3 files changed, 16 insertions, 3 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index 31977d49a7a..4ff20e76e80 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -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 --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 3d28739715b..3bfde537b15 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -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-ct) = 96084456c2d7d4aaf05b2eebd13be2e575cead29 SHA1 (patch-cu) = 99e0ec0a7119ccc8d0df72dec67ee5e4fe0dd5c7 SHA1 (patch-cv) = a314b92adeadc66481ecfe5893f104640dbc2228 SHA1 (patch-cw) = f57f4436817fbc73f758f48e83062bf8b4a716b2 +SHA1 (patch-cx) = 25289c7e373ef716d4fbfcf821e64efaefc422f4 diff --git a/x11/xorg-libs/patches/patch-cx b/x11/xorg-libs/patches/patch-cx new file mode 100644 index 00000000000..c8592398ff1 --- /dev/null +++ b/x11/xorg-libs/patches/patch-cx @@ -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); |